From 1285e1b5e5a3f44a4753ed33f1488f18fa48fa47 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Tue, 5 Jun 2018 11:00:05 +0200 Subject: [PATCH 1/8] CURA-5357 Move the plugin info in packages.json only when the installation succeeded. --- cura/CuraPackageManager.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cura/CuraPackageManager.py b/cura/CuraPackageManager.py index 096bfc9065..09253a4c77 100644 --- a/cura/CuraPackageManager.py +++ b/cura/CuraPackageManager.py @@ -105,7 +105,6 @@ class CuraPackageManager(QObject): while self._to_install_package_dict: package_id, package_info = list(self._to_install_package_dict.items())[0] self._installPackage(package_info) - self._installed_package_dict[package_id] = self._to_install_package_dict[package_id] del self._to_install_package_dict[package_id] self._saveManagementData() @@ -328,6 +327,8 @@ class CuraPackageManager(QObject): # Remove the file os.remove(filename) + # Move the info to the installed list of packages only when it succeeds + self._installed_package_dict[package_id] = self._to_install_package_dict[package_id] def __installPackageFiles(self, package_id: str, src_dir: str, dst_dir: str) -> None: Logger.log("i", "Moving package {package_id} from {src_dir} to {dst_dir}".format(package_id=package_id, src_dir=src_dir, dst_dir=dst_dir)) From 59602d8013610f0fe3e6e792fa3db51c092431b4 Mon Sep 17 00:00:00 2001 From: Mark Date: Tue, 5 Jun 2018 11:56:41 +0200 Subject: [PATCH 2/8] Revert "The prepare button slices, so it should be a slice button" This reverts commit a479176c63fe3c53a380b47d0d1abe3b2c80c4a0. --- resources/qml/SaveButton.qml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/qml/SaveButton.qml b/resources/qml/SaveButton.qml index 77537b0af2..0369f492b4 100644 --- a/resources/qml/SaveButton.qml +++ b/resources/qml/SaveButton.qml @@ -100,8 +100,8 @@ Item { if (saveToButton.enabled) { saveToButton.clicked(); } - // slice button - if (sliceButton.enabled) { + // prepare button + if (prepareButton.enabled) { sliceOrStopSlicing(); } } @@ -131,7 +131,7 @@ Item { Row { id: additionalComponentsRow anchors.top: parent.top - anchors.right: saveToButton.visible ? saveToButton.left : (sliceButton.visible ? sliceButton.left : parent.right) + anchors.right: saveToButton.visible ? saveToButton.left : (prepareButton.visible ? prepareButton.left : parent.right) anchors.rightMargin: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("default_margin").width @@ -159,14 +159,14 @@ Item { onPreferenceChanged: { var autoSlice = UM.Preferences.getValue("general/auto_slice"); - sliceButton.autoSlice = autoSlice; + prepareButton.autoSlice = autoSlice; saveToButton.autoSlice = autoSlice; } } - // Slice button, only shows if auto_slice is off + // Prepare button, only shows if auto_slice is off Button { - id: sliceButton + id: prepareButton tooltip: [1, 5].indexOf(base.backendState) != -1 ? catalog.i18nc("@info:tooltip","Slice current printjob") : catalog.i18nc("@info:tooltip","Cancel slicing process") // 1 = not started, 2 = Processing @@ -180,7 +180,7 @@ Item { anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width // 1 = not started, 4 = error, 5 = disabled - text: [1, 4, 5].indexOf(base.backendState) != -1 ? catalog.i18nc("@label:Printjob", "Slice") : catalog.i18nc("@label:Printjob", "Cancel") + text: [1, 4, 5].indexOf(base.backendState) != -1 ? catalog.i18nc("@label:Printjob", "Prepare") : catalog.i18nc("@label:Printjob", "Cancel") onClicked: { sliceOrStopSlicing(); From c5929ce26c73a46b17bae5f4e1a944432e56e18b Mon Sep 17 00:00:00 2001 From: Mark Date: Tue, 5 Jun 2018 12:00:21 +0200 Subject: [PATCH 3/8] Revert "The prepare button slices, so it should be a slice button" This reverts commit a0263676e1305c2cc4b778ed5cfb7215e938705a. --- resources/qml/SaveButton.qml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/qml/SaveButton.qml b/resources/qml/SaveButton.qml index 77537b0af2..0369f492b4 100644 --- a/resources/qml/SaveButton.qml +++ b/resources/qml/SaveButton.qml @@ -100,8 +100,8 @@ Item { if (saveToButton.enabled) { saveToButton.clicked(); } - // slice button - if (sliceButton.enabled) { + // prepare button + if (prepareButton.enabled) { sliceOrStopSlicing(); } } @@ -131,7 +131,7 @@ Item { Row { id: additionalComponentsRow anchors.top: parent.top - anchors.right: saveToButton.visible ? saveToButton.left : (sliceButton.visible ? sliceButton.left : parent.right) + anchors.right: saveToButton.visible ? saveToButton.left : (prepareButton.visible ? prepareButton.left : parent.right) anchors.rightMargin: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("default_margin").width @@ -159,14 +159,14 @@ Item { onPreferenceChanged: { var autoSlice = UM.Preferences.getValue("general/auto_slice"); - sliceButton.autoSlice = autoSlice; + prepareButton.autoSlice = autoSlice; saveToButton.autoSlice = autoSlice; } } - // Slice button, only shows if auto_slice is off + // Prepare button, only shows if auto_slice is off Button { - id: sliceButton + id: prepareButton tooltip: [1, 5].indexOf(base.backendState) != -1 ? catalog.i18nc("@info:tooltip","Slice current printjob") : catalog.i18nc("@info:tooltip","Cancel slicing process") // 1 = not started, 2 = Processing @@ -180,7 +180,7 @@ Item { anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width // 1 = not started, 4 = error, 5 = disabled - text: [1, 4, 5].indexOf(base.backendState) != -1 ? catalog.i18nc("@label:Printjob", "Slice") : catalog.i18nc("@label:Printjob", "Cancel") + text: [1, 4, 5].indexOf(base.backendState) != -1 ? catalog.i18nc("@label:Printjob", "Prepare") : catalog.i18nc("@label:Printjob", "Cancel") onClicked: { sliceOrStopSlicing(); From 4652c3be0f32927e6a7755f42cc8edd63ab8d389 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Tue, 5 Jun 2018 12:46:32 +0200 Subject: [PATCH 4/8] Always try to remove old package files before installing new CURA-5442 --- cura/CuraPackageManager.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cura/CuraPackageManager.py b/cura/CuraPackageManager.py index 3d4a360c7e..1ec9e2d993 100644 --- a/cura/CuraPackageManager.py +++ b/cura/CuraPackageManager.py @@ -306,9 +306,8 @@ class CuraPackageManager(QObject): Logger.log("i", "Installing package [%s] from file [%s]", package_id, filename) - # If it's installed, remove it first and then install - if package_id in self._installed_package_dict: - self._purgePackage(package_id) + # remove it first and then install + self._purgePackage(package_id) # Install the package with zipfile.ZipFile(filename, "r") as archive: From 753101a9880459829869ed47a35d0f2417908186 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Tue, 5 Jun 2018 15:43:36 +0200 Subject: [PATCH 5/8] Uncomment the code that hides the material tab in the toolbox. Just for master.<< --- plugins/Toolbox/resources/qml/ToolboxHeader.qml | 2 -- plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml | 2 -- 2 files changed, 4 deletions(-) diff --git a/plugins/Toolbox/resources/qml/ToolboxHeader.qml b/plugins/Toolbox/resources/qml/ToolboxHeader.qml index ee4241beaf..9c9f967d54 100644 --- a/plugins/Toolbox/resources/qml/ToolboxHeader.qml +++ b/plugins/Toolbox/resources/qml/ToolboxHeader.qml @@ -34,7 +34,6 @@ Item } } - /* Hide for 3.4 ToolboxTabButton { text: catalog.i18nc("@title:tab", "Materials") @@ -47,7 +46,6 @@ Item toolbox.viewPage = "overview" } } - */ } ToolboxTabButton { diff --git a/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml b/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml index bb0f6fe346..9d916182f6 100644 --- a/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml +++ b/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml @@ -65,7 +65,6 @@ ScrollView } } } - /* Hidden in 3.4 Label { visible: toolbox.materialsInstalledModel.items.length > 0 @@ -103,6 +102,5 @@ ScrollView } } } - */ } } From e152fd641bee0558275afbce2acba7ae397c9519 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 6 Jun 2018 09:57:44 +0200 Subject: [PATCH 6/8] Remove trailing slash in Windows configuration path It shouldn't matter, but we're getting crash reports from this path so let's try this. --- cura_app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura_app.py b/cura_app.py index 8a04b8fe09..d540c8a8c4 100755 --- a/cura_app.py +++ b/cura_app.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Copyright (c) 2015 Ultimaker B.V. +# Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import argparse @@ -27,7 +27,7 @@ known_args = vars(parser.parse_known_args()[0]) if not known_args["debug"]: def get_cura_dir_path(): if Platform.isWindows(): - return os.path.expanduser("~/AppData/Roaming/cura/") + return os.path.expanduser("~/AppData/Roaming/cura") elif Platform.isLinux(): return os.path.expanduser("~/.local/share/cura") elif Platform.isOSX(): From dbd286e1cc1ad2404199b8daaaa598e3638f4f41 Mon Sep 17 00:00:00 2001 From: Aleksei S Date: Wed, 6 Jun 2018 10:47:12 +0200 Subject: [PATCH 7/8] Save as project the extruder counter starts from 1 --- resources/qml/WorkspaceSummaryDialog.qml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/resources/qml/WorkspaceSummaryDialog.qml b/resources/qml/WorkspaceSummaryDialog.qml index 0869d7e698..079d840ae7 100644 --- a/resources/qml/WorkspaceSummaryDialog.qml +++ b/resources/qml/WorkspaceSummaryDialog.qml @@ -148,9 +148,22 @@ UM.Dialog { height: childrenRect.height width: parent.width - Label + Label { - text: catalog.i18nc("@action:label", "Extruder %1").arg(modelData) + text: { + var extruder = Number(modelData) + var extruder_id = "" + if(!isNaN(extruder)) + { + extruder_id = extruder + 1 // The extruder counter start from One and not Zero + } + else + { + extruder_id = modelData + } + + return catalog.i18nc("@action:label", "Extruder %1").arg(extruder_id) + } font.bold: true } Row From da4932435c138c18feb8c0b0b572b43459654baa Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 6 Jun 2018 10:56:42 +0200 Subject: [PATCH 8/8] Add fan speed to basic setting visibility It may not be what the users often want to change, but it is something that they may be expecting to see in the custom settings mode by default. It's something that you often think of as a typical setting but in reality you don't often want to change it. Let's get closer to what the user expects. Requested by the support team of Ultimaker. --- resources/setting_visibility/basic.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/setting_visibility/basic.cfg b/resources/setting_visibility/basic.cfg index 4196a3a9e7..82045db93b 100644 --- a/resources/setting_visibility/basic.cfg +++ b/resources/setting_visibility/basic.cfg @@ -34,6 +34,7 @@ retraction_hop_enabled [cooling] cool_fan_enabled +cool_fan_speed [support] support_enable