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

Style MessageStack making messages less likely to be overlooked

Browse Source 
CURA-1886
This commit is contained in:
fieldOfView 2016-09-08 08:48:58 +02:00
parent 895cf40ab0
commit 29edcb9058
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
resources/themes/cura/styles.qml
View File

@ -199,18 +199,32 @@ QtObject {
property Component progressbar: Component{ property Component progressbar: Component{
ProgressBarStyle { ProgressBarStyle {
background:Rectangle { background: Rectangle {
implicitWidth: Theme.getSize("message").width - (Theme.getSize("default_margin").width * 2) implicitWidth: Theme.getSize("message").width - (Theme.getSize("default_margin").width * 2)
implicitHeight: Theme.getSize("progressbar").height implicitHeight: Theme.getSize("progressbar").height
radius: Theme.getSize("progressbar_radius").width radius: Theme.getSize("progressbar_radius").width
color: Theme.getColor("progressbar_background") color: control.hasOwnProperty("backgroundColor") ? control.backgroundColor : Theme.getColor("progressbar_background")
} }
progress: Rectangle { progress: Rectangle {
color: control.indeterminate ? "transparent" : Theme.getColor("progressbar_control") color:
{
if(control.indeterminate)
{
return "transparent";
}
else if(control.hasOwnProperty("controlColor"))
{
return control.controlColor;
}
else
{
return Theme.getColor("progressbar_control");
}
}
radius: Theme.getSize("progressbar_radius").width radius: Theme.getSize("progressbar_radius").width
Rectangle{ Rectangle{
radius: Theme.getSize("progressbar_radius").width radius: Theme.getSize("progressbar_radius").width
color: Theme.getColor("progressbar_control") color: control.hasOwnProperty("controlColor") ? control.controlColor : Theme.getColor("progressbar_control")
width: Theme.getSize("progressbar_control").width width: Theme.getSize("progressbar_control").width
height: Theme.getSize("progressbar_control").height height: Theme.getSize("progressbar_control").height
visible: control.indeterminate visible: control.indeterminate

14
resources/themes/cura/theme.json
View File

@ -159,9 +159,17 @@
"tooltip": [12, 169, 227, 255], "tooltip": [12, 169, 227, 255],
"tooltip_text": [255, 255, 255, 255], "tooltip_text": [255, 255, 255, 255],
"message_background": [255, 255, 255, 255], "message_background": [24, 41, 77, 255],
"message_text": [32, 166, 219, 255], "message_text": [255, 255, 255, 255],
"message_dismiss": [127, 127, 127, 255], "message_border": [24, 41, 77, 255],
"message_button": [255, 255, 255, 255],
"message_button_hover": [12, 169, 227, 255],
"message_button_active": [32, 166, 219, 255],
"message_button_text": [24, 41, 77, 255],
"message_button_text_hover": [255, 255, 255, 255],
"message_button_text_active": [255, 255, 255, 255],
"message_progressbar_background": [255, 255, 255, 255],
"message_progressbar_control": [12, 169, 227, 255],
"tool_panel_background": [255, 255, 255, 255], "tool_panel_background": [255, 255, 255, 255],