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

Change to new design for extruder number settings

Browse Source 
CURA-4211
This commit is contained in:
Lipu Fei 2017-08-31 17:48:37 +02:00
parent c2645d0022
commit aad628a46f
2 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,36 +97,36 @@ SettingItem
} }
label: Item label: Item
{ {
Label
{
id: extruderText
anchors.verticalCenter: parent.verticalCenter
text: control.currentText
font: UM.Theme.getFont("default")
color: enabled ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text")
elide: Text.ElideLeft
verticalAlignment: Text.AlignVCenter
}
Rectangle Rectangle
{ {
id: swatch id: swatch
height: UM.Theme.getSize("setting_control").height / 2 height: UM.Theme.getSize("setting_control").height / 2
width: height width: height
anchors.verticalCenter: parent.verticalCenter
border.width: UM.Theme.getSize("default_lining").width
border.color: enabled ? UM.Theme.getColor("setting_control_border") : UM.Theme.getColor("setting_control_disabled_border")
color: control.color
}
Label
{
anchors anchors
{ {
left: swatch.right; right: arrow.left
right: arrow.left;
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
margins: UM.Theme.getSize("default_lining").width margins: UM.Theme.getSize("default_margin").width / 4
} }
width: parent.width - swatch.width;
text: control.currentText border.width: UM.Theme.getSize("default_lining").width * 2
font: UM.Theme.getFont("default") border.color: enabled ? UM.Theme.getColor("setting_control_border") : UM.Theme.getColor("setting_control_disabled_border")
color: enabled ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text") radius: width / 2
elide: Text.ElideRight color: control.color
verticalAlignment: Text.AlignVCenter
} }
UM.RecolorImage UM.RecolorImage
{ {

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

@ -116,29 +116,10 @@ SettingItem
} }
label: Item label: Item
{ {
Rectangle
{
id: swatch
height: UM.Theme.getSize("setting_control").height / 2
width: height
anchors.verticalCenter: parent.verticalCenter
border.width: UM.Theme.getSize("default_lining").width
border.color: enabled ? UM.Theme.getColor("setting_control_border") : UM.Theme.getColor("setting_control_disabled_border")
color: control.color
}
Label Label
{ {
anchors anchors.verticalCenter: parent.verticalCenter
{ width: parent.width - swatch.width - arrow.width;
left: swatch.right;
right: arrow.left;
verticalCenter: parent.verticalCenter
margins: UM.Theme.getSize("default_lining").width
}
width: parent.width - swatch.width;
text: control.currentText text: control.currentText
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
@ -147,6 +128,25 @@ SettingItem
elide: Text.ElideRight elide: Text.ElideRight
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
} }
Rectangle
{
id: swatch
height: UM.Theme.getSize("setting_control").height / 2
width: height
anchors
{
right: arrow.left;
verticalCenter: parent.verticalCenter
margins: UM.Theme.getSize("default_margin").width / 4
}
border.width: UM.Theme.getSize("default_lining").width * 2
border.color: enabled ? UM.Theme.getColor("setting_control_border") : UM.Theme.getColor("setting_control_disabled_border")
radius: width / 2
color: control.color
}
UM.RecolorImage UM.RecolorImage
{ {
id: arrow id: arrow