From 1f9acf0b5435f2eb0e36d50bd3823e277dff2e40 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 17 Jun 2016 12:01:48 +0200 Subject: [PATCH] Color of progress bar now changes based on jobstate CURA-1036 --- resources/qml/MonitorButton.qml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/resources/qml/MonitorButton.qml b/resources/qml/MonitorButton.qml index 335de0b323..49a4e38fa4 100644 --- a/resources/qml/MonitorButton.qml +++ b/resources/qml/MonitorButton.qml @@ -48,7 +48,7 @@ Rectangle anchors.left: parent.left anchors.leftMargin: UM.Theme.getSize("default_margin").width - color: "green" + color: Cura.MachineManager.printerOutputDevices[0].jobState == "paused" ? "orange": "green" font: UM.Theme.getFont("large") text: statusText; } @@ -60,7 +60,7 @@ Rectangle anchors.right: progressBar.right //anchors.rightMargin: UM.Theme.getSize("default_margin").width - color: "green" + color: Cura.MachineManager.printerOutputDevices[0].jobState == "paused" ? "orange": "green" font: UM.Theme.getFont("large") text: Math.round(progress * 100) + "%" ; } @@ -81,9 +81,8 @@ Rectangle { width: Math.max(parent.width * base.progress) height: parent.height - color: "green" + color: Cura.MachineManager.printerOutputDevices[0].jobState == "paused" ? "orange": "green" radius: UM.Theme.getSize("progressbar_radius").width - //visible: base.backendState == 2 ? true : false } }