Merge branch 'master' into layer_view3_cleanup

cura/CuraApplication.py

@@ -219,7 +219,7 @@ class CuraApplication(QtApplication):
         Preferences.getInstance().addPreference("cura/categories_expanded", "")
         Preferences.getInstance().addPreference("cura/jobname_prefix", True)
         Preferences.getInstance().addPreference("view/center_on_select", False)
-        Preferences.getInstance().addPreference("mesh/scale_to_fit", True)
+        Preferences.getInstance().addPreference("mesh/scale_to_fit", False)
         Preferences.getInstance().addPreference("mesh/scale_tiny_meshes", True)
         Preferences.getInstance().addPreference("cura/dialog_on_project_save", True)
         Preferences.getInstance().addPreference("cura/asked_dialog_on_project_save", False)

cura/PrintInformation.py

@@ -171,9 +171,10 @@ class PrintInformation(QObject):
             self._active_material_container.metaDataChanged.disconnect(self._onMaterialMetaDataChanged)
 
         active_material_id = Application.getInstance().getMachineManager().activeMaterialId
-        self._active_material_container = ContainerRegistry.getInstance().findInstanceContainers(id=active_material_id)[0]
+        active_material_containers = ContainerRegistry.getInstance().findInstanceContainers(id=active_material_id)
 
-        if self._active_material_container:
+        if active_material_containers:
+            self._active_material_container = active_material_containers[0]
             self._active_material_container.metaDataChanged.connect(self._onMaterialMetaDataChanged)
 
     def _onMaterialMetaDataChanged(self):

cura/Settings/ExtruderManager.py

@@ -96,7 +96,6 @@ class ExtruderManager(QObject):
     #   \param index The index of the new active extruder.
     @pyqtSlot(int)
     def setActiveExtruderIndex(self, index):
-        if self._active_extruder_index != index:
         self._active_extruder_index = index
         self.activeExtruderChanged.emit()
 

plugins/3MFReader/ThreeMFReader.py

@@ -118,7 +118,7 @@ class ThreeMFReader(MeshReader):
             Job.yieldThread()
 
         # TODO: We currently do not check for normals and simply recalculate them.
-        mesh_builder.calculateNormals()
+        mesh_builder.calculateNormals(fast=True)
         mesh_builder.setFileName(name)
         mesh_data = mesh_builder.build()
 

plugins/3MFWriter/ThreeMFWriter.py

@@ -44,7 +44,7 @@ class ThreeMFWriter(MeshWriter):
         result += str(matrix._data[2,2]) + " "
         result += str(matrix._data[0,3]) + " "
         result += str(matrix._data[1,3]) + " "
-        result += str(matrix._data[2,3]) + " "
+        result += str(matrix._data[2,3])
         return result
 
     ##  Should we store the archive
@@ -78,10 +78,11 @@ class ThreeMFWriter(MeshWriter):
             model_relation_element = ET.SubElement(relations_element, "Relationship", Target = "/3D/3dmodel.model", Id = "rel0", Type = "http://schemas.microsoft.com/3dmanufacturing/2013/01/3dmodel")
 
             model = ET.Element("model", unit = "millimeter", xmlns = self._namespaces["3mf"])
+            model.set("xmlns:cura", self._namespaces["cura"])
 
-            # Add the version of Cura this was created with. As "CuraVersion" is not a recognised metadata name
+            # Add the version of Cura this was created with. Since there is no "version" or similar metadata name we need
-            #  by 3mf itself, we place it in our own namespace.
+            # to prefix it with the cura namespace, as specified by the 3MF specification.
-            version_metadata = ET.SubElement(model, "metadata", xmlns = self._namespaces["cura"], name = "CuraVersion")
+            version_metadata = ET.SubElement(model, "metadata", name = "cura:version")
             version_metadata.text = Application.getInstance().getVersion()
 
             resources = ET.SubElement(model, "resources")

plugins/ChangeLogPlugin/ChangeLog.txt

@@ -125,6 +125,8 @@ There are no more unnecessary retractions in support.
 Each layer now has less extruder switches than the machine has extruders.
 Concentric infill doesn’t generate the first infill perimeter next to the walls.
 Extruder priming now always happens on the first layer.
+Raising the build plate of the Ultimaker 2 now has the proper speed again.
+Changing material while the Ultimaker 2 is paused works again.
 
 [2.3.1]
 *Layer Height in Profile Selection

plugins/ImageReader/ConfigUI.qml

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

plugins/LayerView/LayerView.qml

@@ -71,8 +71,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.width: UM.Theme.getSize("default_lining").width
-            border.color: UM.Theme.getColor("slider_groove_border");
+            border.color: UM.Theme.getColor("slider_groove_border")
+            color: UM.Theme.getColor("tool_panel_background")
 
             visible: UM.LayerView.getLayerActivity && Printer.getPlatformActivity ? true : false
 

plugins/SolidView/SolidView.py

@@ -9,7 +9,7 @@ from UM.Application import Application
 from UM.Preferences import Preferences
 from UM.View.Renderer import Renderer
 from UM.Settings.Validator import ValidatorState
-
+from UM.Math.Color import Color
 from UM.View.GL.OpenGL import OpenGL
 
 import cura.Settings
@@ -35,12 +35,14 @@ class SolidView(View):
 
         if not self._enabled_shader:
             self._enabled_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "overhang.shader"))
+            theme = Application.getInstance().getTheme()
+            self._enabled_shader.setUniformValue("u_overhangColor", Color(*theme.getColor("model_overhang").getRgb()))
 
         if not self._disabled_shader:
             self._disabled_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "striped.shader"))
             theme = Application.getInstance().getTheme()
-            self._disabled_shader.setUniformValue("u_diffuseColor1", theme.getColor("model_unslicable").getRgbF())
+            self._disabled_shader.setUniformValue("u_diffuseColor1", Color(*theme.getColor("model_unslicable").getRgb()))
-            self._disabled_shader.setUniformValue("u_diffuseColor2", theme.getColor("model_unslicable_alt").getRgbF())
+            self._disabled_shader.setUniformValue("u_diffuseColor2", Color(*theme.getColor("model_unslicable_alt").getRgb()))
             self._disabled_shader.setUniformValue("u_width", 50.0)
 
         multi_extrusion = False

resources/definitions/fdmprinter.def.json

@@ -1383,9 +1383,9 @@
                     "type": "float",
                     "resolve": "max(extruderValues('material_bed_temperature_layer_0'))",
                     "default_value": 60,
-                    "value": "material_bed_temperature",
+                    "value": "resolveOrValue('material_bed_temperature')",
                     "minimum_value": "-273.15",
-                    "minimum_value_warning": "0",
+                    "minimum_value_warning": "max(extruderValues('material_bed_temperature'))",
                     "maximum_value_warning": "260",
                     "enabled": "machine_heated_bed and machine_gcode_flavor != \"UltiGCode\"",
                     "settable_per_mesh": false,
@@ -3864,6 +3864,7 @@
                     "description": "Enable exterior ooze shield. This will create a shell around the model which is likely to wipe a second nozzle if it's at the same height as the first nozzle.",
                     "type": "bool",
                     "resolve": "any(extruderValues('ooze_shield_enabled'))",
+                    "enabled": "machine_extruder_count > 1",
                     "default_value": false,
                     "settable_per_mesh": false,
                     "settable_per_extruder": 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/de/fdmextruder.def.json.po

@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
 "POT-Creation-Date: 2016-12-28 10:51+0000\n"
-"PO-Revision-Date: 2016-09-29 13:02+0200\n"
+"PO-Revision-Date: 2017-01-12 15:51+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
 "Language: \n"

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

@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
 "POT-Creation-Date: 2016-12-28 10:51+0000\n"
-"PO-Revision-Date: 2016-09-29 13:02+0200\n"
+"PO-Revision-Date: 2017-01-12 15:51+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
 "Language: \n"

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

@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
 "POT-Creation-Date: 2016-12-28 10:51+0000\n"
-"PO-Revision-Date: 2016-09-29 13:02+0200\n"
+"PO-Revision-Date: 2017-01-12 15:51+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
 "Language: \n"

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

@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
 "POT-Creation-Date: 2016-12-28 10:51+0000\n"
-"PO-Revision-Date: 2016-09-29 13:02+0200\n"
+"PO-Revision-Date: 2017-01-12 15:51+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
 "Language: \n"

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

@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
 "POT-Creation-Date: 2016-12-28 10:51+0000\n"
-"PO-Revision-Date: 2016-09-29 13:02+0200\n"
+"PO-Revision-Date: 2017-01-12 15:51+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
 "Language: \n"

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

@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
 "POT-Creation-Date: 2016-12-28 10:51+0000\n"
-"PO-Revision-Date: 2016-10-11 16:05+0200\n"
+"PO-Revision-Date: 2017-01-12 15:51+0100\n"
 "Last-Translator: Ruben Dulek <r.dulek@ultimaker.com>\n"
 "Language-Team: Ultimaker\n"
 "Language: \n"

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

@@ -0,0 +1,191 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Uranium json setting files\n"
+"Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
+"POT-Creation-Date: 2016-12-28 10:51+0000\n"
+"PO-Revision-Date: 2016-01-25 05:05-0300\n"
+"Last-Translator: Cláudio Sampaio <patola@makerlinux.com.br>\n"
+"Language-Team: LANGUAGE\n"
+"Language: ptbr\n"
+"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"
+msgid "Machine"
+msgstr "Máquina"
+
+#: fdmextruder.def.json
+msgctxt "machine_settings description"
+msgid "Machine specific settings"
+msgstr "Ajustes específicos da máquina"
+
+#: fdmextruder.def.json
+msgctxt "extruder_nr label"
+msgid "Extruder"
+msgstr "Extrusor"
+
+#: fdmextruder.def.json
+msgctxt "extruder_nr description"
+msgid "The extruder train used for printing. This is used in multi-extrusion."
+msgstr "O extrusor usado para impressão. Isto é usado em multi-extrusão."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_x label"
+msgid "Nozzle X Offset"
+msgstr "Deslocamento X do Bico"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_x description"
+msgid "The x-coordinate of the offset of the nozzle."
+msgstr "A coordenada X do deslocamento aplicado ao bico."
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_y label"
+msgid "Nozzle Y Offset"
+msgstr "Deslocamento Y do Bico"
+
+#: fdmextruder.def.json
+msgctxt "machine_nozzle_offset_y description"
+msgid "The y-coordinate of the offset of the nozzle."
+msgstr "A coordenada Y do deslocamento aplicado ao bico."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_code label"
+msgid "Extruder Start G-Code"
+msgstr "G-Code Inicial do Extrusor"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_code description"
+msgid "Start g-code to execute whenever turning the extruder on."
+msgstr "G-Code Inicial a ser executado sempre que o extrusor for ligado."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_abs label"
+msgid "Extruder Start Position Absolute"
+msgstr "Posição de Início do Extrusor Absoluta"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_abs description"
+msgid ""
+"Make the extruder starting position absolute rather than relative to the "
+"last-known location of the head."
+msgstr ""
+"Faz a posição de início do extrusor ser absoluta ao invés de relativa à "
+"última posição conhecida da cabeça de impressão."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_x label"
+msgid "Extruder Start Position X"
+msgstr "Posição X de Início do Extrusor"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_x description"
+msgid "The x-coordinate of the starting position when turning the extruder on."
+msgstr "A coordenada X da posição de início quando se liga o extrusor."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_y label"
+msgid "Extruder Start Position Y"
+msgstr "Posição Y de Início do Extrusor"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_start_pos_y description"
+msgid "The y-coordinate of the starting position when turning the extruder on."
+msgstr "A coordenada Y da posição de início quando se liga o extrusor."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_code label"
+msgid "Extruder End G-Code"
+msgstr "G-Code Final do Extrusor"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_code description"
+msgid "End g-code to execute whenever turning the extruder off."
+msgstr "G-Code a ser executado antes de desligar o extrusor."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_abs label"
+msgid "Extruder End Position Absolute"
+msgstr "Posição Final do Extrusor Absoluta"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_abs description"
+msgid ""
+"Make the extruder ending position absolute rather than relative to the last-"
+"known location of the head."
+msgstr ""
+"Faz a posição final do extrusor ser absoluta ao invés de relativa à última "
+"posição conhecida da cabeça de impressão."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_x label"
+msgid "Extruder End Position X"
+msgstr "Posição X Final do Extrusor"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_x description"
+msgid "The x-coordinate of the ending position when turning the extruder off."
+msgstr "A coordenada X da posição final do extrusor quando se o desliga."
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_y label"
+msgid "Extruder End Position Y"
+msgstr "Posição Y Final do Extrusor"
+
+#: fdmextruder.def.json
+msgctxt "machine_extruder_end_pos_y description"
+msgid "The y-coordinate of the ending position when turning the extruder off."
+msgstr "A coordenada Y da posição final do extrusor quando se o desliga."
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_z label"
+msgid "Extruder Prime Z Position"
+msgstr "Posição Z de Purga do Extrusor"
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_z description"
+msgid ""
+"The Z coordinate of the position where the nozzle primes at the start of "
+"printing."
+msgstr ""
+"A coordenada Z da posição onde o bico faz a purga no início da impressão."
+
+#: fdmextruder.def.json
+msgctxt "platform_adhesion label"
+msgid "Build Plate Adhesion"
+msgstr "Aderência da Mesa de Impressão"
+
+#: fdmextruder.def.json
+msgctxt "platform_adhesion description"
+msgid "Adhesion"
+msgstr "Aderência"
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_x label"
+msgid "Extruder Prime X Position"
+msgstr "Posição X de Purga do Extrusor"
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_x description"
+msgid ""
+"The X coordinate of the position where the nozzle primes at the start of "
+"printing."
+msgstr ""
+"A coordenada X da posição onde o bico faz a purga no início da impressão."
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_y label"
+msgid "Extruder Prime Y Position"
+msgstr "Posição Y de Purga do Extrusor"
+
+#: fdmextruder.def.json
+msgctxt "extruder_prime_pos_y description"
+msgid ""
+"The Y coordinate of the position where the nozzle primes at the start of "
+"printing."
+msgstr ""
+"A coordenada Y da posição onde o bico faz a purga no início da impressão."

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

@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: Uranium json setting files\n"
 "Report-Msgid-Bugs-To: http://github.com/ultimaker/uranium\n"
 "POT-Creation-Date: 2016-12-28 10:51+0000\n"
-"PO-Revision-Date: 2016-09-29 13:02+0200\n"
+"PO-Revision-Date: 2017-01-12 15:51+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE\n"
 "Language: \n"

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: {
+                iconSource: printerConnected ? UM.Theme.getIcon("tab_monitor_with_status") : UM.Theme.getIcon("tab_monitor")
-                    if(!printerConnected)
+                property color overlayColor:
-                        return UM.Theme.getIcon("tab_monitor");
+                {
-                    else if(!printerAcceptsCommands)
+                    if(!printerAcceptsCommands)
-                        return UM.Theme.getIcon("tab_monitor_unknown");
+                    {
+                        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"/>
+    <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.5" fill="#ff8c00"/>
+    <circle cx="22.5" cy="7.5" r="7.4" />
-    <path fill="#fff" d="M19.5 4h2v7h-2zm4 0h2v7h-2z"/>
 </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 {
+                UM.RecolorImage {
-                    anchors.centerIn: parent;
+                    color: UM.Theme.getColor("text_reversed")
+                    anchors.centerIn: parent
                     opacity: !control.enabled ? 0.2 : 1.0
-                    source: control.iconSource;
+                    source: control.iconSource
-                    width: Theme.getSize("button_icon").width;
+                    width: Theme.getSize("button_icon").width
-                    height: Theme.getSize("button_icon").height;
+                    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],