From fad7885ba7d4b93404efa7494c9a8fcdcb3c12f9 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 24 Apr 2018 11:01:38 +0200 Subject: [PATCH 1/8] Add Dutch, German and French translations of string that broke freeze These are the languages other than English that I trust myself to translate properly... Contributes to issue CURA-5166. --- resources/i18n/de_DE/cura.po | 6 ++++++ resources/i18n/fr_FR/cura.po | 6 ++++++ resources/i18n/nl_NL/cura.po | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/resources/i18n/de_DE/cura.po b/resources/i18n/de_DE/cura.po index b1d7dc6a58..2c44fd7da5 100644 --- a/resources/i18n/de_DE/cura.po +++ b/resources/i18n/de_DE/cura.po @@ -18,6 +18,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.0.4\n" +#Added after the string freeze. +#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:528 +msgctxt "@label" +msgid "Use adhesion sheet or glue with this material combination" +msgstr "Verwenden Sie eiene Klebefolie oder Klebstoff mit dieser Materialcombination" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:22 msgctxt "@action" msgid "Machine Settings" diff --git a/resources/i18n/fr_FR/cura.po b/resources/i18n/fr_FR/cura.po index 16b77f4bce..6000b7f700 100644 --- a/resources/i18n/fr_FR/cura.po +++ b/resources/i18n/fr_FR/cura.po @@ -18,6 +18,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Poedit 2.0.6\n" +#Added after the string freeze. +#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:528 +msgctxt "@label" +msgid "Use adhesion sheet or glue with this material combination" +msgstr "Utilisez une feuille d'adhérence ou de la colle avec cette combinaison des matériaux" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:22 msgctxt "@action" msgid "Machine Settings" diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po index 9c5a30550b..fa9adbe908 100644 --- a/resources/i18n/nl_NL/cura.po +++ b/resources/i18n/nl_NL/cura.po @@ -16,6 +16,12 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#Added after the string freeze. +#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:528 +msgctxt "@label" +msgid "Use adhesion sheet or glue with this material combination" +msgstr "Gebruik een hechtingsvel of lijm met deze materiaalcombinatie" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:22 msgctxt "@action" msgid "Machine Settings" From d6dcb995bfe7ba39174a7a1b58691b1e8a124073 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Tue, 24 Apr 2018 11:35:21 +0200 Subject: [PATCH 2/8] Add Spanish and Italian translations to a string added after the string freeze. Contributes to issue CURA-5166. --- resources/i18n/es_ES/cura.po | 6 ++++++ resources/i18n/it_IT/cura.po | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po index dc78e804e4..fd90f0dc53 100644 --- a/resources/i18n/es_ES/cura.po +++ b/resources/i18n/es_ES/cura.po @@ -18,6 +18,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.0.6\n" +#Added after the string freeze. +#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:528 +msgctxt "@label" +msgid "Use adhesion sheet or glue with this material combination" +msgstr "Use una lámina de adherencia o pegamento con esta combinación de materiales" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:22 msgctxt "@action" msgid "Machine Settings" diff --git a/resources/i18n/it_IT/cura.po b/resources/i18n/it_IT/cura.po index 9dfc32d754..7af82763e4 100644 --- a/resources/i18n/it_IT/cura.po +++ b/resources/i18n/it_IT/cura.po @@ -16,6 +16,12 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#Added after the string freeze. +#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:528 +msgctxt "@label" +msgid "Use adhesion sheet or glue with this material combination" +msgstr "Utilizzare un foglio di adesione o colla con questa combinazione di materiali" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:22 msgctxt "@action" msgid "Machine Settings" From 10616bd4a04ab99ce2abcc782ed87d9e6926b8ce Mon Sep 17 00:00:00 2001 From: LukeChen-Ultimaker Date: Tue, 24 Apr 2018 11:58:48 +0200 Subject: [PATCH 3/8] Chinese translation for one string --- resources/i18n/zh_TW/cura.po | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/resources/i18n/zh_TW/cura.po b/resources/i18n/zh_TW/cura.po index d6d7273a47..d90a62ae05 100644 --- a/resources/i18n/zh_TW/cura.po +++ b/resources/i18n/zh_TW/cura.po @@ -18,6 +18,12 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 2.0.6\n" +#Added after the string freeze. +#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:528 +msgctxt "@label" +msgid "Use adhesion sheet or glue with this material combination" +msgstr "在此耗材組合下使用膠水或是附著墊片" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:22 msgctxt "@action" msgid "Machine Settings" From 9b77484e96bf9a7e05e015de2575e3955f83ed99 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 24 Apr 2018 11:59:23 +0200 Subject: [PATCH 4/8] Translate adhesion sheet warning text CURA-5166 --- resources/i18n/zh_CN/cura.po | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/i18n/zh_CN/cura.po b/resources/i18n/zh_CN/cura.po index 5239c65555..9aff359d2e 100644 --- a/resources/i18n/zh_CN/cura.po +++ b/resources/i18n/zh_CN/cura.po @@ -28,6 +28,11 @@ msgctxt "@item:inlistbox" msgid "X-Ray view" msgstr "透视视图" +#: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:528 +msgctxt "@label" +msgid "Use adhesion sheet or glue with this material combination" +msgstr "在此材料组合的情况下，请使用附着垫片或者胶水" + #: /home/ruben/Projects/Cura/plugins/X3DReader/__init__.py:13 msgctxt "@item:inlistbox" msgid "X3D File" From f68ab9ac037d7447fe07a55793f17598d88a059e Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Tue, 24 Apr 2018 12:42:03 +0200 Subject: [PATCH 5/8] Add the 'auto slice disabled by default' line to the changelog --- plugins/ChangeLogPlugin/ChangeLog.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/ChangeLogPlugin/ChangeLog.txt b/plugins/ChangeLogPlugin/ChangeLog.txt index 97c473c10b..d132f17b5c 100755 --- a/plugins/ChangeLogPlugin/ChangeLog.txt +++ b/plugins/ChangeLogPlugin/ChangeLog.txt @@ -24,6 +24,9 @@ Refactored machine manager resulted in less manager classes. Changing settings, *Multiply models faster Significant speed increase when multiplying models. +*Auto slicing disabled by default +The auto slice tool is now disabled by default. Users can still enable the feature in the user preferences dialog. + *Updated fonts Default font changed to NotoSans to increase readability and consistency with Cura Connect. From 0fa4df4193c274583a2df6a3c268c2c583a80c95 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Tue, 24 Apr 2018 12:42:12 +0200 Subject: [PATCH 6/8] Adjust Spanish and French translations to correctly fit in the space for the compatibility message. Contributes to CURA-5166. --- resources/i18n/es_ES/cura.po | 2 +- resources/i18n/fr_FR/cura.po | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po index fd90f0dc53..970b5c51a1 100644 --- a/resources/i18n/es_ES/cura.po +++ b/resources/i18n/es_ES/cura.po @@ -22,7 +22,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:528 msgctxt "@label" msgid "Use adhesion sheet or glue with this material combination" -msgstr "Use una lámina de adherencia o pegamento con esta combinación de materiales" +msgstr "Use láminas de adherencia o pegamento con esta combinación de materiales" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:22 msgctxt "@action" diff --git a/resources/i18n/fr_FR/cura.po b/resources/i18n/fr_FR/cura.po index 6000b7f700..60946e7a89 100644 --- a/resources/i18n/fr_FR/cura.po +++ b/resources/i18n/fr_FR/cura.po @@ -22,7 +22,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/SidebarHeader.qml:528 msgctxt "@label" msgid "Use adhesion sheet or glue with this material combination" -msgstr "Utilisez une feuille d'adhérence ou de la colle avec cette combinaison des matériaux" +msgstr "Utilisez feuilles d'adhérence ou de la colle avec cette combinaison des matériaux" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:22 msgctxt "@action" From 4d7bf579e647b17281bac2165ffcf3f2833ae48c Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 24 Apr 2018 13:49:07 +0200 Subject: [PATCH 7/8] Do not keep triggering on changed in MA --- plugins/ModelChecker/ModelChecker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/ModelChecker/ModelChecker.py b/plugins/ModelChecker/ModelChecker.py index f85a7a249a..baa4a0d00b 100644 --- a/plugins/ModelChecker/ModelChecker.py +++ b/plugins/ModelChecker/ModelChecker.py @@ -31,6 +31,7 @@ class ModelChecker(QObject, Extension): Application.getInstance().initializationFinished.connect(self._pluginsInitialized) Application.getInstance().getController().getScene().sceneChanged.connect(self._onChanged) + Application.getInstance().globalContainerStackChanged.connect(self._onChanged) ## Pass-through to allow UM.Signal to connect with a pyqtSignal. def _onChanged(self, _): @@ -53,7 +54,6 @@ class ModelChecker(QObject, Extension): # has not done yet. global_container_stack = Application.getInstance().getGlobalContainerStack() if global_container_stack is None: - Application.getInstance().callLater(lambda: self.onChanged.emit()) return False material_shrinkage = self._getMaterialShrinkage() From fca14eeef33ff622fd751f8bb10203e77aa0c8d1 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 24 Apr 2018 13:56:09 +0200 Subject: [PATCH 8/8] Fix optional arguments in MA _onChanged --- plugins/ModelChecker/ModelChecker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/ModelChecker/ModelChecker.py b/plugins/ModelChecker/ModelChecker.py index baa4a0d00b..297844a0a3 100644 --- a/plugins/ModelChecker/ModelChecker.py +++ b/plugins/ModelChecker/ModelChecker.py @@ -34,7 +34,7 @@ class ModelChecker(QObject, Extension): Application.getInstance().globalContainerStackChanged.connect(self._onChanged) ## Pass-through to allow UM.Signal to connect with a pyqtSignal. - def _onChanged(self, _): + def _onChanged(self, *args, **kwargs): self.onChanged.emit() ## Called when plug-ins are initialized.