From fe5893feb69056e6068277cd2f4b3f46a38f0c1d Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Thu, 6 Jul 2023 16:07:40 +0200 Subject: [PATCH 01/14] SpinBox fixed for values above the max value Spinbox now doesn't take values above the designated maximum Fixes CURA-10096 --- resources/qml/SpinBox.qml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/resources/qml/SpinBox.qml b/resources/qml/SpinBox.qml index 038125111c..e22777335d 100644 --- a/resources/qml/SpinBox.qml +++ b/resources/qml/SpinBox.qml @@ -54,9 +54,20 @@ Item from: Math.floor(base.from / base.stepSize) to: Math.floor(base.to / base.stepSize) + function clamp(value, min, max) + { + return Math.max((Math.min(value, max)), min); + } + valueFromText: function(text) { - return parseFloat(text.substring(prefix.length, text.length - suffix.length).replace(",", ".")) / base.stepSize; + + var value = parseFloat(text.substring(prefix.length, text.length - suffix.length).replace(",", ".")) / base.stepSize ; + if (Number.isNaN(value)) + { + value = from + } + return clamp(value, from, to); } textFromValue: function(value) @@ -69,6 +80,7 @@ Item onValueModified: { base.value = value * base.stepSize; + spinBoxText.text = spinBox.textFromValue(value); } // This forces TextField to commit typed values before incrementing with buttons. @@ -87,6 +99,7 @@ Item contentItem: Cura.TextField { + id: spinBoxText text: spinBox.textFromValue(spinBox.value, spinBox.locale) validator: base.validator @@ -97,6 +110,13 @@ Item base.editingFinished(); } } + + onTextChanged: + { + var value = spinBox.valueFromText(spinBoxText.text); + spinBoxText.text = spinBox.textFromValue(value); + spinBox.value = value; + } } down.indicator: Rectangle From 082cdb0f25c4e038218430fdc581f2cc9a54cf09 Mon Sep 17 00:00:00 2001 From: saumyaj3 Date: Thu, 6 Jul 2023 14:20:41 +0000 Subject: [PATCH 02/14] update translations --- resources/i18n/cs_CZ/cura.po | 2 +- resources/i18n/cura.pot | 594 +++++++++++++++++------------------ resources/i18n/de_DE/cura.po | 2 +- resources/i18n/es_ES/cura.po | 2 +- resources/i18n/fi_FI/cura.po | 2 +- resources/i18n/fr_FR/cura.po | 2 +- resources/i18n/hu_HU/cura.po | 2 +- resources/i18n/it_IT/cura.po | 2 +- resources/i18n/ja_JP/cura.po | 2 +- resources/i18n/ko_KR/cura.po | 2 +- resources/i18n/nl_NL/cura.po | 2 +- resources/i18n/pl_PL/cura.po | 2 +- resources/i18n/pt_BR/cura.po | 2 +- resources/i18n/pt_PT/cura.po | 2 +- resources/i18n/ru_RU/cura.po | 2 +- resources/i18n/tr_TR/cura.po | 2 +- resources/i18n/zh_CN/cura.po | 2 +- resources/i18n/zh_TW/cura.po | 2 +- 18 files changed, 314 insertions(+), 314 deletions(-) diff --git a/resources/i18n/cs_CZ/cura.po b/resources/i18n/cs_CZ/cura.po index f4949537f5..ce147b6214 100644 --- a/resources/i18n/cs_CZ/cura.po +++ b/resources/i18n/cs_CZ/cura.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-15 13:37+0000\n" +"POT-Creation-Date: 2023-07-06 14:20+0000\n" "PO-Revision-Date: 2023-02-16 20:28+0100\n" "Last-Translator: Miroslav Šustek \n" "Language-Team: DenyCZ \n" diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot index 553eae74ac..7df05f007a 100644 --- a/resources/i18n/cura.pot +++ b/resources/i18n/cura.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-15 13:37+0000\n" +"POT-Creation-Date: 2023-07-06 14:20+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -4878,38 +4878,6 @@ msgstr "" msgctxt "@info:generic" msgid "{} plugins failed to download" msgstr "" -msgctxt "description" -msgid "Logs certain events so that they can be used by the crash reporter" -msgstr "" - -msgctxt "name" -msgid "Sentry Logger" -msgstr "" - -msgctxt "description" -msgid "Manages extensions to the application and allows browsing extensions from the UltiMaker website." -msgstr "" - -msgctxt "name" -msgid "Marketplace" -msgstr "" - -msgctxt "description" -msgid "Manages network connections to UltiMaker networked printers." -msgstr "" - -msgctxt "name" -msgid "UltiMaker Network Connection" -msgstr "" - -msgctxt "description" -msgid "Reads g-code from a compressed archive." -msgstr "" - -msgctxt "name" -msgid "Compressed G-code Reader" -msgstr "" - msgctxt "description" msgid "Provides support for importing profiles from g-code files." msgstr "" @@ -4918,30 +4886,6 @@ msgctxt "name" msgid "G-code Profile Reader" msgstr "" -msgctxt "description" -msgid "Provides the Per Model Settings." -msgstr "" - -msgctxt "name" -msgid "Per Model Settings Tool" -msgstr "" - -msgctxt "description" -msgid "Provides the X-Ray view." -msgstr "" - -msgctxt "name" -msgid "X-Ray View" -msgstr "" - -msgctxt "description" -msgid "Creates an eraser mesh to block the printing of support in certain places" -msgstr "" - -msgctxt "name" -msgid "Support Eraser" -msgstr "" - msgctxt "description" msgid "Provides support for reading 3MF files." msgstr "" @@ -4951,35 +4895,11 @@ msgid "3MF Reader" msgstr "" msgctxt "description" -msgid "Writes g-code to a file." +msgid "Provides removable drive hotplugging and writing support." msgstr "" msgctxt "name" -msgid "G-code Writer" -msgstr "" - -msgctxt "description" -msgid "Allows loading and displaying G-code files." -msgstr "" - -msgctxt "name" -msgid "G-code Reader" -msgstr "" - -msgctxt "description" -msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." -msgstr "" - -msgctxt "name" -msgid "Machine Settings Action" -msgstr "" - -msgctxt "description" -msgid "Provides support for importing profiles from legacy Cura versions." -msgstr "" - -msgctxt "name" -msgid "Legacy Cura Profile Reader" +msgid "Removable Drive Output Device Plugin" msgstr "" msgctxt "description" @@ -4991,43 +4911,11 @@ msgid "USB printing" msgstr "" msgctxt "description" -msgid "Provides the preview of sliced layerdata." +msgid "Manages extensions to the application and allows browsing extensions from the UltiMaker website." msgstr "" msgctxt "name" -msgid "Simulation View" -msgstr "" - -msgctxt "description" -msgid "Provides a normal solid mesh view." -msgstr "" - -msgctxt "name" -msgid "Solid View" -msgstr "" - -msgctxt "description" -msgid "Provides a prepare stage in Cura." -msgstr "" - -msgctxt "name" -msgid "Prepare Stage" -msgstr "" - -msgctxt "description" -msgid "Provides support for reading model files." -msgstr "" - -msgctxt "name" -msgid "Trimesh Reader" -msgstr "" - -msgctxt "description" -msgid "Checks models and print configuration for possible printing issues and give suggestions." -msgstr "" - -msgctxt "name" -msgid "Model Checker" +msgid "Marketplace" msgstr "" msgctxt "description" @@ -5039,59 +4927,19 @@ msgid "3MF Writer" msgstr "" msgctxt "description" -msgid "Provides capabilities to read and write XML-based material profiles." +msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.)." msgstr "" msgctxt "name" -msgid "Material Profiles" +msgid "UltiMaker machine actions" msgstr "" msgctxt "description" -msgid "Enables ability to generate printable geometry from 2D image files." +msgid "Logs certain events so that they can be used by the crash reporter" msgstr "" msgctxt "name" -msgid "Image Reader" -msgstr "" - -msgctxt "description" -msgid "Provides support for reading AMF files." -msgstr "" - -msgctxt "name" -msgid "AMF Reader" -msgstr "" - -msgctxt "description" -msgid "Provides support for exporting Cura profiles." -msgstr "" - -msgctxt "name" -msgid "Cura Profile Writer" -msgstr "" - -msgctxt "description" -msgid "Provides a machine actions for updating firmware." -msgstr "" - -msgctxt "name" -msgid "Firmware Updater" -msgstr "" - -msgctxt "description" -msgid "Provides a monitor stage in Cura." -msgstr "" - -msgctxt "name" -msgid "Monitor Stage" -msgstr "" - -msgctxt "description" -msgid "Writes g-code to a compressed archive." -msgstr "" - -msgctxt "name" -msgid "Compressed G-code Writer" +msgid "Sentry Logger" msgstr "" msgctxt "description" @@ -5102,6 +4950,22 @@ msgctxt "name" msgid "Firmware Update Checker" msgstr "" +msgctxt "description" +msgid "Provides a monitor stage in Cura." +msgstr "" + +msgctxt "name" +msgid "Monitor Stage" +msgstr "" + +msgctxt "description" +msgid "Reads g-code from a compressed archive." +msgstr "" + +msgctxt "name" +msgid "Compressed G-code Reader" +msgstr "" + msgctxt "description" msgid "Provides support for writing Ultimaker Format Packages." msgstr "" @@ -5111,27 +4975,179 @@ msgid "UFP Writer" msgstr "" msgctxt "description" -msgid "Upgrades configurations from Cura 4.6.0 to Cura 4.6.2." +msgid "Provides a normal solid mesh view." msgstr "" msgctxt "name" -msgid "Version Upgrade 4.6.0 to 4.6.2" +msgid "Solid View" msgstr "" msgctxt "description" -msgid "Upgrades configurations from Cura 4.13 to Cura 5.0." +msgid "Provides a machine actions for updating firmware." msgstr "" msgctxt "name" -msgid "Version Upgrade 4.13 to 5.0" +msgid "Firmware Updater" msgstr "" msgctxt "description" -msgid "Upgrades configurations from Cura 4.0 to Cura 4.1." +msgid "Provides support for reading model files." msgstr "" msgctxt "name" -msgid "Version Upgrade 4.0 to 4.1" +msgid "Trimesh Reader" +msgstr "" + +msgctxt "description" +msgid "Writes g-code to a compressed archive." +msgstr "" + +msgctxt "name" +msgid "Compressed G-code Writer" +msgstr "" + +msgctxt "description" +msgid "Provides support for reading Ultimaker Format Packages." +msgstr "" + +msgctxt "name" +msgid "UFP Reader" +msgstr "" + +msgctxt "description" +msgid "Extension that allows for user created scripts for post processing" +msgstr "" + +msgctxt "name" +msgid "Post Processing" +msgstr "" + +msgctxt "description" +msgid "Allows loading and displaying G-code files." +msgstr "" + +msgctxt "name" +msgid "G-code Reader" +msgstr "" + +msgctxt "description" +msgid "Submits anonymous slice info. Can be disabled through preferences." +msgstr "" + +msgctxt "name" +msgid "Slice info" +msgstr "" + +msgctxt "description" +msgid "Provides a prepare stage in Cura." +msgstr "" + +msgctxt "name" +msgid "Prepare Stage" +msgstr "" + +msgctxt "description" +msgid "Provides support for reading AMF files." +msgstr "" + +msgctxt "name" +msgid "AMF Reader" +msgstr "" + +msgctxt "description" +msgid "Provides support for reading X3D files." +msgstr "" + +msgctxt "name" +msgid "X3D Reader" +msgstr "" + +msgctxt "description" +msgid "Provides a preview stage in Cura." +msgstr "" + +msgctxt "name" +msgid "Preview Stage" +msgstr "" + +msgctxt "description" +msgid "Provides support for importing Cura profiles." +msgstr "" + +msgctxt "name" +msgid "Cura Profile Reader" +msgstr "" + +msgctxt "description" +msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." +msgstr "" + +msgctxt "name" +msgid "Ultimaker Digital Library" +msgstr "" + +msgctxt "description" +msgid "Provides the link to the CuraEngine slicing backend." +msgstr "" + +msgctxt "name" +msgid "CuraEngine Backend" +msgstr "" + +msgctxt "description" +msgid "Provides the preview of sliced layerdata." +msgstr "" + +msgctxt "name" +msgid "Simulation View" +msgstr "" + +msgctxt "description" +msgid "Provides the X-Ray view." +msgstr "" + +msgctxt "name" +msgid "X-Ray View" +msgstr "" + +msgctxt "description" +msgid "Provides the Per Model Settings." +msgstr "" + +msgctxt "name" +msgid "Per Model Settings Tool" +msgstr "" + +msgctxt "description" +msgid "Provides support for exporting Cura profiles." +msgstr "" + +msgctxt "name" +msgid "Cura Profile Writer" +msgstr "" + +msgctxt "description" +msgid "Provides support for importing profiles from legacy Cura versions." +msgstr "" + +msgctxt "name" +msgid "Legacy Cura Profile Reader" +msgstr "" + +msgctxt "description" +msgid "Writes g-code to a file." +msgstr "" + +msgctxt "name" +msgid "G-code Writer" +msgstr "" + +msgctxt "description" +msgid "Upgrades configurations from Cura 4.4 to Cura 4.5." +msgstr "" + +msgctxt "name" +msgid "Version Upgrade 4.4 to 4.5" msgstr "" msgctxt "description" @@ -5142,30 +5158,6 @@ msgctxt "name" msgid "Version Upgrade 4.9 to 4.10" msgstr "" -msgctxt "description" -msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." -msgstr "" - -msgctxt "name" -msgid "Version Upgrade 4.3 to 4.4" -msgstr "" - -msgctxt "description" -msgid "Upgrades configurations from Cura 3.0 to Cura 3.1." -msgstr "" - -msgctxt "name" -msgid "Version Upgrade 3.0 to 3.1" -msgstr "" - -msgctxt "description" -msgid "Upgrades configurations from Cura 5.2 to Cura 5.3." -msgstr "" - -msgctxt "name" -msgid "Version Upgrade 5.2 to 5.3" -msgstr "" - msgctxt "description" msgid "Upgrades configurations from Cura 4.1 to Cura 4.2." msgstr "" @@ -5175,43 +5167,11 @@ msgid "Version Upgrade 4.1 to 4.2" msgstr "" msgctxt "description" -msgid "Upgrades configurations from Cura 4.2 to Cura 4.3." +msgid "Upgrades configurations from Cura 4.11 to Cura 4.12." msgstr "" msgctxt "name" -msgid "Version Upgrade 4.2 to 4.3" -msgstr "" - -msgctxt "description" -msgid "Upgrades configurations from Cura 3.5 to Cura 4.0." -msgstr "" - -msgctxt "name" -msgid "Version Upgrade 3.5 to 4.0" -msgstr "" - -msgctxt "description" -msgid "Upgrades configurations from Cura 2.6 to Cura 2.7." -msgstr "" - -msgctxt "name" -msgid "Version Upgrade 2.6 to 2.7" -msgstr "" - -msgctxt "description" -msgid "Upgrades configurations from Cura 4.6.2 to Cura 4.7." -msgstr "" - -msgctxt "name" -msgid "Version Upgrade 4.6.2 to 4.7" -msgstr "" - -msgctxt "description" -msgid "Upgrades configurations from Cura 2.5 to Cura 2.6." -msgstr "" - -msgctxt "name" -msgid "Version Upgrade 2.5 to 2.6" +msgid "Version Upgrade 4.11 to 4.12" msgstr "" msgctxt "description" @@ -5222,14 +5182,6 @@ msgctxt "name" msgid "Version Upgrade 5.3 to 5.4" msgstr "" -msgctxt "description" -msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." -msgstr "" - -msgctxt "name" -msgid "Version Upgrade 4.8 to 4.9" -msgstr "" - msgctxt "description" msgid "Upgrades configurations from Cura 3.3 to Cura 3.4." msgstr "" @@ -5247,19 +5199,11 @@ msgid "Version Upgrade 3.2 to 3.3" msgstr "" msgctxt "description" -msgid "Upgrades configurations from Cura 2.1 to Cura 2.2." +msgid "Upgrades configurations from Cura 4.3 to Cura 4.4." msgstr "" msgctxt "name" -msgid "Version Upgrade 2.1 to 2.2" -msgstr "" - -msgctxt "description" -msgid "Upgrades configurations from Cura 2.2 to Cura 2.4." -msgstr "" - -msgctxt "name" -msgid "Version Upgrade 2.2 to 2.4" +msgid "Version Upgrade 4.3 to 4.4" msgstr "" msgctxt "description" @@ -5271,19 +5215,19 @@ msgid "Version Upgrade 4.7 to 4.8" msgstr "" msgctxt "description" -msgid "Upgrades configurations from Cura 4.4 to Cura 4.5." +msgid "Upgrades configurations from Cura 3.5 to Cura 4.0." msgstr "" msgctxt "name" -msgid "Version Upgrade 4.4 to 4.5" +msgid "Version Upgrade 3.5 to 4.0" msgstr "" msgctxt "description" -msgid "Upgrades configurations from Cura 4.11 to Cura 4.12." +msgid "Upgrades configurations from Cura 4.8 to Cura 4.9." msgstr "" msgctxt "name" -msgid "Version Upgrade 4.11 to 4.12" +msgid "Version Upgrade 4.8 to 4.9" msgstr "" msgctxt "description" @@ -5294,6 +5238,30 @@ msgctxt "name" msgid "Version Upgrade 3.4 to 3.5" msgstr "" +msgctxt "description" +msgid "Upgrades configurations from Cura 2.6 to Cura 2.7." +msgstr "" + +msgctxt "name" +msgid "Version Upgrade 2.6 to 2.7" +msgstr "" + +msgctxt "description" +msgid "Upgrades configurations from Cura 4.13 to Cura 5.0." +msgstr "" + +msgctxt "name" +msgid "Version Upgrade 4.13 to 5.0" +msgstr "" + +msgctxt "description" +msgid "Upgrades configurations from Cura 2.1 to Cura 2.2." +msgstr "" + +msgctxt "name" +msgid "Version Upgrade 2.1 to 2.2" +msgstr "" + msgctxt "description" msgid "Upgrades configurations from Cura 2.7 to Cura 3.0." msgstr "" @@ -5302,6 +5270,62 @@ msgctxt "name" msgid "Version Upgrade 2.7 to 3.0" msgstr "" +msgctxt "description" +msgid "Upgrades configurations from Cura 4.6.2 to Cura 4.7." +msgstr "" + +msgctxt "name" +msgid "Version Upgrade 4.6.2 to 4.7" +msgstr "" + +msgctxt "description" +msgid "Upgrades configurations from Cura 3.0 to Cura 3.1." +msgstr "" + +msgctxt "name" +msgid "Version Upgrade 3.0 to 3.1" +msgstr "" + +msgctxt "description" +msgid "Upgrades configurations from Cura 4.0 to Cura 4.1." +msgstr "" + +msgctxt "name" +msgid "Version Upgrade 4.0 to 4.1" +msgstr "" + +msgctxt "description" +msgid "Upgrades configurations from Cura 5.2 to Cura 5.3." +msgstr "" + +msgctxt "name" +msgid "Version Upgrade 5.2 to 5.3" +msgstr "" + +msgctxt "description" +msgid "Upgrades configurations from Cura 2.5 to Cura 2.6." +msgstr "" + +msgctxt "name" +msgid "Version Upgrade 2.5 to 2.6" +msgstr "" + +msgctxt "description" +msgid "Upgrades configurations from Cura 4.2 to Cura 4.3." +msgstr "" + +msgctxt "name" +msgid "Version Upgrade 4.2 to 4.3" +msgstr "" + +msgctxt "description" +msgid "Upgrades configurations from Cura 4.6.0 to Cura 4.6.2." +msgstr "" + +msgctxt "name" +msgid "Version Upgrade 4.6.0 to 4.6.2" +msgstr "" + msgctxt "description" msgid "Upgrades configurations from Cura 4.5 to Cura 4.6." msgstr "" @@ -5311,43 +5335,59 @@ msgid "Version Upgrade 4.5 to 4.6" msgstr "" msgctxt "description" -msgid "Provides support for reading X3D files." +msgid "Upgrades configurations from Cura 2.2 to Cura 2.4." msgstr "" msgctxt "name" -msgid "X3D Reader" +msgid "Version Upgrade 2.2 to 2.4" msgstr "" msgctxt "description" -msgid "Provides machine actions for Ultimaker machines (such as bed leveling wizard, selecting upgrades, etc.)." +msgid "Checks models and print configuration for possible printing issues and give suggestions." msgstr "" msgctxt "name" -msgid "UltiMaker machine actions" +msgid "Model Checker" msgstr "" msgctxt "description" -msgid "Provides the link to the CuraEngine slicing backend." +msgid "Provides a way to change machine settings (such as build volume, nozzle size, etc.)." msgstr "" msgctxt "name" -msgid "CuraEngine Backend" +msgid "Machine Settings Action" msgstr "" msgctxt "description" -msgid "Connects to the Digital Library, allowing Cura to open files from and save files to the Digital Library." +msgid "Enables ability to generate printable geometry from 2D image files." msgstr "" msgctxt "name" -msgid "Ultimaker Digital Library" +msgid "Image Reader" msgstr "" msgctxt "description" -msgid "Submits anonymous slice info. Can be disabled through preferences." +msgid "Creates an eraser mesh to block the printing of support in certain places" msgstr "" msgctxt "name" -msgid "Slice info" +msgid "Support Eraser" +msgstr "" + +msgctxt "description" +msgid "Manages network connections to UltiMaker networked printers." +msgstr "" + +msgctxt "name" +msgid "UltiMaker Network Connection" +msgstr "" + +msgctxt "description" +msgid "Provides capabilities to read and write XML-based material profiles." +msgstr "" + +msgctxt "name" +msgid "Material Profiles" msgstr "" msgctxt "description" @@ -5358,43 +5398,3 @@ msgctxt "name" msgid "Cura Backups" msgstr "" -msgctxt "description" -msgid "Provides support for reading Ultimaker Format Packages." -msgstr "" - -msgctxt "name" -msgid "UFP Reader" -msgstr "" - -msgctxt "description" -msgid "Provides a preview stage in Cura." -msgstr "" - -msgctxt "name" -msgid "Preview Stage" -msgstr "" - -msgctxt "description" -msgid "Provides removable drive hotplugging and writing support." -msgstr "" - -msgctxt "name" -msgid "Removable Drive Output Device Plugin" -msgstr "" - -msgctxt "description" -msgid "Provides support for importing Cura profiles." -msgstr "" - -msgctxt "name" -msgid "Cura Profile Reader" -msgstr "" - -msgctxt "description" -msgid "Extension that allows for user created scripts for post processing" -msgstr "" - -msgctxt "name" -msgid "Post Processing" -msgstr "" - diff --git a/resources/i18n/de_DE/cura.po b/resources/i18n/de_DE/cura.po index 61fa7f1bf7..bd1dce77f3 100644 --- a/resources/i18n/de_DE/cura.po +++ b/resources/i18n/de_DE/cura.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-15 13:37+0000\n" +"POT-Creation-Date: 2023-07-06 14:20+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po index 1a07f81aa5..526795ba41 100644 --- a/resources/i18n/es_ES/cura.po +++ b/resources/i18n/es_ES/cura.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 5.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-15 13:37+0000\n" +"POT-Creation-Date: 2023-07-06 14:20+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/resources/i18n/fi_FI/cura.po b/resources/i18n/fi_FI/cura.po index b8da67996f..e5b2a12f4c 100644 --- a/resources/i18n/fi_FI/cura.po +++ b/resources/i18n/fi_FI/cura.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-15 13:37+0000\n" +"POT-Creation-Date: 2023-07-06 14:20+0000\n" "PO-Revision-Date: 2022-07-15 10:53+0200\n" "Last-Translator: Bothof \n" "Language-Team: Finnish\n" diff --git a/resources/i18n/fr_FR/cura.po b/resources/i18n/fr_FR/cura.po index 08111493a3..6e0481e6e2 100644 --- a/resources/i18n/fr_FR/cura.po +++ b/resources/i18n/fr_FR/cura.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-15 13:37+0000\n" +"POT-Creation-Date: 2023-07-06 14:20+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/resources/i18n/hu_HU/cura.po b/resources/i18n/hu_HU/cura.po index 435f9dbdb1..7b90a9530b 100644 --- a/resources/i18n/hu_HU/cura.po +++ b/resources/i18n/hu_HU/cura.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-15 13:37+0000\n" +"POT-Creation-Date: 2023-07-06 14:20+0000\n" "PO-Revision-Date: 2020-03-24 09:36+0100\n" "Last-Translator: Nagy Attila \n" "Language-Team: ATI-SZOFT\n" diff --git a/resources/i18n/it_IT/cura.po b/resources/i18n/it_IT/cura.po index 85b02a17fd..0904b37f38 100644 --- a/resources/i18n/it_IT/cura.po +++ b/resources/i18n/it_IT/cura.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-15 13:37+0000\n" +"POT-Creation-Date: 2023-07-06 14:20+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/resources/i18n/ja_JP/cura.po b/resources/i18n/ja_JP/cura.po index dc29faa5a3..8d3b7a04bd 100644 --- a/resources/i18n/ja_JP/cura.po +++ b/resources/i18n/ja_JP/cura.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-15 13:37+0000\n" +"POT-Creation-Date: 2023-07-06 14:20+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/resources/i18n/ko_KR/cura.po b/resources/i18n/ko_KR/cura.po index 65c83f441e..147d62ba97 100644 --- a/resources/i18n/ko_KR/cura.po +++ b/resources/i18n/ko_KR/cura.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-15 13:37+0000\n" +"POT-Creation-Date: 2023-07-06 14:20+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po index 34a874f6ee..4c2c80d204 100644 --- a/resources/i18n/nl_NL/cura.po +++ b/resources/i18n/nl_NL/cura.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-15 13:37+0000\n" +"POT-Creation-Date: 2023-07-06 14:20+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/resources/i18n/pl_PL/cura.po b/resources/i18n/pl_PL/cura.po index cf089a4b2b..9c4cc1b3f9 100644 --- a/resources/i18n/pl_PL/cura.po +++ b/resources/i18n/pl_PL/cura.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-15 13:37+0000\n" +"POT-Creation-Date: 2023-07-06 14:20+0000\n" "PO-Revision-Date: 2021-09-07 08:02+0200\n" "Last-Translator: Mariusz Matłosz \n" "Language-Team: Mariusz Matłosz , reprapy.pl\n" diff --git a/resources/i18n/pt_BR/cura.po b/resources/i18n/pt_BR/cura.po index 95c6f5d29c..363e6f3542 100644 --- a/resources/i18n/pt_BR/cura.po +++ b/resources/i18n/pt_BR/cura.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-15 13:37+0000\n" +"POT-Creation-Date: 2023-07-06 14:20+0000\n" "PO-Revision-Date: 2023-02-17 17:37+0100\n" "Last-Translator: Cláudio Sampaio \n" "Language-Team: Cláudio Sampaio \n" diff --git a/resources/i18n/pt_PT/cura.po b/resources/i18n/pt_PT/cura.po index 1c133ed3b6..f7b25ba9ee 100644 --- a/resources/i18n/pt_PT/cura.po +++ b/resources/i18n/pt_PT/cura.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-15 13:37+0000\n" +"POT-Creation-Date: 2023-07-06 14:20+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/resources/i18n/ru_RU/cura.po b/resources/i18n/ru_RU/cura.po index c2c7ce1ec5..a7d7ced3ce 100644 --- a/resources/i18n/ru_RU/cura.po +++ b/resources/i18n/ru_RU/cura.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-15 13:37+0000\n" +"POT-Creation-Date: 2023-07-06 14:20+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/resources/i18n/tr_TR/cura.po b/resources/i18n/tr_TR/cura.po index e885959fbe..c520733651 100644 --- a/resources/i18n/tr_TR/cura.po +++ b/resources/i18n/tr_TR/cura.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-15 13:37+0000\n" +"POT-Creation-Date: 2023-07-06 14:20+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/resources/i18n/zh_CN/cura.po b/resources/i18n/zh_CN/cura.po index 32f566e315..52d4b7606e 100644 --- a/resources/i18n/zh_CN/cura.po +++ b/resources/i18n/zh_CN/cura.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-15 13:37+0000\n" +"POT-Creation-Date: 2023-07-06 14:20+0000\n" "PO-Revision-Date: 2022-07-15 11:06+0200\n" "Last-Translator: \n" "Language-Team: \n" diff --git a/resources/i18n/zh_TW/cura.po b/resources/i18n/zh_TW/cura.po index 10aaf168f6..ad0a8b403c 100644 --- a/resources/i18n/zh_TW/cura.po +++ b/resources/i18n/zh_TW/cura.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Cura 5.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-06-15 13:37+0000\n" +"POT-Creation-Date: 2023-07-06 14:20+0000\n" "PO-Revision-Date: 2022-01-02 19:59+0800\n" "Last-Translator: Valen Chang \n" "Language-Team: Valen Chang \n" From 1ebde31397c962cc733241bbf893c85f7be36790 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Fri, 7 Jul 2023 11:46:29 +0200 Subject: [PATCH 03/14] SpinBox fixed for values above the max value Review comments Fixes CURA-10096 --- resources/qml/SpinBox.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/qml/SpinBox.qml b/resources/qml/SpinBox.qml index e22777335d..79f9439ad3 100644 --- a/resources/qml/SpinBox.qml +++ b/resources/qml/SpinBox.qml @@ -62,7 +62,7 @@ Item valueFromText: function(text) { - var value = parseFloat(text.substring(prefix.length, text.length - suffix.length).replace(",", ".")) / base.stepSize ; + var value = parseFloat(text.substring(prefix.length, text.length - suffix.length).replace(",", ".")) / base.stepSize; if (Number.isNaN(value)) { value = from @@ -113,8 +113,8 @@ Item onTextChanged: { - var value = spinBox.valueFromText(spinBoxText.text); - spinBoxText.text = spinBox.textFromValue(value); + var value = spinBox.valueFromText(text); + text = spinBox.textFromValue(value); spinBox.value = value; } } From 3187ef14cfe82db09516d85b3cde273aa6c866fc Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Fri, 7 Jul 2023 15:05:52 +0200 Subject: [PATCH 04/14] SpinBox fixed for values above the max value Review comments Fixes CURA-10096 --- resources/qml/SpinBox.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/SpinBox.qml b/resources/qml/SpinBox.qml index 79f9439ad3..29aedf1308 100644 --- a/resources/qml/SpinBox.qml +++ b/resources/qml/SpinBox.qml @@ -115,7 +115,7 @@ Item { var value = spinBox.valueFromText(text); text = spinBox.textFromValue(value); - spinBox.value = value; + base.value = value; } } From cca33bb4a587cc6869b565d5bfd36e2ef0e5a199 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Mon, 10 Jul 2023 13:50:37 +0200 Subject: [PATCH 05/14] Added refresh moving icon for feedback purpose While refreshing the material sync, no feedback was provided before, now there is a refreshing icon animation available for "refresh in progress" fixes: CURA-8754 --- .../Materials/MaterialsSyncDialog.qml | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml b/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml index 87a8d00ec4..5c40f93837 100644 --- a/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml +++ b/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml @@ -429,10 +429,59 @@ UM.Window Cura.SecondaryButton { id: refreshListButton + property int accountState: Cura.API.account.syncState Layout.alignment: Qt.AlignVCenter text: catalog.i18nc("@button", "Refresh List") iconSource: UM.Theme.getIcon("ArrowDoubleCircleRight") onClicked: Cura.API.account.sync(true) + + onAccountStateChanged: { + if (Cura.API.account.syncState == 0) + { + refreshListButton.visible = false; + } + if (Cura.API.account.syncState == 1) + { + refreshListButton.visible = true; + } + } + } + + Item + { + width: childrenRect.width + Layout.alignment: Qt.AlignVCenter + height: refreshListButton.height + visible: !refreshListButton.visible + + UM.ColorImage + { + id: refreshingIcon + height: UM.Theme.getSize("action_button_icon").height + width: height + anchors.verticalCenter: refreshingLabel.verticalCenter + source: UM.Theme.getIcon("ArrowDoubleCircleRight") + color: UM.Theme.getColor("primary") + + RotationAnimator + { + target: refreshingIcon + from: 0 + to: 360 + duration: 1000 + loops: Animation.Infinite + running: true + } + } + UM.Label + { + id: refreshingLabel + anchors.left: refreshingIcon.right + anchors.leftMargin: UM.Theme.getSize("narrow_margin").width + text: catalog.i18nc("@button", "Refreshing...") + color: UM.Theme.getColor("primary") + font: UM.Theme.getFont("medium") + } } Cura.TertiaryButton From d12659f71f5838ac9442a6b302ba21cce2116a89 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Mon, 10 Jul 2023 14:36:14 +0200 Subject: [PATCH 06/14] Added refresh moving icon for feedback purpose While refreshing the material sync, no feedback was provided before, now there is a refreshing icon animation available for "refresh in progress" fixes: CURA-8754 --- resources/qml/Preferences/Materials/MaterialsSyncDialog.qml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml b/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml index 5c40f93837..a82789d01c 100644 --- a/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml +++ b/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml @@ -430,17 +430,19 @@ UM.Window { id: refreshListButton property int accountState: Cura.API.account.syncState + readonly property int _AccountSyncState_SYNCING: 0 + readonly property int _AccountSyncState_SUCCESS: 1 Layout.alignment: Qt.AlignVCenter text: catalog.i18nc("@button", "Refresh List") iconSource: UM.Theme.getIcon("ArrowDoubleCircleRight") onClicked: Cura.API.account.sync(true) onAccountStateChanged: { - if (Cura.API.account.syncState == 0) + if (Cura.API.account.syncState == _AccountSyncState_SYNCING) { refreshListButton.visible = false; } - if (Cura.API.account.syncState == 1) + else if (Cura.API.account.syncState == _AccountSyncState_SUCCESS) { refreshListButton.visible = true; } From 63e78d313c66588b8425d08a948fe16e3c2f2e00 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Mon, 10 Jul 2023 15:10:00 +0200 Subject: [PATCH 07/14] Add some basic hardware specs to logs Contributes to CURA-10767 --- cura/CuraApplication.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 6b04503ebc..889e442eaa 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -5,6 +5,7 @@ import os import sys import tempfile import time +import platform from typing import cast, TYPE_CHECKING, Optional, Callable, List, Any, Dict import numpy @@ -828,6 +829,8 @@ class CuraApplication(QtApplication): def run(self): super().run() + self._log_hardware_info() + if len(ApplicationMetadata.DEPENDENCY_INFO) > 0: Logger.debug("Using Conan managed dependencies: " + ", ".join( [dep["recipe"]["id"] for dep in ApplicationMetadata.DEPENDENCY_INFO["installed"] if dep["recipe"]["version"] != "latest"])) @@ -901,6 +904,14 @@ class CuraApplication(QtApplication): self.exec() + def _log_hardware_info(self): + hardware_info = platform.uname() + Logger.info(f"System: {hardware_info.system}") + Logger.info(f"Release: {hardware_info.release}") + Logger.info(f"Version: {hardware_info.version}") + Logger.info(f"Processor name: {hardware_info.processor}") + Logger.info(f"CPU Cores: {os.cpu_count()}") + def __setUpSingleInstanceServer(self): if self._use_single_instance: self._single_instance.startServer() From 3e18082db610570bede2724aba09367f868fd4e7 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Tue, 11 Jul 2023 11:45:37 +0200 Subject: [PATCH 08/14] Code review comments fixes: CURA-8754 --- .../Materials/MaterialsSyncDialog.qml | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml b/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml index a82789d01c..8fa2f72e60 100644 --- a/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml +++ b/resources/qml/Preferences/Materials/MaterialsSyncDialog.qml @@ -429,24 +429,13 @@ UM.Window Cura.SecondaryButton { id: refreshListButton - property int accountState: Cura.API.account.syncState - readonly property int _AccountSyncState_SYNCING: 0 - readonly property int _AccountSyncState_SUCCESS: 1 Layout.alignment: Qt.AlignVCenter + readonly property int _AccountSyncState_SYNCING: 0 + visible: Cura.API.account.syncState != _AccountSyncState_SYNCING + enabled: visible text: catalog.i18nc("@button", "Refresh List") iconSource: UM.Theme.getIcon("ArrowDoubleCircleRight") onClicked: Cura.API.account.sync(true) - - onAccountStateChanged: { - if (Cura.API.account.syncState == _AccountSyncState_SYNCING) - { - refreshListButton.visible = false; - } - else if (Cura.API.account.syncState == _AccountSyncState_SUCCESS) - { - refreshListButton.visible = true; - } - } } Item From 9407345377bf0479148308dbbe3ae2c7797b9724 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Wed, 12 Jul 2023 16:04:56 +0200 Subject: [PATCH 09/14] Color Picker from Qt 6.4 Native platform dialog is available on iOS,Linux (when running with the GTK+ platform theme) and macOS fixes: CURA-10687 --- resources/qml/ColorDialog.qml | 152 ------------------ .../Preferences/Materials/MaterialsView.qml | 6 +- 2 files changed, 3 insertions(+), 155 deletions(-) delete mode 100644 resources/qml/ColorDialog.qml diff --git a/resources/qml/ColorDialog.qml b/resources/qml/ColorDialog.qml deleted file mode 100644 index 99d46ed327..0000000000 --- a/resources/qml/ColorDialog.qml +++ /dev/null @@ -1,152 +0,0 @@ -// Copyright (c) 2022 UltiMaker -// Cura is released under the terms of the LGPLv3 or higher. - -import QtQuick 2.15 -import QtQuick.Controls 2.2 -import QtQuick.Window 2.1 -import QtQuick.Layouts 1.1 - -import UM 1.7 as UM -import Cura 1.7 as Cura - - -/* -* A dialog that provides the option to pick a color. Currently it only asks for a hex code and shows the color -* in a color swath -*/ -UM.Dialog -{ - id: base - - property variant catalog: UM.I18nCatalog { name: "cura" } - - margin: UM.Theme.getSize("default_margin").width - - property alias swatchGridColumns: colorSwatchGrid.columns - - // In this case we would like to let the content of the dialog determine the size of the dialog - // however with the current implementation of the dialog this is not possible, so instead we calculate - // the size of the dialog ourselves. - // Ugly workaround for windows having overlapping elements due to incorrect dialog width - minimumWidth: content.width + (Qt.platform.os === "windows" ? 4 * margin : 2 * margin) - minimumHeight: { - const footerHeight = Math.max(okButton.height, cancelButton.height); - return content.height + footerHeight + (Qt.platform.os === "windows" ? 5 * margin : 3 * margin); - } - - property alias color: colorInput.text - property var swatchColors: [ - "#2161AF", "#57AFB2", "#F7B32D", "#E33D4A", "#C088AD", - "#5D88BE", "#5ABD0E", "#E17239", "#F74E46", "#874AF9", - "#50C2EC", "#8DC15A", "#C3977A", "#CD7776", "#9086BA", - "#FFFFFF", "#D3D3D3", "#9E9E9E", "#5A5A5A", "#000000", - ] - - Component.onCompleted: updateSwatches() - onSwatchColorsChanged: updateSwatches() - - function updateSwatches() - { - swatchColorsModel.clear(); - for (const swatchColor of base.swatchColors) - { - swatchColorsModel.append({ swatchColor }); - } - } - - Column - { - id: content - width: childrenRect.width - height: childrenRect.height - spacing: UM.Theme.getSize("wide_margin").height - - GridLayout { - id: colorSwatchGrid - columns: 5 - width: childrenRect.width - height: childrenRect.height - columnSpacing: UM.Theme.getSize("thick_margin").width - rowSpacing: UM.Theme.getSize("thick_margin").height - - Repeater - { - model: ListModel - { - id: swatchColorsModel - } - - delegate: Rectangle - { - color: swatchColor - implicitWidth: UM.Theme.getSize("medium_button_icon").width - implicitHeight: UM.Theme.getSize("medium_button_icon").height - radius: width / 2 - - UM.ColorImage - { - anchors.fill: parent - visible: swatchColor == base.color - source: UM.Theme.getIcon("Check", "low") - color: UM.Theme.getColor("checkbox") - } - - MouseArea - { - anchors.fill: parent - onClicked: base.color = swatchColor - } - } - } - } - - RowLayout - { - width: parent.width - spacing: UM.Theme.getSize("default_margin").width - - UM.Label - { - text: catalog.i18nc("@label", "Hex") - } - - Cura.TextField - { - id: colorInput - Layout.fillWidth: true - text: "#FFFFFF" - selectByMouse: true - onTextChanged: { - if (!text.startsWith("#")) - { - text = `#${text}`; - } - } - validator: UM.HexColorValidator {} - } - - Rectangle - { - color: base.color - Layout.preferredHeight: parent.height - Layout.preferredWidth: height - } - } - } - - buttonSpacing: UM.Theme.getSize("thin_margin").width - - rightButtons: - [ - Cura.TertiaryButton { - id: cancelButton - text: catalog.i18nc("@action:button", "Cancel") - onClicked: base.close() - }, - Cura.PrimaryButton { - id: okButton - text: catalog.i18nc("@action:button", "OK") - onClicked: base.accept() - } - ] -} \ No newline at end of file diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml index d37150075b..3245009a96 100644 --- a/resources/qml/Preferences/Materials/MaterialsView.qml +++ b/resources/qml/Preferences/Materials/MaterialsView.qml @@ -256,12 +256,12 @@ Item // popup dialog to select a new color // if successful it sets the properties.color_code value to the new color - Cura.ColorDialog + ColorDialog { id: colorDialog title: catalog.i18nc("@title", "Material color picker") - color: properties.color_code - onAccepted: base.setMetaDataEntry("color_code", properties.color_code, color) + selectedColor: properties.color_code + onAccepted: base.setMetaDataEntry("color_code", properties.color_code, selectedColor) } } } From f5785cf2354e433409225426ce8811e372e32ba4 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 14 Jul 2023 11:42:44 +0200 Subject: [PATCH 10/14] Add serialport logging to autobaudjob --- plugins/USBPrinting/AutoDetectBaudJob.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/USBPrinting/AutoDetectBaudJob.py b/plugins/USBPrinting/AutoDetectBaudJob.py index 1b791f6187..9d7a045bcc 100644 --- a/plugins/USBPrinting/AutoDetectBaudJob.py +++ b/plugins/USBPrinting/AutoDetectBaudJob.py @@ -21,7 +21,7 @@ class AutoDetectBaudJob(Job): self._all_baud_rates = [115200, 250000, 500000, 230400, 76800, 57600, 38400, 19200, 9600] def run(self) -> None: - Logger.log("d", "Auto detect baud rate started.") + Logger.debug(f"Auto detect baud rate started for {self._serial_port}") wait_response_timeouts = [3, 15, 30] wait_bootloader_times = [1.5, 5, 15] write_timeout = 3 From 9d72cc6acab8b450f703a586b5c807e788b47e17 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 14 Jul 2023 11:45:04 +0200 Subject: [PATCH 11/14] Update logging for autodetect baudrate --- plugins/USBPrinting/AutoDetectBaudJob.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/USBPrinting/AutoDetectBaudJob.py b/plugins/USBPrinting/AutoDetectBaudJob.py index 9d7a045bcc..1a7187be4d 100644 --- a/plugins/USBPrinting/AutoDetectBaudJob.py +++ b/plugins/USBPrinting/AutoDetectBaudJob.py @@ -46,8 +46,7 @@ class AutoDetectBaudJob(Job): wait_bootloader = wait_bootloader_times[retry] else: wait_bootloader = wait_bootloader_times[-1] - Logger.log("d", "Checking {serial} if baud rate {baud_rate} works. Retry nr: {retry}. Wait timeout: {timeout}".format( - serial = self._serial_port, baud_rate = baud_rate, retry = retry, timeout = wait_response_timeout)) + Logger.debug(f"Checking {self._serial_port} if baud rate {baud_rate} works. Retry nr: {retry}. Wait timeout: {wait_response_timeout}") if serial is None: try: @@ -61,7 +60,9 @@ class AutoDetectBaudJob(Job): serial.baudrate = baud_rate except ValueError: continue - sleep(wait_bootloader) # Ensure that we are not talking to the boot loader. 1.5 seconds seems to be the magic number + + # Ensure that we are not talking to the boot loader. 1.5 seconds seems to be the magic number + sleep(wait_bootloader) serial.write(b"\n") # Ensure we clear out previous responses serial.write(b"M105\n") @@ -83,4 +84,5 @@ class AutoDetectBaudJob(Job): serial.write(b"M105\n") sleep(15) # Give the printer some time to init and try again. + Logger.debug(f"Unable to find a working baudrate for {serial}") self.setResult(None) # Unable to detect the correct baudrate. From e05feb642fcc63bc13b64274e6184269242eee07 Mon Sep 17 00:00:00 2001 From: Randy Zwitch Date: Sat, 15 Jul 2023 13:18:31 -0400 Subject: [PATCH 12/14] Update PULL_REQUEST_TEMPLATE.md When clicked from PR, the link is broken (Chrome, Windows 11). It appears that GitHub might be case-sensitive w.r.t URLs. --- .github/PULL_REQUEST_TEMPLATE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index a6327de3b6..8a014c17bc 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -28,6 +28,6 @@ This fixes... OR This improves... --> - [ ] My code follows the style guidelines of this project as described in [UltiMaker Meta](https://github.com/Ultimaker/Meta) and [Cura QML best practices](https://github.com/Ultimaker/Cura/wiki/QML-Best-Practices) -- [ ] I have read the [Contribution guide](https://github.com/Ultimaker/Cura/blob/main/contributing.md) +- [ ] I have read the [Contribution guide](https://github.com/Ultimaker/Cura/blob/main/CONTRIBUTING.md) - [ ] I have commented my code, particularly in hard-to-understand areas -- [ ] I have uploaded any files required to test this change \ No newline at end of file +- [ ] I have uploaded any files required to test this change From 4d99dabefcae552affff698725f887f666bf5db3 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Mon, 17 Jul 2023 10:42:07 +0200 Subject: [PATCH 13/14] Discription added in the tooltip about skirt presence even after disabling it CURA-10758 --- .../Recommended/RecommendedAdhesionSelector.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml index 2183ef7d5e..07e9c1ffaa 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml @@ -17,7 +17,7 @@ RecommendedSettingSection enableSectionSwitchVisible: platformAdhesionType.properties.enabled === "True" enableSectionSwitchChecked: platformAdhesionType.properties.value !== "skirt" && platformAdhesionType.properties.value !== "none" enableSectionSwitchEnabled: recommendedPrintSetup.settingsEnabled - tooltipText: catalog.i18nc("@label", "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards.") + tooltipText: catalog.i18nc("@label", "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards. Disabling it results in a skirt around object by default.") property var curaRecommendedMode: Cura.RecommendedMode {} From 62d3e1cf40863064a4a2186a5562f30a3d5a37fa Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 17 Jul 2023 12:55:52 +0200 Subject: [PATCH 14/14] Automatically scroll down in crash handler It was reaaaaaly annoying me that people would post screenshots all the time. Those screenshots would never include the info you need, because it would only capture the top of the exception / logs. --- cura/CrashHandler.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cura/CrashHandler.py b/cura/CrashHandler.py index e6214d7073..e2f20355c7 100644 --- a/cura/CrashHandler.py +++ b/cura/CrashHandler.py @@ -22,7 +22,7 @@ except ImportError: from PyQt6.QtCore import QT_VERSION_STR, PYQT_VERSION_STR, QUrl from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout, QLabel, QTextEdit, QGroupBox, QCheckBox, QPushButton -from PyQt6.QtGui import QDesktopServices +from PyQt6.QtGui import QDesktopServices, QTextCursor from UM.Application import Application from UM.Logger import Logger @@ -309,7 +309,7 @@ class CrashHandler: trace = "".join(trace_list) text_area.setText(trace) text_area.setReadOnly(True) - + text_area.moveCursor(QTextCursor.MoveOperation.End) # Move cursor to end, so we see last bit of the exception layout.addWidget(text_area) group.setLayout(layout) @@ -400,7 +400,7 @@ class CrashHandler: text_area.setText(logdata) text_area.setReadOnly(True) - + text_area.moveCursor(QTextCursor.MoveOperation.End) # Move cursor to end, so we see last bit of the log layout.addWidget(text_area) group.setLayout(layout)