3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 14:44:13 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

CURA-4321 make print button blue when available, slight color changes on hover and pressed

Browse source
This commit is contained in:
ChrisTerBeke 2017-09-14 17:40:44 +02:00
parent 4aa8d38bd3
commit a4ebedee83
2 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
resources/qml/SaveButton.qml
View file

@ -238,22 +238,22 @@ Item {
if(!control.enabled) if(!control.enabled)
return UM.Theme.getColor("action_button_disabled_border"); return UM.Theme.getColor("action_button_disabled_border");
else if(control.pressed) else if(control.pressed)
return UM.Theme.getColor("action_button_active_border"); return UM.Theme.getColor("print_button_ready_pressed_border");
else if(control.hovered) else if(control.hovered)
return UM.Theme.getColor("action_button_hovered_border"); return UM.Theme.getColor("print_button_ready_hovered_border");
else else
return UM.Theme.getColor("action_button_border"); return UM.Theme.getColor("print_button_ready_border");
} }
color: color:
{ {
if(!control.enabled) if(!control.enabled)
return UM.Theme.getColor("action_button_disabled"); return UM.Theme.getColor("action_button_disabled");
else if(control.pressed) else if(control.pressed)
return UM.Theme.getColor("action_button_active"); return UM.Theme.getColor("print_button_ready_pressed");
else if(control.hovered) else if(control.hovered)
return UM.Theme.getColor("action_button_hovered"); return UM.Theme.getColor("print_button_ready_hovered");
else else
return UM.Theme.getColor("action_button"); return UM.Theme.getColor("print_button_ready");
} }
Behavior on color { ColorAnimation { duration: 50; } } Behavior on color { ColorAnimation { duration: 50; } }
@ -268,11 +268,11 @@ Item {
if(!control.enabled) if(!control.enabled)
return UM.Theme.getColor("action_button_disabled_text"); return UM.Theme.getColor("action_button_disabled_text");
else if(control.pressed) else if(control.pressed)
return UM.Theme.getColor("action_button_active_text"); return UM.Theme.getColor("print_button_ready_text");
else if(control.hovered) else if(control.hovered)
return UM.Theme.getColor("action_button_hovered_text"); return UM.Theme.getColor("print_button_ready_text");
else else
return UM.Theme.getColor("action_button_text"); return UM.Theme.getColor("print_button_ready_text");
} }
font: UM.Theme.getFont("action_button") font: UM.Theme.getFont("action_button")
text: control.text; text: control.text;

8
resources/themes/cura-light/theme.json
View file

@ -143,6 +143,14 @@
"action_button_disabled_text": [127, 127, 127, 255], "action_button_disabled_text": [127, 127, 127, 255],
"action_button_disabled_border": [245, 245, 245, 255], "action_button_disabled_border": [245, 245, 245, 255],
"print_button_ready": [12, 169, 227, 255],
"print_button_ready_border": [12, 169, 227, 255],
"print_button_ready_text": [255, 255, 255, 255],
"print_button_ready_hovered": [12, 169, 255, 255],
"print_button_ready_hovered_border": [12, 169, 227, 255],
"print_button_ready_pressed": [12, 169, 220, 255],
"print_button_ready_pressed_border": [12, 169, 227, 255],
"scrollbar_background": [255, 255, 255, 255], "scrollbar_background": [255, 255, 255, 255],
"scrollbar_handle": [24, 41, 77, 255], "scrollbar_handle": [24, 41, 77, 255],
"scrollbar_handle_hover": [12, 159, 227, 255], "scrollbar_handle_hover": [12, 159, 227, 255],