From 4d9908364a860eb9941d02a49a8d4e7897da3b45 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Fri, 29 Sep 2017 16:28:18 +0200 Subject: [PATCH 01/21] Now empty message in materials and variants doesn't appear - CURA-4377 --- cura/Settings/MachineManager.py | 7 ++++++- resources/qml/SidebarSimple.qml | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 82edebec60..9cd18cec3d 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -354,11 +354,16 @@ class MachineManager(QObject): if containers: Application.getInstance().setGlobalContainerStack(containers[0]) + self.activeQualityChanged.emit() + self.activeVariantChanged.emit() + self.activeMaterialChanged.emit() + @pyqtSlot(str, str) def addMachine(self, name: str, definition_id: str) -> None: new_stack = CuraStackBuilder.createMachine(name, definition_id) if new_stack: - Application.getInstance().setGlobalContainerStack(new_stack) + # Instead of setting the global container stack here, we set the active machine and so the signals are emitted + self.setActiveMachine(new_stack.getId()) else: Logger.log("w", "Failed creating a new machine!") diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml index 0a80ae9339..9987268d57 100644 --- a/resources/qml/SidebarSimple.qml +++ b/resources/qml/SidebarSimple.qml @@ -67,6 +67,7 @@ Item target: Cura.MachineManager onActiveQualityChanged: qualityModel.update() onActiveMaterialChanged: qualityModel.update() + onActiveVariantChanged: qualityModel.update() } ListModel From e04a63d337b66d0c9c1b8bac3fa5bdc8fee86590 Mon Sep 17 00:00:00 2001 From: Simon Edwards Date: Sat, 30 Sep 2017 10:48:16 +0200 Subject: [PATCH 02/21] 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 03/21] 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 04/21] 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 05/21] 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 06/21] 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 07/21] 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 08/21] 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 09/21] 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 daa079342716fb200945e30cc75391bf89571b7e Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Mon, 2 Oct 2017 11:15:24 +0200 Subject: [PATCH 10/21] Minor code changes - CURA-4395 --- cura/Settings/MachineManager.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 9cd18cec3d..520f95e293 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -354,9 +354,7 @@ class MachineManager(QObject): if containers: Application.getInstance().setGlobalContainerStack(containers[0]) - self.activeQualityChanged.emit() - self.activeVariantChanged.emit() - self.activeMaterialChanged.emit() + self.__onInstanceContainersChanged() @pyqtSlot(str, str) def addMachine(self, name: str, definition_id: str) -> None: From 2264c6c30342d5973dbc07b4c575351f4d0a99c9 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Mon, 2 Oct 2017 11:37:08 +0200 Subject: [PATCH 11/21] 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 12/21] 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 13/21] 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 db46e9377dc3a3b11d30adb814eff6a89ff2e924 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 2 Oct 2017 13:32:46 +0200 Subject: [PATCH 14/21] Add translations for strings that were added after string freeze Please let's not do this again. The Spanish, Dutch, French, German and Chinese translations were asked to a native or secondary speaker of the language in the office. The Finnish, Italian, Russian and Turkish translations are obtained from Google Translate (with some more clever searching than copy-paste). The Korean and Japanese translations are not needed since we don't translate cura.pot for those languages. The Polish and Brazillian Portuguese translations will be made after receiving the translations from the translators. Contributes to issue CL-118. --- resources/i18n/cura.pot | 15 ++++++++++++++- resources/i18n/de_DE/cura.po | 15 +++++++++++++++ resources/i18n/es_ES/cura.po | 15 +++++++++++++++ resources/i18n/fi_FI/cura.po | 15 +++++++++++++++ resources/i18n/fr_FR/cura.po | 15 +++++++++++++++ resources/i18n/it_IT/cura.po | 15 +++++++++++++++ resources/i18n/nl_NL/cura.po | 15 +++++++++++++++ resources/i18n/ru_RU/cura.po | 15 +++++++++++++++ resources/i18n/tr_TR/cura.po | 15 +++++++++++++++ resources/i18n/zh_CN/cura.po | 15 +++++++++++++++ 10 files changed, 149 insertions(+), 1 deletion(-) diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot index 809ecded80..409fd77c7b 100644 --- a/resources/i18n/cura.pot +++ b/resources/i18n/cura.pot @@ -18,12 +18,25 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" - #: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml msgctxt "@label:status" msgid "Print aborted" msgstr "" +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Blocked" +msgstr "" + +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Action required" +msgstr "" + +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Can't start print" +msgstr "" #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29 msgctxt "@action" diff --git a/resources/i18n/de_DE/cura.po b/resources/i18n/de_DE/cura.po index 5e16a60617..1323070dbe 100644 --- a/resources/i18n/de_DE/cura.po +++ b/resources/i18n/de_DE/cura.po @@ -21,6 +21,21 @@ msgctxt "@label:status" msgid "Print aborted" msgstr "Drucken wurde abgebrochen" +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Blocked" +msgstr "Blockiert" + +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Action required" +msgstr "Handlung erforderlich" + +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Can't start print" +msgstr "Druck startet nicht" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29 msgctxt "@action" msgid "Machine Settings" diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po index f7d3d33a2e..1f4ade8a4f 100644 --- a/resources/i18n/es_ES/cura.po +++ b/resources/i18n/es_ES/cura.po @@ -21,6 +21,21 @@ msgctxt "@label:status" msgid "Print aborted" msgstr "Impresión cancelada" +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Blocked" +msgstr "Deshabilitada" + +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Action required" +msgstr "Acción requerida" + +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Can't start print" +msgstr "No se puede imprimir" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29 msgctxt "@action" msgid "Machine Settings" diff --git a/resources/i18n/fi_FI/cura.po b/resources/i18n/fi_FI/cura.po index a072a73faa..6c86ed1575 100644 --- a/resources/i18n/fi_FI/cura.po +++ b/resources/i18n/fi_FI/cura.po @@ -21,6 +21,21 @@ msgctxt "@label:status" msgid "Print aborted" msgstr "Tulostus keskeytetty" +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Blocked" +msgstr "Tukossa" + +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Action required" +msgstr "Vaatii toimenpiteitä" + +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Can't start print" +msgstr "Tulostus ei käynnisty" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29 msgctxt "@action" msgid "Machine Settings" diff --git a/resources/i18n/fr_FR/cura.po b/resources/i18n/fr_FR/cura.po index 6d20ae0695..b018bdade6 100644 --- a/resources/i18n/fr_FR/cura.po +++ b/resources/i18n/fr_FR/cura.po @@ -21,6 +21,21 @@ msgctxt "@label:status" msgid "Print aborted" msgstr "Abandon de l'impression" +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Blocked" +msgstr "Bloqué" + +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Action required" +msgstr "Action requise" + +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Can't start print" +msgstr "Ne peux pas imprimer" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29 msgctxt "@action" msgid "Machine Settings" diff --git a/resources/i18n/it_IT/cura.po b/resources/i18n/it_IT/cura.po index 3bb1cfa633..21a804d1e3 100644 --- a/resources/i18n/it_IT/cura.po +++ b/resources/i18n/it_IT/cura.po @@ -21,6 +21,21 @@ msgctxt "@label:status" msgid "Print aborted" msgstr "Stampa interrotta" +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Blocked" +msgstr "Ostacolato" + +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Action required" +msgstr "Richiede un'azione" + +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Can't start print" +msgstr "Impossibile avviare la stampa" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29 msgctxt "@action" msgid "Machine Settings" diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po index 5a547385da..ecbe70e8c3 100644 --- a/resources/i18n/nl_NL/cura.po +++ b/resources/i18n/nl_NL/cura.po @@ -21,6 +21,21 @@ msgctxt "@label:status" msgid "Print aborted" msgstr "Print afgebroken" +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Blocked" +msgstr "Geblokkeerd" + +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Action required" +msgstr "Handeling nodig" + +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Can't start print" +msgstr "Print start niet" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29 msgctxt "@action" msgid "Machine Settings" diff --git a/resources/i18n/ru_RU/cura.po b/resources/i18n/ru_RU/cura.po index a444d61996..d578dbb819 100755 --- a/resources/i18n/ru_RU/cura.po +++ b/resources/i18n/ru_RU/cura.po @@ -23,6 +23,21 @@ msgctxt "@label:status" msgid "Print aborted" msgstr "Печать прервана" +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Blocked" +msgstr "блокированный" + +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Action required" +msgstr "Необходимое действие" + +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Can't start print" +msgstr "Не удается начать печать" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29 msgctxt "@action" msgid "Machine Settings" diff --git a/resources/i18n/tr_TR/cura.po b/resources/i18n/tr_TR/cura.po index 49827ba45b..b4eceee25f 100644 --- a/resources/i18n/tr_TR/cura.po +++ b/resources/i18n/tr_TR/cura.po @@ -21,6 +21,21 @@ msgctxt "@label:status" msgid "Print aborted" msgstr "Yazdırma durduruldu" +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Blocked" +msgstr "Tıkalı" + +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Action required" +msgstr "Eylem gerekli" + +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Can't start print" +msgstr "Baskı başlatılamıyor" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29 msgctxt "@action" msgid "Machine Settings" diff --git a/resources/i18n/zh_CN/cura.po b/resources/i18n/zh_CN/cura.po index 5e03ff0e31..ff29b9e52e 100644 --- a/resources/i18n/zh_CN/cura.po +++ b/resources/i18n/zh_CN/cura.po @@ -23,6 +23,21 @@ msgctxt "@label:status" msgid "Print aborted" msgstr "打印已中止" +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Blocked" +msgstr "冻结操作" + +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Action required" +msgstr "需要采取行动" + +#: Manually added for plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +msgctxt "@label:status" +msgid "Can't start print" +msgstr "不能开始打印" + #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/MachineSettingsAction.py:29 msgctxt "@action" msgid "Machine Settings" From 7a85dc28d7440c89b5cfb299ff9f65d094378876 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 2 Oct 2017 13:35:19 +0200 Subject: [PATCH 15/21] Changing to a printer with user settings doesn't trigger keep/discard popup anymore Fixes #2499 CURA-4384 --- resources/qml/Cura.qml | 2 +- resources/qml/SidebarSimple.qml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 2399fb4395..b1644ff303 100755 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -818,7 +818,7 @@ UM.MainWindow Connections { - target: Printer + target: CuraApplication onShowDiscardOrKeepProfileChanges: { discardOrKeepProfileChangesDialog.show() diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml index 9987268d57..22ad9d460e 100644 --- a/resources/qml/SidebarSimple.qml +++ b/resources/qml/SidebarSimple.qml @@ -292,7 +292,8 @@ Item } onValueChanged: { - if(Cura.MachineManager.activeMachine != null) + // Only change if an active machine is set and the slider is visible at all. + if(Cura.MachineManager.activeMachine != null && visible) { //Prevent updating during view initializing. Trigger only if the value changed by user if(qualitySlider.value != qualityModel.activeQualityId) From e1001c1aa4a3d0d97e3438453b771d7af2420c13 Mon Sep 17 00:00:00 2001 From: Simon Edwards Date: Mon, 2 Oct 2017 13:52:33 +0200 Subject: [PATCH 16/21] 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 @@ - - + + From 8e4bc433d6deb70a963754172ead0ee3a0b2e086 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 2 Oct 2017 14:15:13 +0200 Subject: [PATCH 17/21] Added missing has_machine_quality tag for UM2 CURA-4382 --- resources/definitions/ultimaker2.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index 0a9a7bf7ce..6974e61938 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -14,6 +14,7 @@ "platform_texture": "Ultimaker2backplate.png", "platform_offset": [9, 0, 0], "has_materials": false, + "has_machine_quality": true, "first_start_actions": ["UM2UpgradeSelection"], "supported_actions":["UM2UpgradeSelection", "UpgradeFirmware"] }, From 1f8a5a1957cd882774789b517843f40e34a017bf Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 2 Oct 2017 14:19:44 +0200 Subject: [PATCH 18/21] Minor codestyle refactor --- resources/qml/SidebarSimple.qml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml index 22ad9d460e..f8c3173c11 100644 --- a/resources/qml/SidebarSimple.qml +++ b/resources/qml/SidebarSimple.qml @@ -76,7 +76,7 @@ Item property var totalTicks: 0 property var availableTotalTicks: 0 - property var activeQualityId: 0 + property var activeQualityIndex: 0 property var qualitySliderStepWidth: 0 property var qualitySliderAvailableMin : 0 @@ -97,7 +97,7 @@ Item // Set selected value if (Cura.MachineManager.activeQualityId == qualityItem.id) { - qualityModel.activeQualityId = i + qualityModel.activeQualityIndex = i } // Set min available @@ -144,9 +144,13 @@ Item // check, the ticks count cannot be less than zero if(Cura.ProfilesModel.rowCount() != 0) + { qualityModel.totalTicks = Cura.ProfilesModel.rowCount() - 1 // minus one, because slider starts from 0 + } else + { qualityModel.totalTicks = 0 + } } } @@ -264,7 +268,7 @@ Item maximumValue: qualityModel.qualitySliderAvailableMax >= 0 ? qualityModel.qualitySliderAvailableMax : 0 stepSize: 1 - value: qualityModel.activeQualityId + value: qualityModel.activeQualityIndex width: qualityModel.qualitySliderStepWidth * qualityModel.availableTotalTicks @@ -296,7 +300,7 @@ Item if(Cura.MachineManager.activeMachine != null && visible) { //Prevent updating during view initializing. Trigger only if the value changed by user - if(qualitySlider.value != qualityModel.activeQualityId) + if(qualitySlider.value != qualityModel.activeQualityIndex) { //start updating with short delay qualitySliderChangeTimer.start(); From 9cbd71059319a2a7d3df12966b916e7d45c1d8fe Mon Sep 17 00:00:00 2001 From: Jerooney Date: Mon, 2 Oct 2017 13:00:53 +0200 Subject: [PATCH 19/21] Update camera color This will apply to all UMO+, UM2, UM2+ and UM3 with old firmware users, which look at the camera view. The background changed from blue > grey. --- resources/themes/cura-light/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 74b6bfb7ab..5d50618eea 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -59,7 +59,7 @@ "colors": { "sidebar": [255, 255, 255, 255], "lining": [192, 193, 194, 255], - "viewport_overlay": [24, 41, 77, 192], + "viewport_overlay": [0, 0, 0, 192], "primary": [12, 169, 227, 255], "primary_hover": [48, 182, 231, 255], From 321e531b1cf9485787e2fa1d4b968c99523120a3 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Mon, 2 Oct 2017 15:03:07 +0200 Subject: [PATCH 20/21] CL-457 remove screenScaleFactor because statusText.height already has devicePixelRatio included --- plugins/UM3NetworkPrinting/PrinterInfoBlock.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml index 0500221990..f18e3cfe08 100644 --- a/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/PrinterInfoBlock.qml @@ -290,7 +290,7 @@ Rectangle Image { - width: statusText.height * screenScaleFactor + width: statusText.height height: width anchors.right: parent.right anchors.rightMargin: UM.Theme.getSize("default_margin").width From e6fe33dcb9f0e7685647f95eea1a7d748b66d40e Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Mon, 2 Oct 2017 15:04:45 +0200 Subject: [PATCH 21/21] CL-457 removed trailing spaces --- plugins/UM3NetworkPrinting/ClusterMonitorItem.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/UM3NetworkPrinting/ClusterMonitorItem.qml b/plugins/UM3NetworkPrinting/ClusterMonitorItem.qml index 497b762ea9..c1d852072f 100644 --- a/plugins/UM3NetworkPrinting/ClusterMonitorItem.qml +++ b/plugins/UM3NetworkPrinting/ClusterMonitorItem.qml @@ -10,7 +10,7 @@ Component Rectangle { width: maximumWidth - height: maximumHeight + height: maximumHeight color: UM.Theme.getColor("viewport_background") property var emphasisColor: "#44c0ff" //TODO: should be linked to theme. @@ -49,7 +49,7 @@ Component anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.top: parent.top anchors.horizontalCenter: parent.horizontalCenter - + width: Math.min(800 * screenScaleFactor, maximumWidth) height: children.height visible: OutputDevice.connectedPrinters.length != 0