From e04a63d337b66d0c9c1b8bac3fa5bdc8fee86590 Mon Sep 17 00:00:00 2001 From: Simon Edwards Date: Sat, 30 Sep 2017 10:48:16 +0200 Subject: [PATCH 01/12] CL-468 The sidebar in the monitor tab should have a grey background Subtask of CL-457 Cura plugin: primary visual improvements --- plugins/UM3NetworkPrinting/ClusterControlItem.qml | 4 +++- plugins/UM3NetworkPrinting/ClusterMonitorItem.qml | 4 ++-- resources/themes/cura-dark/theme.json | 2 +- resources/themes/cura-light/theme.json | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/plugins/UM3NetworkPrinting/ClusterControlItem.qml b/plugins/UM3NetworkPrinting/ClusterControlItem.qml index f2e2b601f2..e4e3d890a0 100644 --- a/plugins/UM3NetworkPrinting/ClusterControlItem.qml +++ b/plugins/UM3NetworkPrinting/ClusterControlItem.qml @@ -6,11 +6,13 @@ import Cura 1.0 as Cura Component { - Item + Rectangle { id: base property var manager: Cura.MachineManager.printerOutputDevices[0] anchors.fill: parent + color: UM.Theme.getColor("viewport_background") + property var lineColor: "#DCDCDC" // TODO: Should be linked to theme. property var cornerRadius: 4 * screenScaleFactor // TODO: Should be linked to theme. diff --git a/plugins/UM3NetworkPrinting/ClusterMonitorItem.qml b/plugins/UM3NetworkPrinting/ClusterMonitorItem.qml index 48fb0a33fc..497b762ea9 100644 --- a/plugins/UM3NetworkPrinting/ClusterMonitorItem.qml +++ b/plugins/UM3NetworkPrinting/ClusterMonitorItem.qml @@ -10,8 +10,8 @@ Component Rectangle { width: maximumWidth - height: maximumHeight - color: "#FFFFFF" // TODO; Should not be hardcoded. + height: maximumHeight + color: UM.Theme.getColor("viewport_background") property var emphasisColor: "#44c0ff" //TODO: should be linked to theme. property var lineColor: "#DCDCDC" // TODO: Should be linked to theme. diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index 187896aa28..f39fe96c37 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -16,7 +16,7 @@ "secondary": [241, 242, 242, 255], "topbar_background_color": [0, 0, 0, 0], - "topbar_background_color_monitoring": [39, 44, 48, 255], + "topbar_background_color_monitoring": [0, 0, 0, 0], "topbar_button_text_active": [255, 255, 255, 255], "topbar_button_text_inactive": [128, 128, 128, 255], diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 62e22e4f0d..74b6bfb7ab 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -68,7 +68,7 @@ "secondary": [245, 245, 245, 255], "topbar_background_color": [255, 255, 255, 0], - "topbar_background_color_monitoring": [255, 255, 255, 255], + "topbar_background_color_monitoring": [255, 255, 255, 0], "topbar_button_text_active": [0, 0, 0, 255], "topbar_button_text_inactive": [128, 128, 128, 255], From 7aa2f5f0b8d037d35ffa32d40e235f24c4c1789d Mon Sep 17 00:00:00 2001 From: Simon Edwards Date: Sat, 30 Sep 2017 10:52:34 +0200 Subject: [PATCH 02/12] Disable the fade on the monitor blue overlay to prevent the annoying "flash of blue" problem CL-457 CL-468 --- resources/qml/Cura.qml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 2399fb4395..c157396c7d 100755 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -386,7 +386,10 @@ UM.MainWindow visible: opacity > 0 opacity: base.showPrintMonitor ? 1 : 0 - Behavior on opacity { NumberAnimation { duration: 100; } } + // Behavior on opacity { NumberAnimation { duration: 100; } } + + // ^ This has been turned off to prevent the flash of blue when switch from + // Monitor tab to Prepare in combination with a Cura Connect printer. MouseArea { anchors.fill: parent From 43a6231131f77ebfe27adedfc294076229ce8c80 Mon Sep 17 00:00:00 2001 From: Simon Edwards Date: Sat, 30 Sep 2017 11:05:04 +0200 Subject: [PATCH 03/12] CL-469 Remove the "Printer Group" text from the sidebar. Subtask of CL-457 Cura plugin: primary visual improvements --- plugins/UM3NetworkPrinting/ClusterControlItem.qml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/plugins/UM3NetworkPrinting/ClusterControlItem.qml b/plugins/UM3NetworkPrinting/ClusterControlItem.qml index e4e3d890a0..4df0232dcc 100644 --- a/plugins/UM3NetworkPrinting/ClusterControlItem.qml +++ b/plugins/UM3NetworkPrinting/ClusterControlItem.qml @@ -31,22 +31,13 @@ Component anchors.horizontalCenter: parent.horizontalCenter text: Cura.MachineManager.printerOutputDevices[0].name } - Label - { - id: printerGroupLabel - anchors.top: activePrintersLabel.bottom - text: catalog.i18nc("@label", "PRINTER GROUP") - anchors.horizontalCenter: parent.horizontalCenter - font: UM.Theme.getFont("very_small") - opacity: 0.65 - } - + Rectangle { id: printJobArea border.width: UM.Theme.getSize("default_lining").width border.color: lineColor - anchors.top: printerGroupLabel.bottom + anchors.top: activePrintersLabel.bottom anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.left: parent.left anchors.leftMargin: UM.Theme.getSize("default_margin").width From cee8a687da6ea16d78e72378eb8a11790d8f563b Mon Sep 17 00:00:00 2001 From: Simon Edwards Date: Sat, 30 Sep 2017 11:06:31 +0200 Subject: [PATCH 04/12] Show the printer status as 'printing' in the case that a running print job isn't under control of Cura Connect --- plugins/UM3NetworkPrinting/PrinterInfoBlock.qml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml index e548c9e9d7..d20e4bd22f 100644 --- a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml @@ -266,6 +266,10 @@ Rectangle return ""; } } + if (printer.status == "printing") + { + return catalog.i18nc("@label:status", "Printing") + } return catalog.i18nc("@label:status", "Available"); } From eb85c28c10670619bede1020770cfeb49cdd810c Mon Sep 17 00:00:00 2001 From: Simon Edwards Date: Sat, 30 Sep 2017 11:46:55 +0200 Subject: [PATCH 05/12] CL-476 "View print jobs" and "View printers" buttons should be blue Subtask of CL-457 Cura plugin: primary visual improvements --- .../UM3NetworkPrinting/OpenPanelButton.qml | 55 ++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/OpenPanelButton.qml b/plugins/UM3NetworkPrinting/OpenPanelButton.qml index 3915c1f9eb..a06a97f8f9 100644 --- a/plugins/UM3NetworkPrinting/OpenPanelButton.qml +++ b/plugins/UM3NetworkPrinting/OpenPanelButton.qml @@ -14,5 +14,58 @@ Button { tooltip: catalog.i18nc("@info:tooltip", "Opens the print jobs page with your default web browser.") text: catalog.i18nc("@action:button", "View print jobs") - style: UM.Theme.styles.sidebar_action_button + // FIXME: This button style is copied and duplicated from SaveButton.qml + style: ButtonStyle { + background: Rectangle + { + border.width: UM.Theme.getSize("default_lining").width + border.color: + { + if(!control.enabled) + return UM.Theme.getColor("action_button_disabled_border"); + else if(control.pressed) + return UM.Theme.getColor("print_button_ready_pressed_border"); + else if(control.hovered) + return UM.Theme.getColor("print_button_ready_hovered_border"); + else + return UM.Theme.getColor("print_button_ready_border"); + } + color: + { + if(!control.enabled) + return UM.Theme.getColor("action_button_disabled"); + else if(control.pressed) + return UM.Theme.getColor("print_button_ready_pressed"); + else if(control.hovered) + return UM.Theme.getColor("print_button_ready_hovered"); + else + return UM.Theme.getColor("print_button_ready"); + } + + Behavior on color { ColorAnimation { duration: 50; } } + + implicitWidth: actualLabel.contentWidth + (UM.Theme.getSize("sidebar_margin").width * 2) + + Label { + id: actualLabel + anchors.centerIn: parent + color: + { + if(!control.enabled) + return UM.Theme.getColor("action_button_disabled_text"); + else if(control.pressed) + return UM.Theme.getColor("print_button_ready_text"); + else if(control.hovered) + return UM.Theme.getColor("print_button_ready_text"); + else + return UM.Theme.getColor("print_button_ready_text"); + } + font: UM.Theme.getFont("action_button") + text: control.text; + } + } + label: Item { } + } + + } From 553a309d2367966c8eb99fa4b069bd0462034f3c Mon Sep 17 00:00:00 2001 From: Simon Edwards Date: Sat, 30 Sep 2017 12:59:46 +0200 Subject: [PATCH 06/12] CL-473 Print job duration time has the wrong format. Use the Cura format from the Prepare tab. Subtask of CL-457 Cura plugin: primary visual improvements --- .../NetworkClusterPrinterOutputDevice.py | 5 +++++ plugins/UM3NetworkPrinting/PrinterInfoBlock.qml | 9 +-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/plugins/UM3NetworkPrinting/NetworkClusterPrinterOutputDevice.py b/plugins/UM3NetworkPrinting/NetworkClusterPrinterOutputDevice.py index 2a14b1d6dc..e28e63c8ea 100644 --- a/plugins/UM3NetworkPrinting/NetworkClusterPrinterOutputDevice.py +++ b/plugins/UM3NetworkPrinting/NetworkClusterPrinterOutputDevice.py @@ -17,6 +17,7 @@ from UM.Logger import Logger from UM.Message import Message from UM.OutputDevice import OutputDeviceError from UM.i18n import i18nCatalog +from UM.Qt.Duration import Duration, DurationFormat from . import NetworkPrinterOutputDevice @@ -652,3 +653,7 @@ class NetworkClusterPrinterOutputDevice(NetworkPrinterOutputDevice.NetworkPrinte self._reply.abort() self._reply = None Application.getInstance().showPrintMonitor.emit(False) + + @pyqtSlot(int, result=str) + def formatDuration(self, seconds): + return Duration(seconds).getDisplayString(DurationFormat.Format.Short) diff --git a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml index d20e4bd22f..c2cb4b7383 100644 --- a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml @@ -14,14 +14,7 @@ Rectangle function getPrettyTime(time) { - var hours = Math.floor(time / 3600) - time -= hours * 3600 - var minutes = Math.floor(time / 60); - time -= minutes * 60 - var seconds = Math.floor(time); - - var finalTime = strPadLeft(hours, "0", 2) + ':' + strPadLeft(minutes,'0',2)+ ':' + strPadLeft(seconds,'0',2); - return finalTime; + return OutputDevice.formatDuration(time) } function formatPrintJobPercent(printJob) From 5865d5200039c9918cdc189e4a0f2c6cc48cd9be Mon Sep 17 00:00:00 2001 From: Simon Edwards Date: Sun, 1 Oct 2017 12:01:08 +0200 Subject: [PATCH 07/12] CL-474 Fix the image used for the camera icon Subtask of CL-457 Cura plugin: primary visual improvements --- .../UM3NetworkPrinting/PrinterInfoBlock.qml | 25 ++++++++++++++----- plugins/UM3NetworkPrinting/camera-icon.svg | 9 ++++--- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml index c2cb4b7383..c1ca7eba0b 100644 --- a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml @@ -136,15 +136,28 @@ Rectangle anchors.right: printProgressArea.left anchors.rightMargin: UM.Theme.getSize("default_margin").width color: emphasisColor - UM.RecolorImage + + Image { - anchors.verticalCenter: parent.verticalCenter - anchors.horizontalCenter: parent.horizontalCenter + width: 40 * screenScaleFactor + height: width + anchors.right: printProgressArea.left + anchors.rightMargin: UM.Theme.getSize("default_margin").width source: "camera-icon.svg" - width: sourceSize.width - height: sourceSize.height * width / sourceSize.width - color: "white" } + + // FIXME: Currently using Image instead of UM.RecolorImage because RecolorImage has + // the bad side effect of scaling/shrinking the image on my HiDPI laptop screen(!) + + // UM.RecolorImage + // { + // anchors.verticalCenter: parent.verticalCenter + // anchors.horizontalCenter: parent.horizontalCenter + // source: "camera-icon.svg" + // width: sourceSize.width + // height: sourceSize.height * width / sourceSize.width + // color: "white" + // } } Row // PrintCode config diff --git a/plugins/UM3NetworkPrinting/camera-icon.svg b/plugins/UM3NetworkPrinting/camera-icon.svg index 2aafc4b6f4..29adfa5875 100644 --- a/plugins/UM3NetworkPrinting/camera-icon.svg +++ b/plugins/UM3NetworkPrinting/camera-icon.svg @@ -1,3 +1,6 @@ - - - + + + + + + \ No newline at end of file From 3abf25937ba39f58d5563a3fb2851fb000495894 Mon Sep 17 00:00:00 2001 From: Simon Edwards Date: Sun, 1 Oct 2017 13:30:44 +0200 Subject: [PATCH 08/12] CL-470 Add icons to the printer state box on the monitor tab. Subtask of CL-457 Cura plugin: primary visual improvements --- .../UM3NetworkPrinting/PrinterInfoBlock.qml | 38 ++++++++++++++++++- .../action-required-icon.svg | 8 ++++ plugins/UM3NetworkPrinting/blocked-icon.svg | 6 +++ plugins/UM3NetworkPrinting/checkmark-icon.svg | 3 ++ 4 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 plugins/UM3NetworkPrinting/action-required-icon.svg create mode 100644 plugins/UM3NetworkPrinting/blocked-icon.svg create mode 100644 plugins/UM3NetworkPrinting/checkmark-icon.svg diff --git a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml index c1ca7eba0b..23e0c712f7 100644 --- a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml @@ -223,6 +223,9 @@ Rectangle //border.color: lineColor height: 40 * screenScaleFactor anchors.left: parent.left + property var showPercent: { + return printJob != null && (["printing", "post_print", "pre_print", "sent_to_printer"].indexOf(printJob.status) !== -1); + } Label { @@ -283,6 +286,7 @@ Rectangle font: UM.Theme.getFont("small") } + Label { id: progressText @@ -292,10 +296,42 @@ Rectangle anchors.top: statusText.top text: formatPrintJobPercent(printJob) - visible: printJob != null && (["printing", "post_print", "pre_print", "sent_to_printer"].indexOf(printJob.status) !== -1) + visible: printProgressTitleBar.showPercent opacity: 0.65 font: UM.Theme.getFont("very_small") } + + Image + { + width: 16 * screenScaleFactor + height: width + anchors.right: parent.right + anchors.rightMargin: UM.Theme.getSize("default_margin").width + anchors.top: statusText.top + + visible: ! printProgressTitleBar.showPercent + + source: { + if ( ! printer.enabled) + { + return "blocked-icon.svg"; + } + if (printJob != null) + { + if(printJob.status === "queued") + { + if (printJob.configuration_changes_required != null && printJob.configuration_changes_required.length !== 0) + { + return "action-required-icon.svg"; + } + } else if (printJob.status === "wait_cleanup") + { + return "checkmark-icon.svg"; + } + } + } + } + Rectangle { //TODO: This will become a progress bar in the future diff --git a/plugins/UM3NetworkPrinting/action-required-icon.svg b/plugins/UM3NetworkPrinting/action-required-icon.svg new file mode 100644 index 0000000000..78d3b2e398 --- /dev/null +++ b/plugins/UM3NetworkPrinting/action-required-icon.svg @@ -0,0 +1,8 @@ + + + + + ! + + + diff --git a/plugins/UM3NetworkPrinting/blocked-icon.svg b/plugins/UM3NetworkPrinting/blocked-icon.svg new file mode 100644 index 0000000000..991343018b --- /dev/null +++ b/plugins/UM3NetworkPrinting/blocked-icon.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/plugins/UM3NetworkPrinting/checkmark-icon.svg b/plugins/UM3NetworkPrinting/checkmark-icon.svg new file mode 100644 index 0000000000..446e65c87b --- /dev/null +++ b/plugins/UM3NetworkPrinting/checkmark-icon.svg @@ -0,0 +1,3 @@ + + + From 2264c6c30342d5973dbc07b4c575351f4d0a99c9 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Mon, 2 Oct 2017 11:37:08 +0200 Subject: [PATCH 09/12] CL-457 corrected qml errors --- plugins/UM3NetworkPrinting/PrinterInfoBlock.qml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml index 23e0c712f7..ac869cf80c 100644 --- a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml @@ -141,8 +141,8 @@ Rectangle { width: 40 * screenScaleFactor height: width - anchors.right: printProgressArea.left - anchors.rightMargin: UM.Theme.getSize("default_margin").width + anchors.right: parent.right + anchors.rightMargin: parent.rightMargin source: "camera-icon.svg" } @@ -301,7 +301,7 @@ Rectangle font: UM.Theme.getFont("very_small") } - Image + Image { width: 16 * screenScaleFactor height: width @@ -310,7 +310,7 @@ Rectangle anchors.top: statusText.top visible: ! printProgressTitleBar.showPercent - + source: { if ( ! printer.enabled) { @@ -329,6 +329,7 @@ Rectangle return "checkmark-icon.svg"; } } + return ""; // We're not going to show it, so it will not be resolved as a url. } } @@ -354,7 +355,7 @@ Rectangle width: parent.width - 2 * UM.Theme.getSize("default_margin").width - visible: showExtended + visible: printProgressArea.showExtended Label // Status detail { From 48ad909431241be27b8df592244ff630bcaa45c8 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Mon, 2 Oct 2017 11:45:09 +0200 Subject: [PATCH 10/12] CL-457 removed commented out code --- plugins/UM3NetworkPrinting/PrinterInfoBlock.qml | 13 ------------- resources/qml/Cura.qml | 5 ----- 2 files changed, 18 deletions(-) diff --git a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml index ac869cf80c..f8c957880a 100644 --- a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml @@ -145,19 +145,6 @@ Rectangle anchors.rightMargin: parent.rightMargin source: "camera-icon.svg" } - - // FIXME: Currently using Image instead of UM.RecolorImage because RecolorImage has - // the bad side effect of scaling/shrinking the image on my HiDPI laptop screen(!) - - // UM.RecolorImage - // { - // anchors.verticalCenter: parent.verticalCenter - // anchors.horizontalCenter: parent.horizontalCenter - // source: "camera-icon.svg" - // width: sourceSize.width - // height: sourceSize.height * width / sourceSize.width - // color: "white" - // } } Row // PrintCode config diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index c157396c7d..455b8afdfc 100755 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -386,11 +386,6 @@ UM.MainWindow visible: opacity > 0 opacity: base.showPrintMonitor ? 1 : 0 - // Behavior on opacity { NumberAnimation { duration: 100; } } - - // ^ This has been turned off to prevent the flash of blue when switch from - // Monitor tab to Prepare in combination with a Cura Connect printer. - MouseArea { anchors.fill: parent acceptedButtons: Qt.AllButtons From f15f6e2e377e8784e888f55530cf3fea73481319 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Mon, 2 Oct 2017 11:55:54 +0200 Subject: [PATCH 11/12] CL-457 added margin to top in monitor screen --- plugins/UM3NetworkPrinting/ClusterControlItem.qml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/UM3NetworkPrinting/ClusterControlItem.qml b/plugins/UM3NetworkPrinting/ClusterControlItem.qml index 4df0232dcc..194337cca0 100644 --- a/plugins/UM3NetworkPrinting/ClusterControlItem.qml +++ b/plugins/UM3NetworkPrinting/ClusterControlItem.qml @@ -29,9 +29,11 @@ Component id: activePrintersLabel font: UM.Theme.getFont("large") anchors.horizontalCenter: parent.horizontalCenter + anchors.topMargin: UM.Theme.getSize("default_margin").height + anchors.top: parent.top text: Cura.MachineManager.printerOutputDevices[0].name } - + Rectangle { id: printJobArea @@ -233,4 +235,4 @@ Component } } } -} \ No newline at end of file +} From e1001c1aa4a3d0d97e3438453b771d7af2420c13 Mon Sep 17 00:00:00 2001 From: Simon Edwards Date: Mon, 2 Oct 2017 13:52:33 +0200 Subject: [PATCH 12/12] CL-470 Update the icon SVGs Subtask of CL-457 Cura plugin: primary visual improvements --- plugins/UM3NetworkPrinting/PrinterInfoBlock.qml | 5 +++-- .../UM3NetworkPrinting/action-required-icon.svg | 14 ++++++++------ plugins/UM3NetworkPrinting/blocked-icon.svg | 5 +---- plugins/UM3NetworkPrinting/checkmark-icon.svg | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml index f8c957880a..0500221990 100644 --- a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml @@ -290,7 +290,7 @@ Rectangle Image { - width: 16 * screenScaleFactor + width: statusText.height * screenScaleFactor height: width anchors.right: parent.right anchors.rightMargin: UM.Theme.getSize("default_margin").width @@ -311,7 +311,8 @@ Rectangle { return "action-required-icon.svg"; } - } else if (printJob.status === "wait_cleanup") + } + else if (printJob.status === "wait_cleanup") { return "checkmark-icon.svg"; } diff --git a/plugins/UM3NetworkPrinting/action-required-icon.svg b/plugins/UM3NetworkPrinting/action-required-icon.svg index 78d3b2e398..e7768849c6 100644 --- a/plugins/UM3NetworkPrinting/action-required-icon.svg +++ b/plugins/UM3NetworkPrinting/action-required-icon.svg @@ -1,8 +1,10 @@ - - - - - ! - + + + + + + + + diff --git a/plugins/UM3NetworkPrinting/blocked-icon.svg b/plugins/UM3NetworkPrinting/blocked-icon.svg index 991343018b..03bbe24e16 100644 --- a/plugins/UM3NetworkPrinting/blocked-icon.svg +++ b/plugins/UM3NetworkPrinting/blocked-icon.svg @@ -1,6 +1,3 @@ - - - - + diff --git a/plugins/UM3NetworkPrinting/checkmark-icon.svg b/plugins/UM3NetworkPrinting/checkmark-icon.svg index 446e65c87b..9d4507e551 100644 --- a/plugins/UM3NetworkPrinting/checkmark-icon.svg +++ b/plugins/UM3NetworkPrinting/checkmark-icon.svg @@ -1,3 +1,3 @@ - - + +