GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 04:29:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This makes it much more distinguishable.

CURA-8011
This commit is contained in:
Konstantinos Karmas 2021-07-02 12:15:26 +02:00
parent b378e4870a
commit a6cd2fe970
3 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
View File

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

16
resources/qml/Settings/SettingExtruder.qml
View File

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

16
resources/qml/Settings/SettingOptionalExtruder.qml
View File

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