From db316708d6c0bfd0623aefb07a1a8947ae29be6b Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Wed, 21 Mar 2018 10:48:03 +0100 Subject: [PATCH 1/6] CURA-4902 Challenging network message fix This bug was very complicated to fix and involved careful troubleshooting of networked printers and eventual application of text-based message parsing and case switching. Should work now though. --- plugins/UM3NetworkPrinting/PrinterInfoBlock.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml index 54a34fae46..74670766ff 100644 --- a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml @@ -41,7 +41,8 @@ Rectangle return catalog.i18nc("@label:status", "Available"); case "unreachable": return catalog.i18nc("@label:MonitorStatus", "Lost connection with the printer"); - case "maintenance": // TODO: new string + case "maintenance": + return catalog.i18nc("@label:status", "Unavailable"); case "unknown": default: return catalog.i18nc("@label Printer status", "Unknown"); From 3e7e828f4bb5d14f47a6fd05fab9f4385df1c73c Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Wed, 21 Mar 2018 11:31:01 +0100 Subject: [PATCH 2/6] CURA-4902 Standardized i18nc message labels This one goes out to @fieldofview. :heart: --- plugins/UM3NetworkPrinting/PrinterInfoBlock.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml index 74670766ff..f55bc30d2e 100644 --- a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml @@ -34,18 +34,18 @@ Rectangle switch (printer.state) { case "pre_print": - return catalog.i18nc("@label", "Preparing to print") + return catalog.i18nc("@label:status", "Preparing to print") case "printing": return catalog.i18nc("@label:status", "Printing"); case "idle": return catalog.i18nc("@label:status", "Available"); case "unreachable": - return catalog.i18nc("@label:MonitorStatus", "Lost connection with the printer"); + return catalog.i18nc("@label:status", "Lost connection with the printer"); case "maintenance": return catalog.i18nc("@label:status", "Unavailable"); case "unknown": default: - return catalog.i18nc("@label Printer status", "Unknown"); + return catalog.i18nc("@label:status", "Unknown"); } } From 6443db5853b97319766654135e3d085065c85f6d Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Wed, 21 Mar 2018 11:32:52 +0100 Subject: [PATCH 3/6] CURA-4902 Removed useless case Default case _is_ unknown! --- plugins/UM3NetworkPrinting/PrinterInfoBlock.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml index f55bc30d2e..0217767a40 100644 --- a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml @@ -43,7 +43,6 @@ Rectangle return catalog.i18nc("@label:status", "Lost connection with the printer"); case "maintenance": return catalog.i18nc("@label:status", "Unavailable"); - case "unknown": default: return catalog.i18nc("@label:status", "Unknown"); } From c6e5123c2df17a7354d804596330e165544f6e60 Mon Sep 17 00:00:00 2001 From: Mark Date: Wed, 21 Mar 2018 13:23:33 +0100 Subject: [PATCH 4/6] Update the link so we can see how many people use it --- plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py b/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py index fd6c4680e8..66ee43209f 100644 --- a/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py +++ b/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py @@ -69,7 +69,7 @@ class FirmwareUpdateCheckerJob(Job): # If we do this in a cool way, the download url should be available in the JSON file if self._set_download_url_callback: - self._set_download_url_callback("https://ultimaker.com/en/resources/20500-upgrade-firmware") + self._set_download_url_callback("https://ultimaker.com/en/resources/23129-updating-the-firmware?utm_source=cura&utm_medium=software&utm_campaign=hw-update") message.actionTriggered.connect(self._callback) message.show() From 143ee07228235594ca5278f23c62d8606b3e75a1 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 21 Mar 2018 13:25:05 +0100 Subject: [PATCH 5/6] Fix quality_type "Extra coarse" -> "extra coarse" CURA-5129 --- .../VersionUpgrade32to33/VersionUpgrade32to33.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/VersionUpgrade/VersionUpgrade32to33/VersionUpgrade32to33.py b/plugins/VersionUpgrade/VersionUpgrade32to33/VersionUpgrade32to33.py index 620f367e25..e39266884d 100644 --- a/plugins/VersionUpgrade/VersionUpgrade32to33/VersionUpgrade32to33.py +++ b/plugins/VersionUpgrade/VersionUpgrade32to33/VersionUpgrade32to33.py @@ -127,6 +127,9 @@ class VersionUpgrade32to33(VersionUpgrade): parser["metadata"]["position"] = str(extruder_position) del parser["metadata"]["extruder"] + quality_type = parser["metadata"]["quality_type"] + parser["metadata"]["quality_type"] = quality_type.lower() + #Update version number. parser["general"]["version"] = "3" From da00bdf9c325e9e124ea1c20f351470bf01e3b4e Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 21 Mar 2018 13:50:56 +0100 Subject: [PATCH 6/6] Fix SimulationView onSceneChanged signal binding CURA-5130 --- plugins/SimulationView/SimulationView.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/SimulationView/SimulationView.py b/plugins/SimulationView/SimulationView.py index 456d64e250..3697e38661 100644 --- a/plugins/SimulationView/SimulationView.py +++ b/plugins/SimulationView/SimulationView.py @@ -74,7 +74,7 @@ class SimulationView(View): self._global_container_stack = None self._proxy = SimulationViewProxy() - self._controller.getScene().getRoot().childrenChanged.connect(self._onSceneChanged) + self._controller.getScene().sceneChanged.connect(self._onSceneChanged) self._resetSettings() self._legend_items = None