Merge pull request #4937 from Ultimaker/CURA-5941_restyle_setting_dropdown

Restyle of the print setup panel

plugins/PostProcessingPlugin/PostProcessingPlugin.qml

@@ -412,7 +412,7 @@ UM.Dialog
             }
         }
 
-        Cura.SidebarTooltip
+        Cura.PrintSetupTooltip
         {
             id: tooltip
         }

plugins/PrepareStage/PrepareMenu.qml

@@ -13,10 +13,6 @@ import QtGraphicalEffects 1.0 // For the dropshadow
 Item
 {
     id: prepareMenu
-    // This widget doesn't show tooltips by itself. Instead it emits signals so others can do something with it.
-    signal showTooltip(Item item, point location, string text)
-    signal hideTooltip()
-
 
     UM.I18nCatalog
     {
@@ -45,7 +41,6 @@ Item
             Cura.MachineSelector
             {
                 id: machineSelection
-                z: openFileButton.z - 1 //Ensure that the tooltip of the open file button stays above the item row.
                 headerCornerSide: Cura.RoundedRectangle.Direction.Left
                 Layout.minimumWidth: UM.Theme.getSize("machine_selector_widget").width
                 Layout.maximumWidth: UM.Theme.getSize("machine_selector_widget").width

plugins/PreviewStage/PreviewMenu.qml

@@ -10,9 +10,6 @@ import Cura 1.1 as Cura
 Item
 {
     id: previewMenu
-    // This widget doesn't show tooltips by itself. Instead it emits signals so others can do something with it.
-    signal showTooltip(Item item, point location, string text)
-    signal hideTooltip()
 
     property real itemHeight: height - 2 * UM.Theme.getSize("default_lining").width
 

plugins/SimulationView/SimulationViewMenuComponent.qml

@@ -16,7 +16,6 @@ Cura.ExpandableComponent
     id: base
 
     width: UM.Theme.getSize("layerview_menu_size").width
-    iconSource: UM.Theme.getIcon("pencil")
 
     Connections
     {
@@ -45,7 +44,7 @@ Cura.ExpandableComponent
         verticalAlignment: Text.AlignVCenter
     }
 
-    popupItem: Column
+    contentItem: Column
     {
         id: viewSettings
 

plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml

@@ -27,7 +27,7 @@ Item
     Row
     {
         height: parent.height
-        spacing: 12 * screenScaleFactor // TODO: Theme! (Should be same as extruder spacing)
+        spacing: UM.Theme.getSize("print_setup_slider_handle").width // TODO: Theme! (Should be same as extruder spacing)
 
         // This wrapper ensures that the buildplate icon is located centered
         // below an extruder icon.

plugins/UM3NetworkPrinting/resources/qml/UM3InfoComponents.qml

@@ -29,7 +29,7 @@ Item {
         Button {
             height: UM.Theme.getSize("save_button_save_to_button").height;
             onClicked: Cura.MachineManager.printerOutputDevices[0].requestAuthentication();
-            style: UM.Theme.styles.sidebar_action_button;
+            style: UM.Theme.styles.print_setup_action_button;
             text: catalog.i18nc("@action:button", "Request Access");
             tooltip: catalog.i18nc("@info:tooltip", "Send access request to the printer");
             visible: printerConnected && !printerAcceptsCommands && !authenticationRequested;
@@ -38,7 +38,7 @@ Item {
         Button {
             height: UM.Theme.getSize("save_button_save_to_button").height;
             onClicked: connectActionDialog.show();
-            style: UM.Theme.styles.sidebar_action_button;
+            style: UM.Theme.styles.print_setup_action_button;
             text: catalog.i18nc("@action:button", "Connect");
             tooltip: catalog.i18nc("@info:tooltip", "Connect to a printer");
             visible: !printerConnected;

resources/qml/Account/AccountDetails.qml

@@ -13,8 +13,8 @@ Column
     property var loggedIn: false
     property var profileImage: ""
 
-    padding: 2 * UM.Theme.getSize("default_margin").height
-    spacing: 2 * UM.Theme.getSize("default_margin").height
+    padding: UM.Theme.getSize("wide_margin").height
+    spacing: UM.Theme.getSize("wide_margin").height
 
     AvatarImage
     {

resources/qml/ActionButton.qml

@@ -3,17 +3,17 @@
 
 import QtQuick 2.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
 {
     id: button
-    property alias iconSource: buttonIconLeft.source
     property bool isIconOnRightSide: false
+
+    property alias iconSource: buttonIconLeft.source
     property alias textFont: buttonText.font
     property alias cornerRadius: backgroundRect.radius
     property alias tooltip: tooltip.text
@@ -28,9 +28,6 @@ Button
     property color outlineColor: color
     property color outlineHoverColor: hoverColor
     property color outlineDisabledColor: outlineColor
-
-    hoverEnabled: true
-
     property alias shadowColor: shadow.color
     property alias shadowEnabled: shadow.visible
 
@@ -42,6 +39,7 @@ Button
     leftPadding: UM.Theme.getSize("default_margin").width
     rightPadding: UM.Theme.getSize("default_margin").width
     height: UM.Theme.getSize("action_button").height
+    hoverEnabled: true
 
     contentItem: Row
     {
@@ -52,6 +50,8 @@ Button
             source: ""
             height: buttonText.height
             width: visible ? height : 0
+            sourceSize.width: width
+            sourceSize.height: height
             color: button.hovered ? button.textHoverColor : button.textColor
             visible: source != "" && !button.isIconOnRightSide
             anchors.verticalCenter: parent.verticalCenter
@@ -78,6 +78,8 @@ Button
             source: buttonIconLeft.source
             height: buttonText.height
             width: visible ? height : 0
+            sourceSize.width: width
+            sourceSize.height: height
             color: buttonIconLeft.color
             visible: source != "" && button.isIconOnRightSide
             anchors.verticalCenter: buttonIconLeft.verticalCenter
@@ -114,4 +116,4 @@ Button
         delay: 500
         visible: text != "" && button.hovered
     }
-}
+}

resources/qml/ActionPanel/OutputProcessWidget.qml

@@ -44,7 +44,7 @@ Column
                 rightMargin: UM.Theme.getSize("thin_margin").height
             }
 
-            Cura.IconLabel
+            Cura.IconWithText
             {
                 id: estimatedTime
                 width: parent.width
@@ -54,7 +54,7 @@ Column
                 font: UM.Theme.getFont("default_bold")
             }
 
-            Cura.IconLabel
+            Cura.IconWithText
             {
                 id: estimatedCosts
                 width: parent.width
@@ -84,7 +84,6 @@ Column
                     return totalWeights + "g · " + totalLengths.toFixed(2) + "m"
                 }
                 source: UM.Theme.getIcon("spool")
-                font: UM.Theme.getFont("default")
             }
         }
 

resources/qml/ActionPanel/SliceProcessWidget.qml

@@ -52,7 +52,7 @@ Column
         renderType: Text.NativeRendering
     }
 
-    Cura.IconLabel
+    Cura.IconWithText
     {
         id: unableToSliceMessage
         width: parent.width
@@ -61,7 +61,6 @@ Column
         text: catalog.i18nc("@label:PrintjobStatus", "Unable to Slice")
         source: UM.Theme.getIcon("warning")
         color: UM.Theme.getColor("warning")
-        font: UM.Theme.getFont("default")
     }
 
     // Progress bar, only visible when the backend is in the process of slice the printjob