Merge pull request #4943 from Ultimaker/small_ui_fixes

Small ui fixes
2025-04-23 22:29:41 +08:00 · 2018-12-06 15:23:35 +01:00 · 2018-12-06 15:23:35 +01:00 · e29baf0cec
commit e29baf0cec
parent 46c209a993 3c517d3fcc
12 changed files with 2178 additions and 105 deletions
--- a/plugins/SimulationView/SimulationViewMainComponent.qml
+++ b/plugins/SimulationView/SimulationViewMainComponent.qml
@ -61,10 +61,9 @@ Item
        iconSource: !is_simulation_playing ? "./resources/simulation_resume.svg": "./resources/simulation_pause.svg"
        width: UM.Theme.getSize("small_button").width
        height: UM.Theme.getSize("small_button").height
-        hoverBackgroundColor: UM.Theme.getColor("small_button_hover")
-        hoverColor: UM.Theme.getColor("small_button_text_hover")
-        color: UM.Theme.getColor("small_button_text")
-        iconMargin: 0.5 * UM.Theme.getSize("wide_lining").width
+        hoverColor: UM.Theme.getColor("slider_handle_active")
+        color: UM.Theme.getColor("slider_handle")
+        iconMargin: UM.Theme.getSize("thick_lining").width
        visible: !UM.SimulationView.compatibilityMode

        Connections
--- a/resources/qml/ActionButton.qml
+++ b/resources/qml/ActionButton.qml
@ -7,6 +7,7 @@ import QtQuick.Controls 2.1
 import QtGraphicalEffects 1.0 // For the dropshadow

 import UM 1.1 as UM
+import Cura 1.0 as Cura

 Button
 {
@ -16,6 +17,7 @@ Button
    property alias textFont: buttonText.font
    property alias cornerRadius: backgroundRect.radius
    property alias tooltip: tooltip.text
+    property alias cornerSide: backgroundRect.cornerSide

    property color color: UM.Theme.getColor("primary")
    property color hoverColor: UM.Theme.getColor("primary_hover")
@ -82,9 +84,10 @@ Button
        }
    }

-    background: Rectangle
+    background: Cura.RoundedRectangle
    {
        id: backgroundRect
+        cornerSide: Cura.RoundedRectangle.Direction.All
        color: button.enabled ? (button.hovered ? button.hoverColor : button.color) : button.disabledColor
        radius: UM.Theme.getSize("action_button_radius").width
        border.width: UM.Theme.getSize("default_lining").width
--- a/resources/qml/ActionPanel/OutputDevicesActionButton.qml
+++ b/resources/qml/ActionPanel/OutputDevicesActionButton.qml
@ -17,6 +17,7 @@ Item
        id: saveToButton
        height: parent.height
        fixedWidthMode: true
+        cornerSide: deviceSelectionMenu.visible ? Cura.RoundedRectangle.Direction.Left : Cura.RoundedRectangle.Direction.All

        anchors
        {
@ -44,6 +45,7 @@ Item

        shadowEnabled: true
        shadowColor: UM.Theme.getColor("primary_shadow")
+        cornerSide: Cura.RoundedRectangle.Direction.Right

        anchors
        {
--- a/resources/qml/ActionPanel/OutputProcessWidget.qml
+++ b/resources/qml/ActionPanel/OutputProcessWidget.qml
@ -101,16 +101,24 @@ Column
        }
    }

-    Row
+    Item
    {
        id: buttonRow
-        spacing: UM.Theme.getSize("default_margin").width
-        width: parent.width
+        anchors.right: parent.right
+        anchors.left: parent.left
+        height: UM.Theme.getSize("action_button").height

        Cura.SecondaryButton
        {
            id: previewStageShortcut

+            anchors
+            {
+                left: parent.left
+                right: outputDevicesButton.left
+                rightMargin: UM.Theme.getSize("default_margin").width
+            }
+
            height: UM.Theme.getSize("action_button").height
            leftPadding: UM.Theme.getSize("default_margin").width
            rightPadding: UM.Theme.getSize("default_margin").width
@ -125,6 +133,9 @@ Column

        Cura.OutputDevicesActionButton
        {
+            id: outputDevicesButton
+
+            anchors.right: parent.right
            width: previewStageShortcut.visible ? UM.Theme.getSize("action_button").width : parent.width
            height: UM.Theme.getSize("action_button").height
        }
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@ -88,6 +88,30 @@ UM.MainWindow
            window: base
        }

+        Rectangle
+        {
+            id: headerBackground
+            anchors
+            {
+                top: applicationMenu.bottom
+                left: parent.left
+                right: parent.right
+            }
+            height: stageMenu.source != "" ? Math.round(mainWindowHeader.height + stageMenu.height / 2) : mainWindowHeader.height
+            color: UM.Theme.getColor("main_window_header_background")
+
+            // This is the new fancy pattern
+            Image
+            {
+                id: backgourndPattern
+                anchors.fill: parent
+                fillMode: Image.Tile
+                source: UM.Theme.getImage("header_pattern")
+                horizontalAlignment: Image.AlignLeft
+                verticalAlignment: Image.AlignTop
+            }
+        }
+
        MainWindowHeader
        {
            id: mainWindowHeader
@ -144,44 +168,6 @@ UM.MainWindow
                }
            }

-            Rectangle
-            {
-                id: stageMenuBackground
-                anchors
-                {
-                    left: parent.left
-                    right: parent.right
-                    top: parent.top
-                }
-                visible: stageMenu.source != ""
-                height: visible ? Math.round(UM.Theme.getSize("stage_menu").height / 2) : 0
-
-                LinearGradient
-                {
-                    anchors.fill: parent
-                    start: Qt.point(0, 0)
-                    end: Qt.point(parent.width, 0)
-                    gradient: Gradient
-                    {
-                        GradientStop
-                        {
-                            position: 0.0
-                            color: UM.Theme.getColor("main_window_header_background")
-                        }
-                        GradientStop
-                        {
-                            position: 0.5
-                            color: UM.Theme.getColor("main_window_header_background_gradient")
-                        }
-                        GradientStop
-                        {
-                            position: 1.0
-                            color: UM.Theme.getColor("main_window_header_background")
-                        }
-                    }
-                }
-            }
-
            Connections
            {
                target: stageMenu.item
@ -257,7 +243,8 @@ UM.MainWindow

                anchors
                {
-                    top: stageMenuBackground.bottom
+                    // Align to the top of the stageMenu since the stageMenu may not exist
+                    top: parent.top
                    left: parent.left
                    right: parent.right
                    bottom: parent.bottom
--- a/resources/qml/Dialogs/AboutDialog.qml
+++ b/resources/qml/Dialogs/AboutDialog.qml
@ -35,9 +35,9 @@ UM.Dialog
    {
        id: logo
        width: (base.minimumWidth * 0.85) | 0
-        height: (width * (1/4.25)) | 0
+        height: (width * (UM.Theme.getSize("logo").height / UM.Theme.getSize("logo").width)) | 0

-        source: UM.Theme.getImage("logo")
+        source: UM.Theme.getImage("logo_about")

        anchors.top: parent.top
        anchors.topMargin: ((base.minimumWidth - width) / 2) | 0
--- a/resources/qml/MainWindow/MainWindowHeader.qml
+++ b/resources/qml/MainWindow/MainWindowHeader.qml
@ -12,38 +12,13 @@ import QtGraphicalEffects 1.0

 import "../Account"

-Rectangle
+Item
 {
    id: base

    implicitHeight: UM.Theme.getSize("main_window_header").height
    implicitWidth: UM.Theme.getSize("main_window_header").width

-    LinearGradient
-    {
-        anchors.fill: parent
-        start: Qt.point(0, 0)
-        end: Qt.point(parent.width, 0)
-        gradient: Gradient
-        {
-            GradientStop
-            {
-                position: 0.0
-                color: UM.Theme.getColor("main_window_header_background")
-            }
-            GradientStop
-            {
-                position: 0.5
-                color: UM.Theme.getColor("main_window_header_background_gradient")
-            }
-            GradientStop
-            {
-                position: 1.0
-                color: UM.Theme.getColor("main_window_header_background")
-            }
-        }
-    }
-
    Image
    {
        id: logo
--- a/resources/qml/PrinterSelector/MachineSelector.qml
+++ b/resources/qml/PrinterSelector/MachineSelector.qml
@ -25,29 +25,52 @@ Cura.ExpandableComponent
        name: "cura"
    }

-    headerItem: Cura.IconLabel
+    headerItem: Item
    {
-        text: isNetworkPrinter ? Cura.MachineManager.activeMachineNetworkGroupName : Cura.MachineManager.activeMachineName
-        source:
-        {
-            if (isNetworkPrinter)
-            {
-                if (machineSelector.outputDevice != null && machineSelector.outputDevice.clusterSize > 1)
-                {
-                    return UM.Theme.getIcon("printer_group")
-                }
-                return UM.Theme.getIcon("printer_single")
-            }
-            return ""
-        }
-        font: UM.Theme.getFont("medium")
-        color: UM.Theme.getColor("text")
-        iconSize: UM.Theme.getSize("machine_selector_icon").width
+        implicitHeight: icon.height

        UM.RecolorImage
        {
            id: icon

+            anchors.left: parent.left
+            anchors.verticalCenter: parent.verticalCenter
+
+            source:
+            {
+                if (isNetworkPrinter)
+                {
+                    if (machineSelector.outputDevice != null && machineSelector.outputDevice.clusterSize > 1)
+                    {
+                        return UM.Theme.getIcon("printer_group")
+                    }
+                    return UM.Theme.getIcon("printer_single")
+                }
+                return ""
+            }
+            width: UM.Theme.getSize("machine_selector_icon").width
+            height: width
+
+            color: UM.Theme.getColor("machine_selector_printer_icon")
+            visible: source != ""
+        }
+
+        Label
+        {
+            id: label
+            anchors.left: icon.visible ? icon.right : parent.left
+            anchors.right: parent.right
+            anchors.leftMargin: UM.Theme.getSize("thin_margin").width
+            anchors.verticalCenter: icon.verticalCenter
+            text: isNetworkPrinter ? Cura.MachineManager.activeMachineNetworkGroupName : Cura.MachineManager.activeMachineName
+            elide: Text.ElideRight
+            color: UM.Theme.getColor("text")
+            font: UM.Theme.getFont("medium")
+            renderType: Text.NativeRendering
+        }
+
+        UM.RecolorImage
+        {
            anchors
            {
                bottom: parent.bottom
--- a/resources/themes/cura-light/images/header_pattern.svg
+++ b/resources/themes/cura-light/images/header_pattern.svg
--- a/resources/themes/cura-light/images/logo_about.svg
+++ b/resources/themes/cura-light/images/logo_about.svg
@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="110mm"
+   height="33mm"
+   viewBox="0 0 110 33"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="logo.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.979899"
+     inkscape:cx="97.165681"
+     inkscape:cy="69.313647"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g4570"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     inkscape:window-x="2872"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:pagecheckerboard="true" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-264)">
+    <g
+       id="g4570"
+       transform="matrix(0.1443759,0,0,0.14575971,-5.7750359,237.12191)">
+      <polygon
+         id="polygon4506"
+         points="741.8,410.8 781.7,410.8 801.9,390.6 801.9,350.7 762,350.7 741.8,370.9 "
+         class="st0"
+         style="fill:#3282ff;fill-opacity:1" />
+      <path
+         id="path4508"
+         d="m 40,334.7 c 0,44.3 28.1,76.1 74.4,76.1 h 70.3 V 371 H 114.4 C 91,370.9 79.5,354.4 79.5,334.7 79.5,315 91,298.8 114.4,298.6 h 70.3 V 258.9 H 114.4 C 68.1,258.9 40,290.4 40,334.7 Z"
+         class="st1"
+         inkscape:connector-curvature="0"
+         style="fill:#000000" />
+      <path
+         id="path4510"
+         d="m 336.7,338.8 c 0,22.6 -16.5,34.7 -36.2,34.7 -19.7,0 -35.9,-12.1 -35.9,-34.7 v -79.9 h -39.9 v 79.9 c 0,44.7 31.5,71.9 75.8,71.9 44.3,0 76.1,-27.1 76.1,-71.9 v -79.9 h -39.9 z"
+         class="st1"
+         inkscape:connector-curvature="0"
+         style="fill:#000000" />
+      <path
+         id="path4512"
+         d="m 624.1,258.9 c -46.3,0 -74.4,31.5 -74.4,75.8 0,44.3 28.1,76.1 74.4,76.1 h 16.4 V 371 h -16.4 c -23.4,-0.1 -34.9,-16.6 -34.9,-36.3 0,-19.7 11.5,-35.9 34.9,-36.1 h 37.3 v 52 20.4 39.8 h 39.9 v -2.3 -37.5 -72.4 -32.8 -7 h -77.2 z"
+         class="st1"
+         inkscape:connector-curvature="0"
+         style="fill:#000000" />
+      <path
+         id="path4514"
+         d="m 416.6,333 v 77.8 H 456 V 333 c 0,-19.3 11.5,-35.1 34.9,-35.3 h 28.8 V 258.8 H 491 c -46.3,0.1 -74.4,30.9 -74.4,74.2 z"
+         class="st1"
+         inkscape:connector-curvature="0"
+         style="fill:#000000" />
+      <g
+         id="g4542">
+        <path
+           id="path4518"
+           d="m 456.3,198.8 c -3.1,0 -5.3,1.8 -5.3,5.3 v 29.4 c 0,3.5 2.1,5.3 5.3,5.3 3.2,0 5.3,-1.8 5.3,-5.3 v -29.4 c -0.1,-3.5 -2.2,-5.3 -5.3,-5.3 z"
+           class="st1"
+           inkscape:connector-curvature="0"
+           style="fill:#000000" />
+        <path
+           id="path4520"
+           d="m 456.3,184.4 c -2.9,0 -5.3,2.4 -5.3,5.4 0,0 0,0.1 0,0.1 0,3 2.5,5.3 5.5,5.3 3,0 5.3,-2.5 5.3,-5.5 -0.1,-3 -2.6,-5.3 -5.5,-5.3 z"
+           class="st1"
+           inkscape:connector-curvature="0"
+           style="fill:#000000" />
+        <path
+           id="path4522"
+           d="m 408.8,184.6 v 0 l -9.4,-0.1 c -1.6,0 -3,1.3 -3,3 0,1.6 1.3,3 3,3 h 3.6 v 43 c 0,3.5 2.1,5.3 5.3,5.3 3.1,0 5.3,-1.8 5.3,-5.3 v -43.6 c -0.2,-3.4 -2,-5.1 -4.8,-5.3 z"
+           class="st1"
+           inkscape:connector-curvature="0"
+           style="fill:#000000" />
+        <path
+           id="path4524"
+           d="m 521.3,204.9 c -1.1,-2.9 -3.8,-4.8 -6.8,-4.7 -0.4,0 -0.7,0.1 -1.1,0.1 -2.6,0.3 -4.8,2 -5.7,4.5 l -6.4,15.2 -6.4,-15.3 c -1.1,-2.8 -3.8,-4.6 -6.8,-4.6 -0.2,0 -0.3,0 -0.5,0 h -8.9 c -1.6,0 -3,1.3 -3,3 0,1.6 1.3,3 3,3 h 2.2 l -9.2,25.8 c -1,2.7 0.4,5.7 3.1,6.7 0.6,0.2 1.1,0.3 1.7,0.3 2.2,0 4.1,-1.4 4.9,-3.5 l 6.9,-19.2 7.9,18.8 c 0.5,1.7 1.8,3 3.5,3.5 0,0 0.1,0 0.1,0 0.2,0.1 0.4,0.1 0.6,0.1 0.3,0 0.5,0.1 0.8,0.1 0,0 0,0 0.1,0 0,0 0,0 0,0 v 0 0.1 c 2.1,0 4,-1.3 4.8,-3.2 l 8.1,-19.5 6.9,19.3 c 0.7,2.1 2.7,3.4 4.9,3.5 h 0.1 c 0.6,0 1.2,-0.1 1.7,-0.3 0,0 0,0 0,0 2.7,-1 4.1,-3.9 3.1,-6.6 z"
+           class="st1"
+           inkscape:connector-curvature="0"
+           style="fill:#000000" />
+        <path
+           id="path4526"
+           d="m 476.5,238.8 c 0,0 0,0 0,0 0,0 0,0 0,0 z"
+           class="st1"
+           inkscape:connector-curvature="0"
+           style="fill:#000000" />
+        <path
+           id="path4528"
+           d="m 608.9,215.4 7.8,-8.1 c 1.1,-0.8 1.6,-2.1 1.6,-3.5 -0.2,-2.6 -2.3,-4.7 -5,-4.8 -1.6,0.1 -3,0.8 -4,2 l -9.1,10.2 c -1.1,1.3 -1.7,2.9 -1.7,4.6 v 0 c 0,3.2 2.8,6.3 2.8,6.3 l 10,14.1 c 1,1.6 2.8,2.5 4.7,2.5 2.8,-0.1 5,-2.3 5,-5.1 0,-1.2 -0.4,-2.4 -1.1,-3.4 z"
+           class="st1"
+           inkscape:connector-curvature="0"
+           style="fill:#000000" />
+        <path
+           id="path4530"
+           d="m 590.9,184.6 v 0 l -9.4,-0.1 c -1.6,0 -3,1.3 -3,3 0,1.7 1.3,3 3,3 h 3.6 v 42.9 c 0,3.5 2.1,5.3 5.3,5.3 3.2,0 5.3,-1.8 5.3,-5.3 v -8 -35.5 c -0.1,-3.4 -1.9,-5.1 -4.8,-5.3 z"
+           class="st1"
+           inkscape:connector-curvature="0"
+           style="fill:#000000" />
+        <path
+           id="path4532"
+           d="m 440.7,200.2 h -3.3 v -6.7 c 0,-3.5 -2.1,-5.3 -5.3,-5.3 -3.1,0 -5.3,1.8 -5.3,5.3 v 6.7 c -1.6,0 -3,1.3 -3,3 0,1.6 1.3,3 3,3 v 27.4 c 0,3.5 2.2,5.3 5.3,5.3 3.1,0 5.3,-1.8 5.3,-5.3 V 228 206.2 h 3.3 c 1.6,0 3,-1.3 3,-3 0,-1.7 -1.3,-3 -3,-3 z"
+           class="st1"
+           inkscape:connector-curvature="0"
+           style="fill:#000000" />
+        <path
+           id="path4534"
+           d="m 573.4,227.7 v -18.6 c 0,-7.6 -7.7,-11.2 -21.5,-10.1 -2.3,0.2 -9.2,1.5 -9.2,1.5 -2.1,0.5 -4.2,1.6 -4.2,4.2 -0.1,2 1.4,3.7 3.4,3.8 0,0 0,0 0,0 0.3,0 0.6,0 0.8,0 0,0 7.4,-1.4 10,-1.6 1.3,-0.1 2.7,-0.1 4,-0.1 3.5,0.1 6.2,0.5 6.2,3.6 v 13.8 c 0,3.9 -3.5,7.6 -9.3,7.6 -3.6,0 -5.8,-1.9 -5.8,-4.3 0,-3.2 2.4,-4.5 6.8,-5.2 1.6,-0.3 2.6,-1.8 2.3,-3.4 0,0 0,0 0,0 0,-0.1 -0.1,-0.3 -0.1,-0.4 -0.8,-3.1 -4.7,-2.7 -4.7,-2.7 -8.1,0.9 -14.7,3.4 -14.7,12.1 0,6.6 5.9,10.7 11.9,10.7 5.5,0 10.3,-1.6 14.4,-6.1 0.2,3.2 1.7,6.1 6.2,6.1 2.5,0 4.8,-1.7 4.8,-4 -0.2,-1.4 -1.3,-2.5 -1.3,-6.9 z"
+           class="st1"
+           inkscape:connector-curvature="0"
+           style="fill:#000000" />
+        <path
+           id="path4536"
+           d="m 387.8,213 -0.1,0.1 v -22.7 c -0.2,-3 -2.6,-5.4 -5.5,-5.5 -3.3,-0.2 -6.1,2.3 -6.3,5.5 v 28.5 c 0,7 -4,10.2 -10.7,10.2 -6.8,0 -10.7,-3.2 -10.7,-10.2 v -28.5 c 0,-0.2 0,-0.5 0,-0.7 0,0 0,0 0,0 -0.2,-3.1 -2.8,-5.4 -5.9,-5.2 v 0 0 h -0.7 -8.7 c -1.6,0 -3,1.3 -3,3 0,1.7 1.3,3 3,3 h 3.5 c 0,0 0,0 0,0 l 0.1,27.5 c 0,14.3 8.8,20.7 22.5,20.7 5.3,0 9.9,-1 13.5,-3 0.9,1.7 2.5,2.9 5.4,2.9 2.5,0 4.8,-1.7 4.8,-4 0,-1.7 -1.1,-2.7 -1.1,-7.1 V 213 Z"
+           class="st1"
+           inkscape:connector-curvature="0"
+           style="fill:#000000" />
+        <path
+           id="path4538"
+           d="m 645.5,199 c -12.5,0 -19.9,8.2 -19.9,20.5 0,9.2 5.4,19.1 20.3,19.1 2.9,0 12.5,-2.2 12.5,-2.2 2.5,-0.5 4.3,-1.7 3.7,-5 -0.5,-2.3 -2.3,-3.3 -5,-2.9 0,0 -8.3,1.6 -11.2,1.8 -6.1,0.5 -9.7,-4 -9.7,-9.6 0,0 -1.7,-14.4 9.6,-14.4 4.6,0 8.2,3.7 8.9,8.4 h -11.1 c -1.6,0 -3,1.3 -3,3 0,1.7 1.3,3 3,3 v 0 0 H 660 c 3.5,0 4.6,-0.9 4.6,-4.5 -0.1,-8.6 -7,-17.2 -19.1,-17.2 z"
+           class="st1"
+           inkscape:connector-curvature="0"
+           style="fill:#000000" />
+        <path
+           id="path4540"
+           d="m 696.9,198.9 c -0.3,0 -0.6,0 -0.9,0 h -5.5 c -2.9,0 -4.9,1.5 -5.2,4.4 -0.3,-2.9 -2.3,-4.3 -5.2,-4.3 h -9.4 c -1.6,0 -3,1.3 -3,3 0,1.6 1.3,3 3,3 h 4.2 v 28.6 c 0,3.5 2.1,5.3 5.3,5.3 3.1,0 5.3,-1.8 5.3,-5.3 v -21.1 c 0,-1.6 1.3,-3 3,-3 h 7.7 c 3.5,0 5.3,-2.1 5.3,-5.3 0,-2.8 -1.9,-5.1 -4.6,-5.3 z"
+           class="st1"
+           inkscape:connector-curvature="0"
+           style="fill:#000000" />
+      </g>
+    </g>
+  </g>
+  <style
+     id="style4504"
+     type="text/css">
+	.st0{fill:#333333;}
+	.st1{fill:#000000;}
+</style>
+</svg>
--- a/resources/themes/cura-light/styles.qml
+++ b/resources/themes/cura-light/styles.qml
@ -145,7 +145,7 @@ QtObject
                    text: control.text
                    anchors.verticalCenter: parent.verticalCenter
                    anchors.horizontalCenter: parent.horizontalCenter
-                    font: UM.Theme.getFont("medium_bold")
+                    font: UM.Theme.getFont("medium")
                    color:
                    {
                        if (control.checked)
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@ -93,14 +93,14 @@
        "secondary_button_hover": [228, 228, 228, 255],
        "secondary_button_text": [30, 102, 215, 255],

-        "main_window_header_background": [10, 8, 80, 255],
+        "main_window_header_background": [8, 7, 63, 255],
        "main_window_header_background_gradient": [25, 23, 91, 255],
-        "main_window_header_button_text_active": [10, 8, 80, 255],
+        "main_window_header_button_text_active": [8, 7, 63, 255],
        "main_window_header_button_text_inactive": [255, 255, 255, 255],
        "main_window_header_button_text_hovered": [255, 255, 255, 255],
        "main_window_header_button_background_active": [255, 255, 255, 255],
        "main_window_header_button_background_inactive": [255, 255, 255, 0],
-        "main_window_header_button_background_hovered": [255, 255, 255, 102],
+        "main_window_header_button_background_hovered": [117, 114, 159, 255],

        "account_widget_outline_active": [70, 66, 126, 255],

@ -108,12 +108,13 @@
        "machine_selector_active": [68, 72, 75, 255],
        "machine_selector_hover": [68, 72, 75, 255],
        "machine_selector_text_active": [255, 255, 255, 255],
+        "machine_selector_printer_icon": [8, 7, 63, 255],

        "action_panel_secondary": [27, 95, 202, 255],

        "toolbar_background": [255, 255, 255, 255],

-        "printer_type_label_background": [171, 171, 191, 255],
+        "printer_type_label_background": [228, 228, 242, 255],

        "text": [0, 0, 0, 255],
        "text_detail": [174, 174, 174, 128],
@ -127,9 +128,9 @@
        "text_scene_hover": [70, 84, 113, 255],

        "error": [255, 140, 0, 255],
-        "warning": [255, 190, 35, 255],
+        "warning": [245, 166, 35, 255],

-        "toolbar_button_text": [10, 8, 80, 255],
+        "toolbar_button_text": [8, 7, 63, 255],
        "toolbar_button_hover": [232, 242, 252, 255],
        "toolbar_button_active": [232, 242, 252, 255],
        "toolbar_button_active_hover": [232, 242, 252, 255],
@ -144,9 +145,9 @@
        "button_text_active_hover": [255, 255, 255, 255],

        "small_button": [0, 0, 0, 0],
-        "small_button_hover": [10, 8, 80, 255],
-        "small_button_active": [10, 8, 80, 255],
-        "small_button_active_hover": [10, 8, 80, 255],
+        "small_button_hover": [8, 7, 63, 255],
+        "small_button_active": [8, 7, 63, 255],
+        "small_button_active_hover": [8, 7, 63, 255],
        "small_button_text": [171, 171, 191, 255],
        "small_button_text_hover": [255, 255, 255, 255],
        "small_button_text_active": [255, 255, 255, 255],
@ -222,8 +223,8 @@
        "progressbar_control": [50, 130, 255, 255],

        "slider_groove": [223, 223, 223, 255],
-        "slider_groove_fill": [10, 8, 80, 255],
-        "slider_handle": [10, 8, 80, 255],
+        "slider_groove_fill": [8, 7, 63, 255],
+        "slider_handle": [8, 7, 63, 255],
        "slider_handle_active": [50, 130, 255, 255],
        "slider_text_background": [255, 255, 255, 255],