From 1e130637ee444e77a3cac2acbf43898c401a52d7 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 13 Sep 2019 10:38:52 +0200 Subject: [PATCH 1/8] Remove retry action from login It doesn't work anyway and there is another way that does work (eg; login via the top right) --- cura/OAuth2/AuthorizationService.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cura/OAuth2/AuthorizationService.py b/cura/OAuth2/AuthorizationService.py index 95ea47112e..68756f8df6 100644 --- a/cura/OAuth2/AuthorizationService.py +++ b/cura/OAuth2/AuthorizationService.py @@ -199,8 +199,6 @@ class AuthorizationService: self._unable_to_get_data_message.hide() self._unable_to_get_data_message = Message(i18n_catalog.i18nc("@info", "Unable to reach the Ultimaker account server."), title = i18n_catalog.i18nc("@info:title", "Warning")) - self._unable_to_get_data_message.addAction("retry", i18n_catalog.i18nc("@action:button", "Retry"), "[no_icon]", "[no_description]") - self._unable_to_get_data_message.actionTriggered.connect(self._onMessageActionTriggered) self._unable_to_get_data_message.show() except ValueError: Logger.logException("w", "Could not load auth data from preferences") @@ -222,6 +220,3 @@ class AuthorizationService: self.accessTokenChanged.emit() - def _onMessageActionTriggered(self, _, action): - if action == "retry": - self.loadAuthDataFromPreferences() From 2395567f1eb505a814f3b305e5a59138dfe8c144 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 13 Sep 2019 10:49:35 +0200 Subject: [PATCH 2/8] Only show printerTypes for active machine --- resources/qml/PrinterSelector/MachineSelectorButton.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/PrinterSelector/MachineSelectorButton.qml b/resources/qml/PrinterSelector/MachineSelectorButton.qml index c37823ba82..7fa2006687 100644 --- a/resources/qml/PrinterSelector/MachineSelectorButton.qml +++ b/resources/qml/PrinterSelector/MachineSelectorButton.qml @@ -72,6 +72,7 @@ Button verticalCenter: parent.verticalCenter } spacing: UM.Theme.getSize("narrow_margin").width + visible: machineSelectorButton.checked Repeater { From 55cdb07c1c8dd760bc4119dbfd582c472330d2cc Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Fri, 13 Sep 2019 11:06:34 +0200 Subject: [PATCH 3/8] Fix loading popup image on windows --- plugins/UM3NetworkPrinting/src/Messages/CloudFlowMessage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/src/Messages/CloudFlowMessage.py b/plugins/UM3NetworkPrinting/src/Messages/CloudFlowMessage.py index 4f2f7a71a2..311356de8e 100644 --- a/plugins/UM3NetworkPrinting/src/Messages/CloudFlowMessage.py +++ b/plugins/UM3NetworkPrinting/src/Messages/CloudFlowMessage.py @@ -28,7 +28,7 @@ class CloudFlowMessage(Message): lifetime=0, dismissable=True, option_state=False, - image_source=image_path, + image_source=QUrl.fromLocalFile(image_path), image_caption=I18N_CATALOG.i18nc("@info:status Ultimaker Cloud should not be translated.", "Connect to Ultimaker Cloud"), ) From 756c21cd1928b91f9e82e84a94f81c1e43877709 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 13 Sep 2019 13:33:06 +0200 Subject: [PATCH 4/8] Remove extra empty lines in ChangeAtZ-scipt output. --- plugins/PostProcessingPlugin/scripts/ChangeAtZ.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py b/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py index ba7b06bb1b..cdbb4a79ef 100644 --- a/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py +++ b/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py @@ -367,6 +367,8 @@ class ChangeAtZ(Script): modified_gcode = "" lines = active_layer.split("\n") for line in lines: + if line.strip() == "": + continue if ";Generated with Cura_SteamEngine" in line: TWinstances += 1 modified_gcode += ";ChangeAtZ instances: %d\n" % TWinstances From 28310e03f25ddd7067d5a72bb435f8c388f0b7bf Mon Sep 17 00:00:00 2001 From: Ellecross <32929710+Ellecross@users.noreply.github.com> Date: Mon, 16 Sep 2019 15:05:09 +0200 Subject: [PATCH 5/8] Revert "Only show printerTypes for active machine" This reverts commit 2395567f1eb505a814f3b305e5a59138dfe8c144. --- resources/qml/PrinterSelector/MachineSelectorButton.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/qml/PrinterSelector/MachineSelectorButton.qml b/resources/qml/PrinterSelector/MachineSelectorButton.qml index 7fa2006687..c37823ba82 100644 --- a/resources/qml/PrinterSelector/MachineSelectorButton.qml +++ b/resources/qml/PrinterSelector/MachineSelectorButton.qml @@ -72,7 +72,6 @@ Button verticalCenter: parent.verticalCenter } spacing: UM.Theme.getSize("narrow_margin").width - visible: machineSelectorButton.checked Repeater { From 021a04c427fa5ad92d804e94c8edb86bcc67a522 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Mon, 16 Sep 2019 15:29:34 +0200 Subject: [PATCH 6/8] Show the printer types list when we show the label every time or when only show the label for the active printer. --- resources/qml/PrinterSelector/MachineSelectorButton.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/PrinterSelector/MachineSelectorButton.qml b/resources/qml/PrinterSelector/MachineSelectorButton.qml index c37823ba82..115957dd64 100644 --- a/resources/qml/PrinterSelector/MachineSelectorButton.qml +++ b/resources/qml/PrinterSelector/MachineSelectorButton.qml @@ -72,6 +72,7 @@ Button verticalCenter: parent.verticalCenter } spacing: UM.Theme.getSize("narrow_margin").width + visible: (updatePrinterTypesOnlyWhenChecked && machineSelectorButton.checked) || !updatePrinterTypesOnlyWhenChecked Repeater { From b4d4a0e291a6e79216a6acdcd4cd5dc85e301ab5 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Mon, 16 Sep 2019 16:49:12 +0200 Subject: [PATCH 7/8] Add the Trimesh Reader to the list of bundled plugins --- resources/bundled_packages/cura.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/resources/bundled_packages/cura.json b/resources/bundled_packages/cura.json index 4d23d56e5c..2e561b6763 100644 --- a/resources/bundled_packages/cura.json +++ b/resources/bundled_packages/cura.json @@ -475,6 +475,23 @@ } } }, + "TrimeshReader": { + "package_info": { + "package_id": "TrimeshReader", + "package_type": "plugin", + "display_name": "Trimesh Reader", + "description": "Provides support for reading model files.", + "package_version": "1.0.0", + "sdk_version": "6.0.0", + "website": "https://ultimaker.com", + "author": { + "author_id": "UltimakerPackages", + "display_name": "Ultimaker B.V.", + "email": "plugins@ultimaker.com", + "website": "https://ultimaker.com" + } + } + }, "Toolbox": { "package_info": { "package_id": "Toolbox", From 5a95788493622e205dc0b8244856e9630e7dc95c Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Tue, 17 Sep 2019 09:52:44 +0200 Subject: [PATCH 8/8] Use the setting's default value when the global variant instance container is empty Otherwise it will never show as a matching configuration in the configuration list. --- cura/Settings/MachineManager.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 7b7974e6b2..dbb81f31f4 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -201,7 +201,8 @@ class MachineManager(QObject): # An empty build plate configuration from the network printer is presented as an empty string, so use "" for an # empty build plate. - self._current_printer_configuration.buildplateConfiguration = self._global_container_stack.getProperty("machine_buildplate_type", "value") if self._global_container_stack.variant != empty_variant_container else "" + self._current_printer_configuration.buildplateConfiguration = self._global_container_stack.getProperty("machine_buildplate_type", "value")\ + if self._global_container_stack.variant != empty_variant_container else self._global_container_stack.getProperty("machine_buildplate_type", "default_value") self.currentConfigurationChanged.emit() @pyqtSlot(QObject, result = bool)