Merge branch 'master' of github.com:Ultimaker/Cura

plugins/ImageReader/ConfigUI.qml

@@ -156,11 +156,10 @@ UM.Dialog
                     anchors.verticalCenter: parent.verticalCenter
                 }
 
-                Rectangle {
+                Item {
                     width: 180
                     height: 20
-                    Layout.fillWidth:true
-                    color: "transparent"
+                    Layout.fillWidth: true
 
                     Slider {
                         id: smoothing

plugins/LayerView/LayerView.qml

@@ -41,8 +41,9 @@ Item
             width: valueLabel.width + UM.Theme.getSize("default_margin").width
             Behavior on height { NumberAnimation { duration: 50; } }
 
-            border.width: UM.Theme.getSize("default_lining").width;
-            border.color: UM.Theme.getColor("slider_groove_border");
+            border.width: UM.Theme.getSize("default_lining").width
+            border.color: UM.Theme.getColor("slider_groove_border")
+            color: UM.Theme.getColor("tool_panel_background")
 
             visible: UM.LayerView.getLayerActivity && Printer.getPlatformActivity ? true : false
 

resources/definitions/rigidbot.def.json

@@ -39,7 +39,7 @@
             "default_value": "RepRap (Marlin/Sprinter)"
         },
         "machine_start_gcode": {
-            "default_value": ";Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\n;M190 S{material_bed_temperature} ;Uncomment to add your own bed temperature line\n;M109 S{material_print_temperature} ;Uncomment to add your own temperature line\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nM205 X8 ;X/Y Jerk settings\nG1 Z15.0 F{travel_speed} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E7 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\n;Put printing message on LCD screen\nM117 Rigibot Printing..."
+            "default_value": ";Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\n;M190 S{material_bed_temperature} ;Uncomment to add your own bed temperature line\n;M109 S{material_print_temperature} ;Uncomment to add your own temperature line\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nM205 X8 ;X/Y Jerk settings\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E7 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\n;Put printing message on LCD screen\nM117 Rigibot Printing..."
         },
         "machine_end_gcode": {
             "default_value": ";End GCode\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+10 E-1 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y230 F3000 ;move Y so the head is out of the way and Plate is moved forward\nM84 ;steppers off\nG90 ;absolute positioning"

resources/i18n/ptbr/cura.po

@@ -1,9 +1,9 @@
-# Portuguese translation for Cura.
-# Copyright (C) 2016, 2017
-# This file is distributed under the same license as the Cura package.
-# FIRST AUTHOR <jasaneschio@gmail.com>, 2016.
-# SECOND AUTHOR <patola@makerlinux.com.br>, 2017.
-# 
+# Portuguese translation for Cura.
+# Copyright (C) 2016, 2017
+# This file is distributed under the same license as the Cura package.
+# FIRST AUTHOR <jasaneschio@gmail.com>, 2016.
+# SECOND AUTHOR <patola@makerlinux.com.br>, 2017.
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -16,6 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: /home/ruben/Projects/Cura/plugins/MachineSettingsAction/__init__.py:12
 msgctxt "@label"
@@ -1223,11 +1224,11 @@ msgctxt "@label"
 msgid "Extruder Temperature: %1/%2°C"
 msgstr "Temperatura do Extrusor: %1/%2°C"
 
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
 #: /home/ruben/Projects/Cura/plugins/Doodle3D-cura-plugin/ControlWindow.qml:45
 msgctxt "@label"
 msgid ""

resources/i18n/ptbr/fdmextruder.def.json.po

@@ -11,6 +11,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: fdmextruder.def.json
 msgctxt "machine_settings label"

resources/i18n/ptbr/fdmprinter.def.json.po

@@ -10,6 +10,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: fdmprinter.def.json
 msgctxt "machine_settings label"

resources/qml/AddMachineDialog.qml

@@ -74,10 +74,8 @@ UM.Dialog
                 width: machineList.width
                 style: ButtonStyle
                 {
-                    background: Rectangle
+                    background: Item
                     {
-                        border.width: 0
-                        color: "transparent";
                         height: UM.Theme.getSize("standard_list_lineheight").height
                         width: machineList.width
                     }

resources/qml/JobSpecs.qml

@@ -9,7 +9,7 @@ import QtQuick.Layouts 1.1
 import UM 1.1 as UM
 import Cura 1.0 as Cura
 
-Rectangle {
+Item {
     id: base
 
     property bool activity: Printer.getPlatformActivity
@@ -29,7 +29,6 @@ Rectangle {
     property variant printMaterialCosts: PrintInformation.materialCosts
 
     height: childrenRect.height
-    color: "transparent"
 
     Connections
     {
@@ -84,9 +83,8 @@ Rectangle {
                 }
                 style: ButtonStyle
                 {
-                    background: Rectangle
+                    background: Item
                     {
-                        color: "transparent"
                         UM.RecolorImage
                         {
                             width: UM.Theme.getSize("save_button_specs_icons").width;

resources/qml/Legend.qml

@@ -9,14 +9,13 @@ import QtQuick.Layouts 1.1
 import UM 1.1 as UM
 import Cura 1.0 as Cura
 
-Rectangle {
+Item {
     id: base
 
     UM.I18nCatalog { id: catalog; name:"cura"}
 
     width: childrenRect.width
     height: childrenRect.height
-    color: "transparent"
 
     Connections
     {

resources/qml/MonitorButton.qml

@@ -10,7 +10,7 @@ import QtQuick.Layouts 1.1
 import UM 1.1 as UM
 import Cura 1.0 as Cura
 
-Rectangle
+Item
 {
     id: base;
     UM.I18nCatalog { id: catalog; name:"cura"}
@@ -20,7 +20,6 @@ Rectangle
     property real progress: printerConnected ? Cura.MachineManager.printerOutputDevices[0].progress : 0
     property int backendState: UM.Backend.state
 
-
     property bool showProgress: {
         // determine if we need to show the progress bar + percentage
         if(!printerConnected || !printerAcceptsCommands) {

resources/qml/Preferences/GeneralPage.qml

@@ -97,6 +97,7 @@ UM.PreferencesPage
                         append({ text: "Français", code: "fr" })
                         append({ text: "Italiano", code: "it" })
                         append({ text: "Nederlands", code: "nl" })
+                        append({ text: "Português do Brasil", code: "ptbr" })
                         append({ text: "Русский", code: "ru" })
                         append({ text: "Türkçe", code: "tr" })
                     }

resources/qml/SaveButton.qml

@@ -8,7 +8,7 @@ import QtQuick.Layouts 1.1
 
 import UM 1.1 as UM
 
-Rectangle {
+Item {
     id: base;
     UM.I18nCatalog { id: catalog; name:"cura"}
 
@@ -53,7 +53,7 @@ Rectangle {
         text: statusText;
     }
 
-    Rectangle{
+    Rectangle {
         id: progressBar
         width: parent.width - 2 * UM.Theme.getSize("default_margin").width
         height: UM.Theme.getSize("progressbar").height
@@ -64,7 +64,7 @@ Rectangle {
         radius: UM.Theme.getSize("progressbar_radius").width
         color: UM.Theme.getColor("progressbar_background")
 
-        Rectangle{
+        Rectangle {
             width: Math.max(parent.width * base.progress)
             height: parent.height
             color: UM.Theme.getColor("progressbar_control")
@@ -73,7 +73,7 @@ Rectangle {
         }
     }
 
-    Rectangle{
+    Item {
         id: saveRow
         width: base.width
         height: saveToButton.height

resources/qml/Settings/SettingItem.qml

@@ -145,8 +145,6 @@ Item {
                 height: parent.height;
                 width: height;
 
-                backgroundColor: UM.Theme.getColor("setting_control");
-                hoverBackgroundColor: UM.Theme.getColor("setting_control")
                 color: UM.Theme.getColor("setting_control_button")
                 hoverColor: UM.Theme.getColor("setting_control_button")
 
@@ -173,8 +171,6 @@ Item {
                 height: parent.height;
                 width: height;
 
-                backgroundColor: UM.Theme.getColor("setting_control");
-                hoverBackgroundColor: UM.Theme.getColor("setting_control_highlight")
                 color: UM.Theme.getColor("setting_control_button")
                 hoverColor: UM.Theme.getColor("setting_control_button_hover")
 
@@ -278,8 +274,6 @@ Item {
                     }
                 }
 
-                backgroundColor: UM.Theme.getColor("setting_control");
-                hoverBackgroundColor: UM.Theme.getColor("setting_control_highlight")
                 color: UM.Theme.getColor("setting_control_button")
                 hoverColor: UM.Theme.getColor("setting_control_button_hover")
 

resources/qml/Sidebar.qml

@@ -175,6 +175,9 @@ Rectangle
                 height: UM.Theme.getSize("sidebar_header").height
                 onClicked: monitoringPrint = false
                 iconSource: UM.Theme.getIcon("tab_settings");
+                property color overlayColor: "transparent"
+                property string overlayIconSource: ""
+
                 checkable: true
                 checked: !monitoringPrint
                 exclusiveGroup: sidebarHeaderBarGroup
@@ -203,15 +206,53 @@ Rectangle
                 width: height
                 height: UM.Theme.getSize("sidebar_header").height
                 onClicked: monitoringPrint = true
-                iconSource: {
-                    if(!printerConnected)
-                        return UM.Theme.getIcon("tab_monitor");
-                    else if(!printerAcceptsCommands)
-                        return UM.Theme.getIcon("tab_monitor_unknown");
+                iconSource: printerConnected ? UM.Theme.getIcon("tab_monitor_with_status") : UM.Theme.getIcon("tab_monitor")
+                property color overlayColor:
+                {
+                    if(!printerAcceptsCommands)
+                    {
+                        return UM.Theme.getColor("status_unknown");
+                    }
 
                     if(Cura.MachineManager.printerOutputDevices[0].printerState == "maintenance")
                     {
-                        return UM.Theme.getIcon("tab_monitor_busy");
+                        return UM.Theme.getColor("status_busy");
+                    }
+                    switch(Cura.MachineManager.printerOutputDevices[0].jobState)
+                    {
+                        case "printing":
+                        case "pre_print":
+                        case "wait_cleanup":
+                        case "pausing":
+                        case "resuming":
+                            return UM.Theme.getColor("status_busy");
+                        case "ready":
+                        case "":
+                            return UM.Theme.getColor("status_ready");
+                        case "paused":
+                            return UM.Theme.getColor("status_paused");
+                        case "error":
+                            return UM.Theme.getColor("status_stopped");
+                        case "offline":
+                            return UM.Theme.getColor("status_offline");
+                        default:
+                            return UM.Theme.getColor("text_reversed");
+                    }
+                }
+                property string overlayIconSource:
+                {
+                    if(!printerConnected)
+                    {
+                        return "";
+                    }
+                    else if(!printerAcceptsCommands)
+                    {
+                        return UM.Theme.getIcon("tab_status_unknown");
+                    }
+
+                    if(Cura.MachineManager.printerOutputDevices[0].printerState == "maintenance")
+                    {
+                        return UM.Theme.getIcon("tab_status_busy");
                     }
 
                     switch(Cura.MachineManager.printerOutputDevices[0].jobState)
@@ -219,20 +260,23 @@ Rectangle
                         case "printing":
                         case "pre_print":
                         case "wait_cleanup":
-                            return UM.Theme.getIcon("tab_monitor_busy");
+                        case "pausing":
+                        case "resuming":
+                            return UM.Theme.getIcon("tab_status_busy");
                         case "ready":
                         case "":
-                            return UM.Theme.getIcon("tab_monitor_connected")
+                            return UM.Theme.getIcon("tab_status_connected")
                         case "paused":
-                            return UM.Theme.getIcon("tab_monitor_paused")
+                            return UM.Theme.getIcon("tab_status_paused")
                         case "error":
-                            return UM.Theme.getIcon("tab_monitor_stopped")
+                            return UM.Theme.getIcon("tab_status_stopped")
                         case "offline":
-                            return UM.Theme.getIcon("tab_monitor_offline")
+                            return UM.Theme.getIcon("tab_status_offline")
                         default:
-                            return UM.Theme.getIcon("tab_monitor")
+                            return ""
                     }
                 }
+
                 checkable: true
                 checked: monitoringPrint
                 exclusiveGroup: sidebarHeaderBarGroup

resources/qml/SidebarHeader.qml

@@ -201,7 +201,7 @@ Column
             color: UM.Theme.getColor("text");
         }
 
-        Rectangle
+        Item
         {
             anchors.verticalCenter: parent.verticalCenter
 

resources/qml/SidebarSimple.qml

@@ -25,7 +25,7 @@ Item
     Component.onDestruction: PrintInformation.enabled = false
     UM.I18nCatalog { id: catalog; name:"cura"}
 
-    Rectangle
+    Item
     {
         id: infillCellLeft
         anchors.top: parent.top
@@ -216,7 +216,7 @@ Item
         }
     }
 
-    Rectangle
+    Item
     {
         id: helpersCell
         anchors.top: infillCellRight.bottom
@@ -461,7 +461,7 @@ Item
         supportExtruderCombobox.updateCurrentColor();
     }
 
-    Rectangle
+    Item
     {
         id: tipsCell
         anchors.top: helpersCell.bottom

resources/themes/cura/icons/tab_monitor.svg

@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
-    <path d="M2.5 2.5h25v1.19h-25V2.5zm0 23.81h2.287l2.272-1.19h15.966l2.234 1.19H27.5v1.19h-2.239l-2.236-1.19H7.057l-2.27 1.177L2.5 27.5v-1.19zM26.364 3.69H27.5v22.62h-1.136V3.69zM2.5 3.69h1.136v22.62H2.5V3.69zm3.41 2.381h18.18v16.667H5.91V6.071zm1.135 1.19h15.91v14.287H7.045V7.262zm5.682 0h4.546v3.572h-4.546V7.262zM9.318 20.358h11.364v1.19H9.318v-1.19zm4.546-9.524h2.272v1.19h-2.272v-1.19z" fill="#fff" fill-rule="evenodd"/>
+    <path d="M2.5 2.5h25v1.19h-25V2.5zm0 23.81h2.287l2.272-1.19h15.966l2.234 1.19H27.5v1.19h-2.239l-2.236-1.19H7.057l-2.27 1.177L2.5 27.5v-1.19zM26.364 3.69H27.5v22.62h-1.136V3.69zM2.5 3.69h1.136v22.62H2.5V3.69zm3.41 2.381h18.18v16.667H5.91V6.071zm1.135 1.19h15.91v14.287H7.045V7.262zm5.682 0h4.546v3.572h-4.546V7.262zM9.318 20.358h11.364v1.19H9.318v-1.19zm4.546-9.524h2.272v1.19h-2.272v-1.19z" fill-rule="evenodd"/>
 </svg>

resources/themes/cura/icons/tab_monitor_busy.svg

@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
-    <path d="M2.5 2.5h25v1.19h-25V2.5zm0 23.81h2.287l2.272-1.19h15.966l2.234 1.19H27.5v1.19h-2.239l-2.236-1.19H7.057l-2.27 1.177L2.5 27.5v-1.19zM26.364 3.69H27.5v22.62h-1.136V3.69zM2.5 3.69h1.136v22.62H2.5V3.69zm3.41 2.381h18.18v16.667H5.91V6.071zm1.135 1.19h15.91v14.287H7.045V7.262zm5.682 0h4.546v3.572h-4.546V7.262zM9.318 20.358h11.364v1.19H9.318v-1.19zm4.546-9.524h2.272v1.19h-2.272v-1.19z" fill="#fff" fill-rule="evenodd"/>
-    <circle cx="22.5" cy="7.5" r="7.5" fill="#0ca9e3"/>
-    <circle cx="22.5" cy="7.5" r="1.5" fill="#fff"/>
-    <circle r="1.5" cy="7.5" cx="18.5" fill="#fff"/>
-    <circle cx="26.5" cy="7.5" r="1.5" fill="#fff"/>
-</svg>

resources/themes/cura/icons/tab_monitor_connected.svg

@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
-    <path d="M2.5 2.5h25v1.19h-25V2.5zm0 23.81h2.287l2.272-1.19h15.966l2.234 1.19H27.5v1.19h-2.239l-2.236-1.19H7.057l-2.27 1.177L2.5 27.5v-1.19zM26.364 3.69H27.5v22.62h-1.136V3.69zM2.5 3.69h1.136v22.62H2.5V3.69zm3.41 2.381h18.18v16.667H5.91V6.071zm1.135 1.19h15.91v14.287H7.045V7.262zm5.682 0h4.546v3.572h-4.546V7.262zM9.318 20.358h11.364v1.19H9.318v-1.19zm4.546-9.524h2.272v1.19h-2.272v-1.19z" fill="#fff" fill-rule="evenodd"/>
-    <circle cx="22.5" cy="7.5" r="7.5" fill="#00cd00"/>
-    <path d="M25.547 4.302L21.994 7.92 19.86 5.84 18.5 7.218l3.572 3.48c1.66-1.68 3.447-3.513 4.903-4.996z" fill="#fff"/>
-</svg>

resources/themes/cura/icons/tab_monitor_offline.svg

@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
-    <path d="M2.5 2.5h25v1.19h-25V2.5zm0 23.81h2.287l2.272-1.19h15.966l2.234 1.19H27.5v1.19h-2.239l-2.236-1.19H7.057l-2.27 1.177L2.5 27.5v-1.19zM26.364 3.69H27.5v22.62h-1.136V3.69zM2.5 3.69h1.136v22.62H2.5V3.69zm3.41 2.381h18.18v16.667H5.91V6.071zm1.135 1.19h15.91v14.287H7.045V7.262zm5.682 0h4.546v3.572h-4.546V7.262zM9.318 20.358h11.364v1.19H9.318v-1.19zm4.546-9.524h2.272v1.19h-2.272v-1.19z" fill="#fff" fill-rule="evenodd"/>
-    <circle cx="22.5" cy="7.5" r="7.5"/>
-    <path d="M20.025 3.611l-1.414 1.414L21.086 7.5 18.61 9.975l1.414 1.414L22.5 8.914l2.475 2.475 1.414-1.414L23.914 7.5l2.475-2.475-1.414-1.414L22.5 6.086 20.025 3.61z" fill="#fff"/>
-</svg>

resources/themes/cura/icons/tab_monitor_stopped.svg

@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
-    <path d="M2.5 2.5h25v1.19h-25V2.5zm0 23.81h2.287l2.272-1.19h15.966l2.234 1.19H27.5v1.19h-2.239l-2.236-1.19H7.057l-2.27 1.177L2.5 27.5v-1.19zM26.364 3.69H27.5v22.62h-1.136V3.69zM2.5 3.69h1.136v22.62H2.5V3.69zm3.41 2.381h18.18v16.667H5.91V6.071zm1.135 1.19h15.91v14.287H7.045V7.262zm5.682 0h4.546v3.572h-4.546V7.262zM9.318 20.358h11.364v1.19H9.318v-1.19zm4.546-9.524h2.272v1.19h-2.272v-1.19z" fill="#fff" fill-rule="evenodd"/>
-    <circle cx="22.5" cy="7.5" r="7.5" fill="#ec5250"/>
-    <path d="M20.025 3.611l-1.414 1.414L21.086 7.5 18.61 9.975l1.414 1.414L22.5 8.914l2.475 2.475 1.414-1.414L23.914 7.5l2.475-2.475-1.414-1.414L22.5 6.086 20.025 3.61z" fill="#fff"/>
-</svg>

resources/themes/cura/icons/tab_monitor_unknown.svg

@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
-    <path d="M2.5 2.5h25v1.19h-25V2.5zm0 23.81h2.287l2.272-1.19h15.966l2.234 1.19H27.5v1.19h-2.239l-2.236-1.19H7.057l-2.27 1.177L2.5 27.5v-1.19zM26.364 3.69H27.5v22.62h-1.136V3.69zM2.5 3.69h1.136v22.62H2.5V3.69zm3.41 2.381h18.18v16.667H5.91V6.071zm1.135 1.19h15.91v14.287H7.045V7.262zm5.682 0h4.546v3.572h-4.546V7.262zM9.318 20.358h11.364v1.19H9.318v-1.19zm4.546-9.524h2.272v1.19h-2.272v-1.19z" fill="#fff" fill-rule="evenodd"/>
-    <circle cx="22.5" cy="7.5" r="7.5" fill="#7f7f7f"/>
-    <path d="M25.538 5.675q0 .532-.158.943-.153.405-.437.706-.285.3-.685.537-.395.237-.895.432v1.2h-1.854V7.718q.374-.1.674-.205.305-.105.637-.342.31-.21.485-.49.179-.28.179-.632 0-.527-.343-.748-.337-.226-.953-.226-.38 0-.858.163-.474.163-.87.421h-.21V4.053q.337-.142 1.038-.295.7-.158 1.422-.158 1.3 0 2.064.574t.764 1.501zM23.51 11.6h-2.128v-1.39h2.128v1.39z" style="-inkscape-font-specification:'Verdana Bold'" font-weight="700" font-family="Verdana" fill="#fff" font-size="10.786" letter-spacing="0" word-spacing="0"/>
-</svg>

resources/themes/cura/icons/tab_monitor_with_status.svg

@@ -1,5 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
-    <path d="M2.5 2.5h25v1.19h-25V2.5zm0 23.81h2.287l2.272-1.19h15.966l2.234 1.19H27.5v1.19h-2.239l-2.236-1.19H7.057l-2.27 1.177L2.5 27.5v-1.19zM26.364 3.69H27.5v22.62h-1.136V3.69zM2.5 3.69h1.136v22.62H2.5V3.69zm3.41 2.381h18.18v16.667H5.91V6.071zm1.135 1.19h15.91v14.287H7.045V7.262zm5.682 0h4.546v3.572h-4.546V7.262zM9.318 20.358h11.364v1.19H9.318v-1.19zm4.546-9.524h2.272v1.19h-2.272v-1.19z" fill="#fff" fill-rule="evenodd"/>
-    <circle cx="22.5" cy="7.5" r="7.5" fill="#ff8c00"/>
-    <path fill="#fff" d="M19.5 4h2v7h-2zm4 0h2v7h-2z"/>
+    <path d="M2.5 2.5h25v1.19h-25V2.5zm0 23.81h2.287l2.272-1.19h15.966l2.234 1.19H27.5v1.19h-2.239l-2.236-1.19H7.057l-2.27 1.177L2.5 27.5v-1.19zM26.364 3.69H27.5v22.62h-1.136V3.69zM2.5 3.69h1.136v22.62H2.5V3.69zm3.41 2.381h18.18v16.667H5.91V6.071zm1.135 1.19h15.91v14.287H7.045V7.262zm5.682 0h4.546v3.572h-4.546V7.262zM9.318 20.358h11.364v1.19H9.318v-1.19zm4.546-9.524h2.272v1.19h-2.272v-1.19z" fill-rule="evenodd"/>
+    <circle cx="22.5" cy="7.5" r="7.4" />
 </svg>

resources/themes/cura/icons/tab_status_busy.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
+  <path
+     d="M 22.5 0 A 7.5 7.5 0 0 0 15 7.5 A 7.5 7.5 0 0 0 22.5 15 A 7.5 7.5 0 0 0 30 7.5 A 7.5 7.5 0 0 0 22.5 0 z M 18.5 6 A 1.5 1.5 0 0 1 20 7.5 A 1.5 1.5 0 0 1 18.5 9 A 1.5 1.5 0 0 1 17 7.5 A 1.5 1.5 0 0 1 18.5 6 z M 22.5 6 A 1.5 1.5 0 0 1 24 7.5 A 1.5 1.5 0 0 1 22.5 9 A 1.5 1.5 0 0 1 21 7.5 A 1.5 1.5 0 0 1 22.5 6 z M 26.5 6 A 1.5 1.5 0 0 1 28 7.5 A 1.5 1.5 0 0 1 26.5 9 A 1.5 1.5 0 0 1 25 7.5 A 1.5 1.5 0 0 1 26.5 6 z " />
+</svg>

resources/themes/cura/icons/tab_status_connected.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
+  <path
+     d="M 22.5 0 A 7.5 7.5 0 0 0 15 7.5 A 7.5 7.5 0 0 0 22.5 15 A 7.5 7.5 0 0 0 30 7.5 A 7.5 7.5 0 0 0 22.5 0 z M 25.546875 4.3027344 L 26.974609 5.7011719 C 25.518609 7.1841719 23.732266 9.0172656 22.072266 10.697266 L 18.5 7.21875 L 19.859375 5.8398438 L 21.994141 7.9199219 L 25.546875 4.3027344 z " />
+</svg>

resources/themes/cura/icons/tab_status_offline.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
+  <path
+     d="M 22.5 0 A 7.5 7.5 0 0 0 15 7.5 A 7.5 7.5 0 0 0 22.5 15 A 7.5 7.5 0 0 0 30 7.5 A 7.5 7.5 0 0 0 22.5 0 z M 20.025391 3.6113281 L 22.5 6.0859375 L 24.974609 3.6113281 L 26.388672 5.0253906 L 23.914062 7.5 L 26.388672 9.9746094 L 24.974609 11.388672 L 22.5 8.9140625 L 20.023438 11.388672 L 18.609375 9.9746094 L 21.085938 7.5 L 18.611328 5.0253906 L 20.025391 3.6113281 z " />
+</svg>

resources/themes/cura/icons/tab_status_paused.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
+  <path
+     d="M 22.5 0 A 7.5 7.5 0 0 0 15 7.5 A 7.5 7.5 0 0 0 22.5 15 A 7.5 7.5 0 0 0 30 7.5 A 7.5 7.5 0 0 0 22.5 0 z M 19.5 4 L 21.5 4 L 21.5 11 L 19.5 11 L 19.5 4 z M 23.5 4 L 25.5 4 L 25.5 11 L 23.5 11 L 23.5 4 z " />
+</svg>

resources/themes/cura/icons/tab_status_stopped.svg

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   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"
+   viewBox="0 0 30 30"
+   version="1.1"
+   id="svg3753"
+   sodipodi:docname="tab_monitor_stopped.svg"
+   inkscape:version="0.92.0 r15299">
+  <metadata
+     id="metadata3759">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3757" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview3755"
+     showgrid="false"
+     inkscape:zoom="7.8666667"
+     inkscape:cx="15"
+     inkscape:cy="15"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3753" />
+  <path
+     d="M 22.5 0 A 7.5 7.5 0 0 0 15 7.5 A 7.5 7.5 0 0 0 22.5 15 A 7.5 7.5 0 0 0 30 7.5 A 7.5 7.5 0 0 0 22.5 0 z M 20.025391 3.6113281 L 22.5 6.0859375 L 24.974609 3.6113281 L 26.388672 5.0253906 L 23.914062 7.5 L 26.388672 9.9746094 L 24.974609 11.388672 L 22.5 8.9140625 L 20.023438 11.388672 L 18.609375 9.9746094 L 21.085938 7.5 L 18.611328 5.0253906 L 20.025391 3.6113281 z "
+     id="circle3749" />
+</svg>

resources/themes/cura/icons/tab_status_unknown.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
+  <path
+     d="M 22.5 0 A 7.5 7.5 0 0 0 15 7.5 A 7.5 7.5 0 0 0 22.5 15 A 7.5 7.5 0 0 0 30 7.5 A 7.5 7.5 0 0 0 22.5 0 z M 22.710938 3.5996094 C 23.577604 3.5996094 24.264104 3.7911615 24.773438 4.1738281 C 25.282771 4.5564948 25.537109 5.0577813 25.537109 5.6757812 C 25.537109 6.0304479 25.486193 6.3431875 25.380859 6.6171875 C 25.278859 6.8871875 25.132693 7.1235521 24.943359 7.3242188 C 24.753359 7.5242188 24.524479 7.7033281 24.257812 7.8613281 C 23.994479 8.0193281 23.696615 8.1629687 23.363281 8.2929688 L 23.363281 9.4921875 L 21.509766 9.4921875 L 21.509766 7.71875 C 21.759099 7.6520833 21.983594 7.5836719 22.183594 7.5136719 C 22.386927 7.4436719 22.598979 7.329875 22.820312 7.171875 C 23.026979 7.031875 23.188021 6.8683073 23.304688 6.6816406 C 23.424021 6.494974 23.484375 6.2834948 23.484375 6.0488281 C 23.484375 5.6974948 23.369292 5.4481146 23.140625 5.3007812 C 22.915958 5.1501146 22.598167 5.0742187 22.1875 5.0742188 C 21.934167 5.0742188 21.648745 5.1296146 21.330078 5.2382812 C 21.014078 5.3469479 20.724937 5.4862031 20.460938 5.6582031 L 20.25 5.6582031 L 20.25 4.0527344 C 20.474667 3.9580677 20.819776 3.8598125 21.287109 3.7578125 C 21.753776 3.6524792 22.229604 3.5996094 22.710938 3.5996094 z M 21.382812 10.210938 L 23.509766 10.210938 L 23.509766 11.599609 L 21.382812 11.599609 L 21.382812 10.210938 z " />
+</svg>

resources/themes/cura/styles.qml

@@ -100,12 +100,24 @@ QtObject {
             }
 
             label: Item {
-                Image {
-                    anchors.centerIn: parent;
+                UM.RecolorImage {
+                    color: UM.Theme.getColor("text_reversed")
+                    anchors.centerIn: parent
                     opacity: !control.enabled ? 0.2 : 1.0
-                    source: control.iconSource;
-                    width: Theme.getSize("button_icon").width;
-                    height: Theme.getSize("button_icon").height;
+                    source: control.iconSource
+                    width: Theme.getSize("button_icon").width
+                    height: Theme.getSize("button_icon").height
+
+                    sourceSize: Theme.getSize("button_icon")
+                }
+                UM.RecolorImage {
+                    visible: control.overlayIconSource != ""
+                    color: control.overlayColor
+                    anchors.centerIn: parent
+                    opacity: !control.enabled ? 0.2 : 1.0
+                    source: control.overlayIconSource
+                    width: Theme.getSize("button_icon").width
+                    height: Theme.getSize("button_icon").height
 
                     sourceSize: Theme.getSize("button_icon")
                 }

resources/themes/cura/theme.json

@@ -193,6 +193,7 @@
         "status_busy": [12, 169, 227, 255],
         "status_paused": [255, 140, 0, 255],
         "status_stopped": [236, 82, 80, 255],
+        "status_unknown": [127, 127, 127, 255],
 
         "disabled_axis": [127, 127, 127, 255],
         "x_axis": [255, 0, 0, 255],