diff --git a/resources/qml/MonitorButton.qml b/resources/qml/MonitorButton.qml
index 49a4e38fa4..c8a776ee01 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: Cura.MachineManager.printerOutputDevices[0].jobState == "paused" ? "orange": "green"
+ color: Cura.MachineManager.printerOutputDevices[0].jobState == "paused" ? UM.Theme.getColor("status_paused") : UM.Theme.getColor("status_ready")
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: Cura.MachineManager.printerOutputDevices[0].jobState == "paused" ? "orange": "green"
+ color: Cura.MachineManager.printerOutputDevices[0].jobState == "paused" ? UM.Theme.getColor("status_paused") : UM.Theme.getColor("status_ready")
font: UM.Theme.getFont("large")
text: Math.round(progress * 100) + "%" ;
}
@@ -81,7 +81,7 @@ Rectangle
{
width: Math.max(parent.width * base.progress)
height: parent.height
- color: Cura.MachineManager.printerOutputDevices[0].jobState == "paused" ? "orange": "green"
+ color: Cura.MachineManager.printerOutputDevices[0].jobState == "paused" ? UM.Theme.getColor("status_paused") : UM.Theme.getColor("status_ready")
radius: UM.Theme.getSize("progressbar_radius").width
}
}
@@ -174,15 +174,5 @@ Rectangle
}
label: Item { }
}
- }
-
- Rectangle
- {
- id: saveRow
- width: base.width
- height: saveToButton.height
- anchors.top: progressBar.bottom
- anchors.topMargin: UM.Theme.getSize("default_margin").height
- anchors.left: parent.left
}
}
diff --git a/resources/themes/cura/icons/tab_monitor_busy.svg b/resources/themes/cura/icons/tab_monitor_busy.svg
new file mode 100644
index 0000000000..f0e47b91d4
--- /dev/null
+++ b/resources/themes/cura/icons/tab_monitor_busy.svg
@@ -0,0 +1,107 @@
+
+
diff --git a/resources/themes/cura/icons/tab_monitor_connected.svg b/resources/themes/cura/icons/tab_monitor_connected.svg
index e3b314146a..8f6f83fe91 100644
--- a/resources/themes/cura/icons/tab_monitor_connected.svg
+++ b/resources/themes/cura/icons/tab_monitor_connected.svg
@@ -8,9 +8,9 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="19px"
- height="19px"
- viewBox="0 0 19 19"
+ width="30"
+ height="30"
+ viewBox="0 0 30 30"
version="1.1"
id="svg2"
inkscape:version="0.91 r13725"
@@ -28,7 +28,7 @@
+ inkscape:current-layer="svg2"
+ inkscape:snap-global="true"
+ inkscape:object-nodes="false"
+ inkscape:snap-smooth-nodes="false"
+ inkscape:snap-midpoints="false"
+ inkscape:snap-intersection-paths="false"
+ inkscape:snap-bbox="true"
+ inkscape:snap-others="false"
+ inkscape:snap-nodes="false" />
Fill 1 Copy 3
@@ -57,33 +66,30 @@
+ style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1"
+ transform="matrix(1.3157895,0,0,1.3157895,2.5,2.4999995)">
+ inkscape:connector-curvature="0" />
+ style="fill:#00cd00;fill-opacity:1"
+ id="path3337"
+ cx="22.5"
+ cy="7.5"
+ r="7.5" />
+ style="fill:#ffffff;fill-opacity:1"
+ d="M 25.546876,4.3017582 21.994141,7.9208992 19.859375,5.8408211 18.5,7.2177742 22.072266,10.698242 C 23.732574,9.0171252 25.519159,7.1853281 26.97461,5.7021492 Z"
+ id="rect4171"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccc" />
diff --git a/resources/themes/cura/icons/tab_monitor_offline.svg b/resources/themes/cura/icons/tab_monitor_offline.svg
new file mode 100644
index 0000000000..a13a7b586e
--- /dev/null
+++ b/resources/themes/cura/icons/tab_monitor_offline.svg
@@ -0,0 +1,94 @@
+
+
diff --git a/resources/themes/cura/icons/tab_monitor_paused.svg b/resources/themes/cura/icons/tab_monitor_paused.svg
index 608c279385..49c8babebd 100644
--- a/resources/themes/cura/icons/tab_monitor_paused.svg
+++ b/resources/themes/cura/icons/tab_monitor_paused.svg
@@ -8,9 +8,9 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="19px"
- height="19px"
- viewBox="0 0 19 19"
+ width="30"
+ height="30"
+ viewBox="0 0 30 30"
version="1.1"
id="svg2"
inkscape:version="0.91 r13725"
@@ -28,7 +28,7 @@
+ inkscape:current-layer="svg2"
+ inkscape:snap-global="true"
+ inkscape:object-nodes="false"
+ inkscape:snap-smooth-nodes="false"
+ inkscape:snap-midpoints="false"
+ inkscape:snap-intersection-paths="false"
+ inkscape:snap-bbox="true"
+ inkscape:snap-others="false"
+ inkscape:snap-nodes="false" />
Fill 1 Copy 3
@@ -57,187 +66,38 @@
+ style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1"
+ transform="matrix(1.3157895,0,0,1.3157895,2.5,2.4999995)">
+ inkscape:connector-curvature="0" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ style="fill:#ff8c00;fill-opacity:1"
+ id="path3337"
+ cx="22.5"
+ cy="7.5"
+ r="7.5" />
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1"
+ id="rect4713"
+ width="2"
+ height="7"
+ x="19.5"
+ y="4" />
+ style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1"
+ id="rect4713-3"
+ width="2"
+ height="7"
+ x="23.5"
+ y="4" />
diff --git a/resources/themes/cura/icons/tab_monitor_stopped.svg b/resources/themes/cura/icons/tab_monitor_stopped.svg
new file mode 100644
index 0000000000..7f861067dd
--- /dev/null
+++ b/resources/themes/cura/icons/tab_monitor_stopped.svg
@@ -0,0 +1,94 @@
+
+
diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json
index de30996289..1b4b566d86 100644
--- a/resources/themes/cura/theme.json
+++ b/resources/themes/cura/theme.json
@@ -158,7 +158,13 @@
"message_text": [32, 166, 219, 255],
"message_dismiss": [127, 127, 127, 255],
- "tool_panel_background": [255, 255, 255, 255]
+ "tool_panel_background": [255, 255, 255, 255],
+
+ "status_offline": [0, 0, 0, 255],
+ "status_ready": [0, 205, 0, 255],
+ "status_busy": [12, 169, 227, 255],
+ "status_paused": [255, 140, 0, 255],
+ "status_stopped": [236, 82, 80, 255]
},
"sizes": {