diff --git a/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py b/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py index 0b5a0696c6..fa9abb8d4e 100644 --- a/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py +++ b/plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py @@ -396,7 +396,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) 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); } } diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index 23c19bece8..f2f33800d0 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"} @@ -425,13 +424,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 aeb75a79c5..619c197b74 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -255,7 +255,6 @@ UM.MainWindow title: catalog.i18nc("@title:menu menubar:toplevel", "P&lugins") MenuItem { action: Cura.Actions.browsePlugins } - MenuItem { action: Cura.Actions.configurePlugins } } Menu