3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-10-10 15:27:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 19

15.10 restyling of the sidebar header

Browse source 
Contributes to: issue CURA-60
This commit is contained in:
Tamara Hogenhout 2015-09-01 17:26:35 +02:00
parent 3df4d69c37
commit 3088579aad
3 changed files with 53 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

56
resources/themes/cura/styles.qml
View file

@ -10,28 +10,46 @@ import UM 1.0 as UM
QtObject {
property Component sidebar_header_button: Component {
ButtonStyle {
background: Item {
background: Rectangle {
color: UM.Theme.colors.setting_control
border.width: 1
border.color: UM.Theme.colors.setting_control_border
UM.RecolorImage {
id: downArrow
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right
anchors.rightMargin: UM.Theme.sizes.default_margin.width
width: UM.Theme.sizes.standard_arrow.width
height: UM.Theme.sizes.standard_arrow.height
sourceSize.width: width
sourceSize.height: width
color: UM.Theme.colors.setting_category_text
source: UM.Theme.icons.arrow_bottom
}
Label {
anchors.right: parent.right;
anchors.top: parent.top;
text: "▼";
property bool down: control.pressed || (control.checkable && control.checked);
color: down ? UM.Theme.colors.text_pressed : control.hovered ? UM.Theme.colors.text_hover : UM.Theme.colors.text;
id: sidebarComboBoxLabel
//property bool down: control.pressed || (control.checkable && control.checked);
color: UM.Theme.colors.setting_control_text
text: control.text;
elide: Text.ElideRight;
anchors.left: parent.left;
anchors.leftMargin: UM.Theme.sizes.setting_unit_margin.width
anchors.right: downArrow.left;
anchors.rightMargin: UM.Theme.sizes.setting_unit_margin.width
anchors.verticalCenter: parent.verticalCenter;
font: UM.Theme.fonts.default
}
Rectangle{
width: 1
height: UM.Theme.sizes.setting_control.height
color: UM.Theme.colors.setting_control_border
anchors.right: sidebarComboBoxLabel.right
anchors.rightMargin: UM.Theme.sizes.setting_unit_margin.width
anchors.top: parent.top
z: parent.z + 1
}
}
label: Label {
property bool down: control.pressed || (control.checkable && control.checked);
font: UM.Theme.fonts.sidebar_header;
color: down ? UM.Theme.colors.text_pressed : control.hovered ? UM.Theme.colors.text_hover : UM.Theme.colors.text;
text: control.text;
elide: Text.ElideRight;
}
label: Label{}
}
}

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

@ -74,6 +74,11 @@
"button_disabled": [245, 245, 245, 255],
"button_tooltip_text": [35, 35, 35, 255],
"toggle_active": [255, 255, 255, 255],
"toggle_active_text": [77, 184, 226, 255],
"toggle_disabled": [77, 184, 226, 255],
"toggle_disabled_text": [255, 255, 255, 255],
"load_save_button": [0, 0, 0, 255],
"load_save_button_text": [255, 255, 255, 255],
"load_save_button_hover": [43, 45, 46, 255],