From 77a624d3b44eb4968c941507f0396fdef2eb21a8 Mon Sep 17 00:00:00 2001 From: Aleksei S Date: Wed, 28 Feb 2018 13:04:51 +0100 Subject: [PATCH 1/5] In monitor view show Finished for "wait_user_action" in printjob.status CURA-4873 --- plugins/UM3NetworkPrinting/PrinterInfoBlock.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml index 63b374e6b9..54a34fae46 100644 --- a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml @@ -264,6 +264,7 @@ Rectangle case "wait_for_configuration": return catalog.i18nc("@label:status", "Reserved") case "wait_cleanup": + case "wait_user_action": return catalog.i18nc("@label:status", "Finished") case "pre_print": case "sent_to_printer": @@ -278,6 +279,7 @@ Rectangle case "aborted": return catalog.i18nc("@label:status", "Print aborted"); default: + // If print job has unknown status show printer.status return printerStatusText(printer); } } From 7881dce638a1aa034edca8058fcc29e46e6152d8 Mon Sep 17 00:00:00 2001 From: Andreea Scorojitu Date: Wed, 28 Feb 2018 13:33:02 +0100 Subject: [PATCH 2/5] Remove_installed_plug-ins_submenu_CURA-5029 The Installed plugins from the Plugins menu is replaced by the browser plugin window. --- resources/qml/Actions.qml | 7 ------- resources/qml/Cura.qml | 1 - 2 files changed, 8 deletions(-) diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index 05ff5050e9..ee5598990f 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -425,13 +425,6 @@ Item iconName: "plugins_browse" } - Action - { - id: configurePluginsAction - text: catalog.i18nc("@action:menu", "Installed plugins..."); - iconName: "plugins_configure" - } - Action { id: expandSidebarAction; diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index f474d93900..8c19356dd7 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -254,7 +254,6 @@ UM.MainWindow title: catalog.i18nc("@title:menu menubar:toplevel", "P&lugins") MenuItem { action: Cura.Actions.browsePlugins } - MenuItem { action: Cura.Actions.configurePlugins } } Menu From 4757f9dc0cfde302fb9bea6d076cc7d692d85592 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 28 Feb 2018 13:49:11 +0100 Subject: [PATCH 3/5] Remove invalid alias This alias was referring to something that didn't exist any more and this broke our application menu. Contributes to issue CURA-5029. --- resources/qml/Actions.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index ee5598990f..aade7c6053 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -69,7 +69,6 @@ Item property alias configureSettingVisibility: configureSettingVisibilityAction property alias browsePlugins: browsePluginsAction - property alias configurePlugins: configurePluginsAction UM.I18nCatalog{id: catalog; name:"cura"} From 3eab99c25cff62d02607e1896a8a6a4592b5d715 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Wed, 28 Feb 2018 15:06:02 +0100 Subject: [PATCH 4/5] CURA-4890 Empty material no longer displayed as Unknown "Get learned how to make Cura more better-er!" --- plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py b/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py index 26b445ef90..78bb14ea42 100644 --- a/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py +++ b/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py @@ -381,6 +381,8 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice): extruder.updateHotendID(extruder_data.get("print_core_id", "")) material_data = extruder_data["material"] + + print() if extruder.activeMaterial is None or extruder.activeMaterial.guid != material_data["guid"]: containers = ContainerRegistry.getInstance().findInstanceContainers(type="material", GUID=material_data["guid"]) @@ -396,7 +398,7 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice): color = material_data["color"] brand = material_data["brand"] material_type = material_data["material"] - name = "Unknown" + name = "Empty" if material_data["material"] == "empty" else "Unknown" material = MaterialOutputModel(guid=material_data["guid"], type=material_type, brand=brand, color=color, name=name) From f646f1102010bba4215d050279832a9309b89450 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Wed, 28 Feb 2018 15:16:04 +0100 Subject: [PATCH 5/5] CURA-4890 Removed `print()` statement. --- plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py b/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py index 78bb14ea42..a4d6998131 100644 --- a/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py +++ b/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py @@ -381,8 +381,6 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice): extruder.updateHotendID(extruder_data.get("print_core_id", "")) material_data = extruder_data["material"] - - print() if extruder.activeMaterial is None or extruder.activeMaterial.guid != material_data["guid"]: containers = ContainerRegistry.getInstance().findInstanceContainers(type="material", GUID=material_data["guid"])