Browse Source

Change the extruder icon in the settings dropdown to be a filled circle

This makes it much more distinguishable.

CURA-8011
Konstantinos Karmas 3 years ago
parent
commit
a6cd2fe970

+ 4 - 8
resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml

@@ -219,18 +219,16 @@ Item
                 elide: Text.ElideLeft
                 verticalAlignment: Text.AlignVCenter
 
-                background: UM.RecolorImage
+                background: Rectangle
                 {
                     id: swatch
                     height: Math.round(parent.height / 2)
                     width: height
+                    radius: Math.round(width / 2)
                     anchors.right: parent.right
                     anchors.verticalCenter: parent.verticalCenter
                     anchors.rightMargin: UM.Theme.getSize("thin_margin").width
 
-                    sourceSize.width: width
-                    sourceSize.height: height
-                    source: UM.Theme.getIcon("Extruder", "medium")
                     color: supportExtruderCombobox.color
                 }
             }
@@ -289,18 +287,16 @@ Item
                     verticalAlignment: Text.AlignVCenter
                     rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width
 
-                    background: UM.RecolorImage
+                    background: Rectangle
                     {
                         id: swatch
                         height: Math.round(parent.height / 2)
                         width: height
+                        radius: Math.round(width / 2)
                         anchors.right: parent.right
                         anchors.verticalCenter: parent.verticalCenter
                         anchors.rightMargin: UM.Theme.getSize("thin_margin").width
 
-                        sourceSize.width: width
-                        sourceSize.height: height
-                        source: UM.Theme.getIcon("Extruder", "medium")
                         color: supportExtruderCombobox.model.getItem(index).color
                     }
                 }

+ 6 - 10
resources/qml/Settings/SettingExtruder.qml

@@ -77,7 +77,7 @@ SettingItem
 
         currentIndex: propertyProvider.properties.value !== undefined ? propertyProvider.properties.value : 0
 
-        property string color: "#fff"
+        property string color: "transparent"
 
         Binding
         {
@@ -85,7 +85,7 @@ SettingItem
             // explicit binding here otherwise we do not handle value changes after the model changes.
             target: control
             property: "color"
-            value: control.currentText != "" ? control.model.getItem(control.currentIndex).color : ""
+            value: control.currentText != "" ? control.model.getItem(control.currentIndex).color : "transparent"
         }
 
         Binding
@@ -160,18 +160,16 @@ SettingItem
             elide: Text.ElideLeft
             verticalAlignment: Text.AlignVCenter
 
-            background: UM.RecolorImage
+            background: Rectangle
             {
                 id: swatch
                 height: Math.round(parent.height / 2)
                 width: height
+                radius: Math.round(width / 2)
                 anchors.right: parent.right
                 anchors.verticalCenter: parent.verticalCenter
                 anchors.rightMargin: UM.Theme.getSize("thin_margin").width
 
-                sourceSize.width: width
-                sourceSize.height: height
-                source: UM.Theme.getIcon("Extruder", "medium")
                 color: control.color
             }
         }
@@ -229,18 +227,16 @@ SettingItem
                 verticalAlignment: Text.AlignVCenter
                 rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width
 
-                background: UM.RecolorImage
+                background: Rectangle
                 {
                     id: swatch
                     height: Math.round(parent.height / 2)
                     width: height
+                    radius: Math.round(width / 2)
                     anchors.right: parent.right
                     anchors.verticalCenter: parent.verticalCenter
                     anchors.rightMargin: UM.Theme.getSize("thin_margin").width
 
-                    sourceSize.width: width
-                    sourceSize.height: height
-                    source: UM.Theme.getIcon("Extruder", "medium")
                     color: control.model.getItem(index).color
                 }
             }

+ 6 - 10
resources/qml/Settings/SettingOptionalExtruder.qml

@@ -88,7 +88,7 @@ SettingItem
             when: control.model.items.length > 0
         }
 
-        property string color: "#fff"
+        property string color: "transparent"
 
         Binding
         {
@@ -96,7 +96,7 @@ SettingItem
             // explicit binding here otherwise we do not handle value changes after the model changes.
             target: control
             property: "color"
-            value: control.currentText != "" ? control.model.getItem(control.currentIndex).color : ""
+            value: control.currentText != "" ? control.model.getItem(control.currentIndex).color : "transparent"
         }
 
         indicator: UM.RecolorImage
@@ -161,18 +161,16 @@ SettingItem
             elide: Text.ElideRight
             verticalAlignment: Text.AlignVCenter
 
-            background: UM.RecolorImage
+            background: Rectangle
             {
                 id: swatch
                 height: Math.round(parent.height / 2)
                 width: height
+                radius: Math.round(width / 2)
                 anchors.right: parent.right
                 anchors.verticalCenter: parent.verticalCenter
                 anchors.rightMargin: UM.Theme.getSize("thin_margin").width
 
-                sourceSize.width: width
-                sourceSize.height: height
-                source: UM.Theme.getIcon("Extruder", "medium")
                 color: control.color
             }
         }
@@ -226,18 +224,16 @@ SettingItem
                 verticalAlignment: Text.AlignVCenter
                 rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width
 
-                background: UM.RecolorImage
+                background: Rectangle
                 {
                     id: swatch
                     height: Math.round(parent.height / 2)
                     width: height
+                    radius: Math.round(width / 2)
                     anchors.right: parent.right
                     anchors.verticalCenter: parent.verticalCenter
                     anchors.rightMargin: UM.Theme.getSize("thin_margin").width
 
-                    sourceSize.width: width
-                    sourceSize.height: height
-                    source: UM.Theme.getIcon("Extruder", "medium")
                     color: control.model.getItem(index).color
                 }
             }