Merge pull request #12573 from Ultimaker/CURA-8849_more_intent_fixes

[CURA-8849] more intent fixes

resources/qml/IconWithText.qml

@@ -24,6 +24,8 @@ Item
     property alias wrapMode: label.wrapMode
     property real spacing: UM.Theme.getSize("narrow_margin").width
 
+    property string tooltipText: ""
+
     // These properties can be used in combination with layouts.
     readonly property real contentWidth: icon.width + margin + label.contentWidth
     readonly property real minContentWidth: Math.round(icon.width + margin + 0.5 * label.contentWidth)
@@ -66,4 +68,13 @@ Item
             margins: margin
         }
     }
+
+    MouseArea
+    {
+        enabled: tooltipText != ""
+        anchors.fill: parent
+        hoverEnabled: true
+        onEntered: base.showTooltip(parent, Qt.point(-UM.Theme.getSize("thick_margin").width, 0), tooltipText)
+        onExited: base.hideTooltip()
+    }
 }

resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml

@@ -13,7 +13,7 @@ import Cura 1.0 as Cura
 Item
 {
     id: enableAdhesionRow
-    height: childrenRect.height
+    height: enableAdhesionContainer.height
 
     property real labelColumnWidth: Math.round(width / 3)
     property var curaRecommendedMode: Cura.RecommendedMode {}
@@ -47,8 +47,6 @@ Item
             id: enableAdhesionCheckBox
             anchors.verticalCenter: parent.verticalCenter
 
-            property alias _hovered: adhesionMouseArea.containsMouse
-
             //: Setting enable printing build-plate adhesion helper checkbox
             enabled: recommendedPrintSetup.settingsEnabled
 
@@ -60,21 +58,24 @@ Item
                 id: adhesionMouseArea
                 anchors.fill: parent
                 hoverEnabled: true
-
+                // propagateComposedEvents used on adhesionTooltipMouseArea does not work with Controls Components.
-                onClicked:
+                // It only works with other MouseAreas, so this is required
-                {
+                onClicked: curaRecommendedMode.setAdhesion(!parent.checked)
-                    curaRecommendedMode.setAdhesion(!parent.checked)
+            }
+        }
     }
 
-                onEntered:
+    MouseArea
     {
-                    base.showTooltip(enableAdhesionCheckBox, Qt.point(-enableAdhesionContainer.x - UM.Theme.getSize("thick_margin").width, 0),
+        id: adhesionTooltipMouseArea
+        anchors.fill: parent
+        propagateComposedEvents: true
+        hoverEnabled: true
+
+        onEntered:base.showTooltip(enableAdhesionCheckBox, Qt.point(-enableAdhesionContainer.x - UM.Theme.getSize("thick_margin").width, 0),
                 catalog.i18nc("@label", "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards."));
-                }
         onExited: base.hideTooltip()
     }
-        }
-    }
 
     UM.SettingPropertyProvider
     {

resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml

@@ -65,6 +65,7 @@ Item
         font: UM.Theme.getFont("medium")
         width: labelColumnWidth
         iconSize: UM.Theme.getSize("medium_button_icon").width
+        tooltipText: catalog.i18nc("@label", "Gradual infill will gradually increase the amount of infill towards the top.")
     }
 
     Item
@@ -102,7 +103,6 @@ Item
                 id: backgroundLine
                 height: UM.Theme.getSize("print_setup_slider_groove").height
                 width: parent.width - UM.Theme.getSize("print_setup_slider_handle").width
-                implicitWidth: width
                 anchors.horizontalCenter: parent.horizontalCenter
                 anchors.verticalCenter: parent.verticalCenter
                 color: infillSlider.enabled ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable")

resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml

@@ -62,7 +62,7 @@ Item
         {
             width: parent.width
             Layout.fillWidth: true
-            Layout.topMargin: UM.Theme.getSize("thin_margin").height
+            Layout.topMargin: UM.Theme.getSize("default_margin").height
             Layout.bottomMargin: UM.Theme.getSize("thin_margin").height
         }
 

resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml

@@ -22,6 +22,7 @@ Item
         id: resolutionTitle
         anchors.top: parent.top
         anchors.left: parent.left
+        anchors.leftMargin: - UM.Theme.getSize("thick_lining").width
         source: UM.Theme.getIcon("PrintQuality")
         text: catalog.i18nc("@label", "Resolution")
         width: labelColumnWidth

resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml

@@ -14,14 +14,26 @@ import Cura 1.0 as Cura
 Item
 {
     id: enableSupportRow
-    height: childrenRect.height
+    height: UM.Theme.getSize("print_setup_big_item").height
 
     property real labelColumnWidth: Math.round(width / 3)
 
+    Item
+    {
+        id: enableSupportContainer
+        width: labelColumnWidth + enableSupportCheckBox.width
+
+        anchors
+        {
+            left: parent.left
+            top: parent.top
+            bottom: parent.bottom
+            rightMargin: UM.Theme.getSize("thick_margin").width
+        }
+
         Cura.IconWithText
         {
             id: enableSupportRowTitle
-        anchors.top: parent.top
             anchors.left: parent.left
             visible: enableSupportCheckBox.visible
             source: UM.Theme.getIcon("Support")
@@ -29,24 +41,14 @@ Item
             font: UM.Theme.getFont("medium")
             width: labelColumnWidth
             iconSize: UM.Theme.getSize("medium_button_icon").width
-    }
+            tooltipText: catalog.i18nc("@label", "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing.")
-
-    Item
-    {
-        id: enableSupportContainer
-        height: enableSupportCheckBox.height
-
-        anchors
-        {
-            left: enableSupportRowTitle.right
-            right: parent.right
-            verticalCenter: enableSupportRowTitle.verticalCenter
         }
 
         UM.CheckBox
         {
             id: enableSupportCheckBox
             anchors.verticalCenter: parent.verticalCenter
+            anchors.left: enableSupportRowTitle.right
 
             property alias _hovered: enableSupportMouseArea.containsMouse
 
@@ -60,14 +62,20 @@ Item
                 id: enableSupportMouseArea
                 anchors.fill: parent
                 hoverEnabled: true
-
+                // propagateComposedEvents used on supportToolTipMouseArea does not work with Controls Components.
+                // It only works with other MouseAreas, so this is required
                 onClicked: supportEnabled.setPropertyValue("value", supportEnabled.properties.value != "True")
-
-                onEntered:
-                {
-                    base.showTooltip(enableSupportCheckBox, Qt.point(-enableSupportContainer.x - UM.Theme.getSize("thick_margin").width, 0),
-                        catalog.i18nc("@label", "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing."))
             }
+        }
+
+        MouseArea
+        {
+            id: supportToolTipMouseArea
+            anchors.fill: parent
+            propagateComposedEvents: true
+            hoverEnabled: true
+            onEntered: base.showTooltip(enableSupportContainer, Qt.point(-enableSupportContainer.x - UM.Theme.getSize("thick_margin").width, 0),
+                    catalog.i18nc("@label", "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing."))
             onExited: base.hideTooltip()
         }
     }
@@ -79,9 +87,9 @@ Item
         height: UM.Theme.getSize("print_setup_big_item").height
         anchors
         {
-                left: enableSupportCheckBox.right
+            left: enableSupportContainer.right
             right: parent.right
-                leftMargin: UM.Theme.getSize("thick_margin").width
+            leftMargin: UM.Theme.getSize("default_margin").width
             rightMargin: UM.Theme.getSize("thick_margin").width
             verticalCenter: parent.verticalCenter
         }
@@ -289,7 +297,6 @@ Item
             }
         }
     }
-    }
 
     property var extruderModel: CuraApplication.getExtrudersModel()
 

resources/qml/Settings/SettingItem.qml

@@ -209,7 +209,7 @@ Item
                 height: UM.Theme.getSize("small_button_icon").height
                 width: height
 
-                color: UM.Theme.getColor("setting_control_button")
+                color: UM.Theme.getColor("accent_1")
                 hoverColor: UM.Theme.getColor("setting_control_button_hover")
 
                 iconSource: UM.Theme.getIcon("ArrowReset")

resources/qml/Widgets/ComboBox.qml

@@ -61,23 +61,25 @@ ComboBox
         {
             anchors.fill: parent
             opacity: 0
-            color: UM.Theme.getColor("warning")
+            color: "transparent"
+
+            border.color: UM.Theme.getColor("text_field_border_active")
+            border.width: UM.Theme.getSize("default_lining").width
 
             SequentialAnimation on opacity
             {
                 id: pulseAnimation
                 running: false
-                loops: 1
+                loops: 2
-                alwaysRunToEnd: true
                 PropertyAnimation
                 {
                     to: 1
-                    duration: 300
+                    duration: 150
                 }
                 PropertyAnimation
                 {
                     to: 0
-                    duration : 2000
+                    duration : 150
                 }
             }
         }