3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 07:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Stop using SettingItemStyle

Browse source 
Since everything is now in Cura, using SettingItemStyle does not make a
lot of sense anymore
This commit is contained in:
Arjen Hiemstra 2016-05-11 16:55:45 +02:00
parent 4c9b9b68ef
commit 2abb9a47c1
3 changed files with 53 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

15
resources/qml/Settings/SettingCheckBox.qml
View file

@ -46,19 +46,20 @@ SettingItem
{
if (!enabled)
{
return base.style.controlDisabledColor
return UM.Theme.getColor("setting_control_disabled")
}
if(base.containsMouse || base.activeFocus)
{
return base.style.controlHighlightColor
return UM.Theme.getColor("setting_control_highlight")
}
else
{
return base.style.controlColor
return UM.Theme.getColor("setting_control")
}
}
border.width: base.style.controlBorderWidth;
border.color: !enabled ? base.style.controlDisabledBorderColor : control.containsMouse ? base.style.controlBorderHighlightColor : base.style.controlBorderColor;
border.width: UM.Theme.getSize("default_lining").width
border.color: !enabled ? UM.Theme.getColor("setting_control_disabled_border") : control.containsMouse ? UM.Theme.getColor("setting_control_border_highlight") : UM.Theme.getColor("setting_control_border")
UM.RecolorImage {
anchors.verticalCenter: parent.verticalCenter
@ -67,9 +68,9 @@ SettingItem
height: parent.height/2.5
sourceSize.width: width
sourceSize.height: width
color: !enabled ? base.style.controlDisabledTextColor : base.style.controlTextColor;
color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text");
source: UM.Theme.getIcon("check")
opacity: control.checked
opacity: control.checked ? 1 : 0
Behavior on opacity { NumberAnimation { duration: 100; } }
}
}