3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 14:55:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Change the TopHeader name to MainWindowHeader, since there is nothing

Browse source 
more on the top than the header.

Contributes to CURA-5784.
This commit is contained in:
Diego Prado Gesto 2018-10-19 16:40:21 +02:00
parent 6f12197cea
commit 15b35da612
9 changed files with 43 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

9
resources/themes/cura-dark/theme.json
View file

@ -15,11 +15,10 @@
"border": [127, 127, 127, 255],
"secondary": [241, 242, 242, 255],
"topheader_background": [31, 36, 39, 255],
"topheader_button_text_active": [31, 36, 39, 255],
"topheader_button_text_inactive": [128, 128, 128, 255],
"topheader_button_text_hovered": [255, 255, 255, 255],
"main_window_header_background": [31, 36, 39, 255],
"main_window_header_button_text_active": [31, 36, 39, 255],
"main_window_header_button_text_inactive": [128, 128, 128, 255],
"main_window_header_button_text_hovered": [255, 255, 255, 255],
"text": [255, 255, 255, 204],
"text_detail": [255, 255, 255, 172],

14
resources/themes/cura-light/styles.qml
View file

@ -96,7 +96,7 @@ QtObject
}
}
property Component topheader_tab: Component
property Component main_window_header_tab: Component
{
ButtonStyle
{
@ -114,7 +114,7 @@ QtObject
anchors.verticalCenter: parent.verticalCenter
implicitHeight: parent.height - 2 * UM.Theme.getSize("default_margin").width
implicitWidth: UM.Theme.getSize("default_lining").width
color: UM.Theme.getColor("topheader_button_background_active")
color: UM.Theme.getColor("main_window_header_button_background_active")
visible: !control.checked
}
Rectangle
@ -122,7 +122,7 @@ QtObject
id: buttonFace
implicitHeight: parent.height
implicitWidth: parent.width
color: control.checked ? UM.Theme.getColor("topheader_button_background_active") : UM.Theme.getColor("topheader_button_background_inactive")
color: control.checked ? UM.Theme.getColor("main_window_header_button_background_active") : UM.Theme.getColor("main_window_header_button_background_inactive")
Behavior on color { ColorAnimation { duration: 50 } }
}
@ -132,7 +132,7 @@ QtObject
anchors.verticalCenter: parent.verticalCenter
implicitHeight: parent.height - 2 * UM.Theme.getSize("default_margin").width
implicitWidth: UM.Theme.getSize("default_lining").width
color: UM.Theme.getColor("topheader_button_background_active")
color: UM.Theme.getColor("main_window_header_button_background_active")
visible: !control.checked
}
}
@ -156,15 +156,15 @@ QtObject
{
if (control.checked)
{
return UM.Theme.getColor("topheader_button_text_active");
return UM.Theme.getColor("main_window_header_button_text_active");
}
else
{
if (control.hovered)
{
return UM.Theme.getColor("topheader_button_text_hovered");
return UM.Theme.getColor("main_window_header_button_text_hovered");
}
return UM.Theme.getColor("topheader_button_text_inactive");
return UM.Theme.getColor("main_window_header_button_text_inactive");
}
}
}

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

@ -79,13 +79,12 @@
"border": [127, 127, 127, 255],
"secondary": [245, 245, 245, 255],
"topheader_background": [12, 169, 227, 255],
"topheader_button_text_active": [12, 169, 227, 255],
"topheader_button_text_inactive": [255, 255, 255, 255],
"topheader_button_text_hovered": [0, 0, 0, 255],
"topheader_button_background_active": [255, 255, 255, 255],
"topheader_button_background_inactive": [255, 255, 255, 0],
"main_window_header_background": [12, 169, 227, 255],
"main_window_header_button_text_active": [12, 169, 227, 255],
"main_window_header_button_text_inactive": [255, 255, 255, 255],
"main_window_header_button_text_hovered": [0, 0, 0, 255],
"main_window_header_button_background_active": [255, 255, 255, 255],
"main_window_header_button_background_inactive": [255, 255, 255, 0],
"account_widget_outline_active": [9, 140, 188, 255],
"account_widget_outline_inactive": [229, 229, 229, 255],
@ -340,9 +339,9 @@
"sizes": {
"window_minimum_size": [70, 50],
"topheader": [0.0, 4.5],
"topheader_button": [8, 4],
"topheader_button_icon": [1.2, 1.2],
"main_window_header": [0.0, 4.5],
"main_window_header_button": [8, 4],
"main_window_header_button_icon": [1.2, 1.2],
"stage_menu": [0.0, 4.5],