Merge branch '4.0'

plugins/PrepareStage/PrepareMenu.qml

@@ -100,7 +100,7 @@ Item
                     source: UM.Theme.getIcon("load")
                     width: UM.Theme.getSize("button_icon").width
                     height: UM.Theme.getSize("button_icon").height
-                    color: UM.Theme.getColor("toolbar_button_text")
+                    color: UM.Theme.getColor("icon")
 
                     sourceSize.height: height
                 }

resources/qml/ActionPanel/OutputProcessWidget.qml

@@ -41,7 +41,7 @@ Column
             {
                 left: parent.left
                 right: printInformationPanel.left
-                rightMargin: UM.Theme.getSize("thin_margin").height
+                rightMargin: printInformationPanel.visible ? UM.Theme.getSize("thin_margin").width : 0
             }
 
             Cura.IconWithText

resources/qml/ActionPanel/PrintInformationWidget.qml

@@ -12,10 +12,10 @@ UM.RecolorImage
     id: widget
 
     source: UM.Theme.getIcon("info")
-    width: UM.Theme.getSize("section_icon").width
+    width: visible ? UM.Theme.getSize("section_icon").width : 0
     height: UM.Theme.getSize("section_icon").height
 
-    color: popup.opened ? UM.Theme.getColor("primary") : UM.Theme.getColor("text_medium")
+    color: UM.Theme.getColor("icon")
 
     MouseArea
     {

resources/qml/ExtruderIcon.qml

@@ -49,6 +49,7 @@ Item
             anchors.centerIn: parent
             text: index + 1
             font: UM.Theme.getFont("very_small")
+            color: UM.Theme.getColor("text")
             width: contentWidth
             height: contentHeight
             visible: extruderEnabled

resources/qml/IconWithText.qml

@@ -18,7 +18,7 @@ Item
     property alias color: label.color
     property alias text: label.text
     property alias font: label.font
-
+    property alias iconColor: icon.color
     property real margin: UM.Theme.getSize("narrow_margin").width
 
     // These properties can be used in combination with layouts.
@@ -39,7 +39,7 @@ Item
         width: UM.Theme.getSize("section_icon").width
         height: UM.Theme.getSize("section_icon").height
 
-        color: label.color
+        color: UM.Theme.getColor("icon")
 
         anchors
         {

resources/qml/MainWindow/MainWindowHeader.qml

@@ -54,7 +54,7 @@ Item
             {
                 text: model.name.toUpperCase()
                 checkable: true
-                checked: UM.Controller.activeStage != null ? model.id == UM.Controller.activeStage.stageId : false
+                checked: UM.Controller.activeStage !== null && model.id == UM.Controller.activeStage.stageId
 
                 anchors.verticalCenter: parent.verticalCenter
                 exclusiveGroup: mainWindowHeaderMenuGroup

resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml

@@ -113,9 +113,11 @@ Item
         }
         z: tabBar.z - 1
         // Don't show the border when only one extruder
+
         border.color: tabBar.visible ? UM.Theme.getColor("lining") : "transparent"
         border.width: UM.Theme.getSize("default_lining").width
 
+        color: UM.Theme.getColor("main_background")
         Cura.SettingView
         {
             anchors

resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml

@@ -144,6 +144,7 @@ Item
                             anchors.horizontalCenter: parent.horizontalCenter
                             y: UM.Theme.getSize("thin_margin").height
                             renderType: Text.NativeRendering
+                            color: UM.Theme.getColor("quality_slider_available")
                         }
                     }
                 }

resources/qml/Toolbar.qml

@@ -67,7 +67,7 @@ Item
                     toolItem: UM.RecolorImage
                     {
                         source: UM.Theme.getIcon(model.icon) != "" ? UM.Theme.getIcon(model.icon) : "file:///" + model.location + "/" + model.icon
-                        color: UM.Theme.getColor("toolbar_button_text")
+                        color: UM.Theme.getColor("icon")
 
                         sourceSize: UM.Theme.getSize("button_icon")
                     }

resources/themes/cura-dark/theme.json

@@ -17,6 +17,12 @@
         "border": [127, 127, 127, 255],
         "secondary": [95, 95, 95, 255],
 
+        "icon": [204, 204, 204, 255],
+        "toolbar_background": [39, 44, 48, 255],
+        "toolbar_button_active": [95, 95, 95, 255],
+        "toolbar_button_hover": [95, 95, 95, 255],
+        "toolbar_button_active_hover": [95, 95, 95, 255],
+
         "main_window_header_button_text_inactive": [128, 128, 128, 255],
         "main_window_header_button_text_hovered": [255, 255, 255, 255],
 
@@ -93,11 +99,11 @@
         "scrollbar_handle_hover": [255, 255, 255, 255],
         "scrollbar_handle_down": [255, 255, 255, 255],
 
-        "setting_category": [39, 44, 48, 255],
+        "setting_category": [75, 80, 83, 255],
-        "setting_category_disabled": [39, 44, 48, 255],
+        "setting_category_disabled": [75, 80, 83, 255],
-        "setting_category_hover": [39, 44, 48, 255],
+        "setting_category_hover": [75, 80, 83, 255],
-        "setting_category_active": [39, 44, 48, 255],
+        "setting_category_active": [75, 80, 83, 255],
-        "setting_category_active_hover": [39, 44, 48, 255],
+        "setting_category_active_hover": [75, 80, 83, 255],
         "setting_category_text": [255, 255, 255, 152],
         "setting_category_disabled_text": [255, 255, 255, 101],
         "setting_category_hover_text": [255, 255, 255, 204],

resources/themes/cura-light/theme.json

@@ -83,6 +83,8 @@
         "secondary": [240, 240, 240, 255],
         "secondary_shadow": [216, 216, 216, 255],
 
+        "icon": [8, 7, 63, 255],
+
         "primary_button": [38, 113, 231, 255],
         "primary_button_shadow": [27, 95, 202, 255],
         "primary_button_hover": [81, 145, 247, 255],
@@ -347,7 +349,7 @@
     },
 
     "sizes": {
-        "window_minimum_size": [106, 66],
+        "window_minimum_size": [100, 60],
 
         "main_window_header": [0.0, 4.0],
         "main_window_header_button": [8, 2.35],