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

Redesign extruder selection widget

Browse Source 
Adds a colorswatch instead of coloring the whole widget (which looks like a warning state)

CURA-340
This commit is contained in:
fieldOfView 2016-06-13 18:23:53 +02:00
parent 213e20bf4b
commit 11b120a483
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View File

@ -61,7 +61,7 @@ Item {
} }
else else
{ {
return extruders_model.getItem(extruderSelector.currentIndex).colour; return UM.Theme.getColor("setting_control");
} }
} }
border.width: UM.Theme.getSize("default_lining").width border.width: UM.Theme.getSize("default_lining").width
@ -69,9 +69,22 @@ Item {
} }
label: Item label: Item
{ {
Rectangle
{
id: swatch
height: UM.Theme.getSize("setting_control").height / 2
width: height
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_lining").width
anchors.verticalCenter: parent.verticalCenter
color: extruders_model.getItem(extruderSelector.currentIndex).colour
border.width: UM.Theme.getSize("default_lining").width
border.color: !enabled ? UM.Theme.getColor("setting_control_disabled_border") : UM.Theme.getColor("setting_control_border")
}
Label Label
{ {
anchors.left: parent.left anchors.left: swatch.right
anchors.leftMargin: UM.Theme.getSize("default_lining").width anchors.leftMargin: UM.Theme.getSize("default_lining").width
anchors.right: downArrow.left anchors.right: downArrow.left
anchors.rightMargin: UM.Theme.getSize("default_lining").width anchors.rightMargin: UM.Theme.getSize("default_lining").width
@ -79,7 +92,7 @@ Item {
text: extruderSelector.currentText text: extruderSelector.currentText
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("setting_control_disabled_text") color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text")
elide: Text.ElideRight elide: Text.ElideRight
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter

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

@ -47,7 +47,7 @@ SettingItem
} }
else else
{ {
return extruders_model.getItem(index).colour; return UM.Theme.getColor("setting_control");
} }
} }
border.width: UM.Theme.getSize("default_lining").width border.width: UM.Theme.getSize("default_lining").width
@ -55,9 +55,22 @@ SettingItem
} }
label: Item label: Item
{ {
Rectangle
{
id: swatch
height: UM.Theme.getSize("setting_control").height / 2
width: height
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_lining").width
anchors.verticalCenter: parent.verticalCenter
color: extruders_model.getItem(control.currentIndex).colour
border.width: UM.Theme.getSize("default_lining").width
border.color: !enabled ? UM.Theme.getColor("setting_control_disabled_border") : UM.Theme.getColor("setting_control_border")
}
Label Label
{ {
anchors.left: parent.left anchors.left: swatch.right
anchors.leftMargin: UM.Theme.getSize("default_lining").width anchors.leftMargin: UM.Theme.getSize("default_lining").width
anchors.right: downArrow.left anchors.right: downArrow.left
anchors.rightMargin: UM.Theme.getSize("default_lining").width anchors.rightMargin: UM.Theme.getSize("default_lining").width
@ -65,7 +78,7 @@ SettingItem
text: control.currentText text: control.currentText
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : extruders_model.getItem(index).colour color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text")
elide: Text.ElideRight elide: Text.ElideRight
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter