3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-29 05:41:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

colours

Browse source
This commit is contained in:
Jack Ha 2016-12-06 14:14:24 +01:00
parent ed7ec58822
commit a65a81e60b
2 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
resources/qml/SidebarHeader.qml
View file

@ -117,12 +117,12 @@ Column
background: Rectangle
{
border.width: UM.Theme.getSize("default_lining").width
border.color: control.checked ? UM.Theme.getColor("toggle_checked_border") :
control.pressed ? UM.Theme.getColor("toggle_active_border") :
control.hovered ? UM.Theme.getColor("toggle_hovered_border") : UM.Theme.getColor("toggle_unchecked_border")
color: control.checked ? UM.Theme.getColor("toggle_checked") :
control.pressed ? UM.Theme.getColor("toggle_active") :
control.hovered ? UM.Theme.getColor("toggle_hovered") : UM.Theme.getColor("toggle_unchecked")
border.color: control.checked ? UM.Theme.getColor("tab_checked_border") :
control.pressed ? UM.Theme.getColor("tab_active_border") :
control.hovered ? UM.Theme.getColor("tab_hovered_border") : UM.Theme.getColor("tab_unchecked_border")
color: control.checked ? UM.Theme.getColor("tab_checked") :
control.pressed ? UM.Theme.getColor("tab_active") :
control.hovered ? UM.Theme.getColor("tab_hovered") : UM.Theme.getColor("tab_unchecked")
Behavior on color { ColorAnimation { duration: 50; } }
Rectangle
@ -137,7 +137,7 @@ Column
color: model.color
border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("toggle_checked")
border.color: UM.Theme.getColor("tab_checked_border")
}
Label
@ -148,9 +148,9 @@ Column
anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width / 2
color: control.checked ? UM.Theme.getColor("toggle_checked_text") :
control.pressed ? UM.Theme.getColor("toggle_active_text") :
control.hovered ? UM.Theme.getColor("toggle_hovered_text") : UM.Theme.getColor("toggle_unchecked_text")
color: control.checked ? UM.Theme.getColor("tab_checked_text") :
control.pressed ? UM.Theme.getColor("tab_active_text") :
control.hovered ? UM.Theme.getColor("tab_hovered_text") : UM.Theme.getColor("tab_unchecked_text")
font: UM.Theme.getFont("default")
text: control.text

15
resources/themes/cura/theme.json
View file

@ -91,7 +91,20 @@
"toggle_hovered_text": [24, 41, 77, 255],
"toggle_active": [32, 166, 219, 255],
"toggle_active_border": [32, 166, 219, 255],
"toggle_active_text": [255, 255, 255, 255],
"toggle_active_text": [24, 41, 77, 255],
"tab_checked": [255, 255, 255, 255],
"tab_checked_border": [24, 41, 77, 255],
"tab_checked_text": [24, 41, 77, 255],
"tab_unchecked": [224, 224, 224, 255],
"tab_unchecked_border": [224, 224, 224, 255],
"tab_unchecked_text": [24, 41, 77, 255],
"tab_hovered": [240, 240, 240, 255],
"tab_hovered_border": [128, 128, 128, 255],
"tab_hovered_text": [24, 41, 77, 255],
"tab_active": [255, 255, 255, 255],
"tab_active_border": [24, 41, 77, 255],
"tab_active_text": [24, 41, 77, 255],
"action_button": [255, 255, 255, 255],
"action_button_text": [24, 41, 77, 255],