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

Merge branch '15.06'

Browse source
This commit is contained in:
Arjen Hiemstra 2015-07-08 13:03:05 +02:00
commit 032e27c68c
30 changed files with 9355 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -139,6 +139,16 @@ QtObject {
}
Behavior on color { ColorAnimation { duration: 50; } }
cornerSize: UM.Theme.sizes.default_margin.width;
Label {
anchors.right: parent.right;
anchors.rightMargin: UM.Theme.sizes.default_margin.width / 2;
anchors.verticalCenter: parent.verticalCenter;
text: "▼";
font: UM.Theme.fonts.small;
visible: control.menu != null;
color: "white";
}
}
}
@ -213,23 +223,34 @@ QtObject {
Behavior on color { ColorAnimation { duration: 50; } }
cornerSize: UM.Theme.sizes.default_margin.width;
}
label: Row {
label: Item {
anchors.fill: parent;
anchors.margins: UM.Theme.sizes.default_margin.width;
spacing: UM.Theme.sizes.default_margin.width;
Image {
id: icon;
anchors.left: parent.left;
anchors.verticalCenter: parent.verticalCenter;
source: control.iconSource;
width: UM.Theme.sizes.section_icon.width;
height: UM.Theme.sizes.section_icon.height;
}
Label {
anchors.verticalCenter: parent.verticalCenter;
anchors {
left: icon.right;
leftMargin: UM.Theme.sizes.default_margin.width;
right: parent.right;
verticalCenter: parent.verticalCenter;
}
text: control.text;
font: UM.Theme.fonts.setting_category;
color: UM.Theme.colors.setting_category_text;
fontSizeMode: Text.HorizontalFit;
minimumPointSize: 8
}
}
}

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

@ -96,8 +96,8 @@
"progressbar_control": [12, 169, 227, 255],
"slider_groove": [245, 245, 245, 255],
"slider_groove_border": [205, 202, 201, 255],
"slider_groove_fill": [205, 202, 201, 255],
"slider_groove_border": [160, 163, 171, 255],
"slider_groove_fill": [160, 163, 171, 255],
"slider_handle": [12, 169, 227, 255],
"slider_handle_hover": [34, 150, 190, 255],
@ -141,6 +141,7 @@
"setting_control": [6.0, 2.0],
"setting_control_margin": [3.0, 3.0],
"setting_unit_margin": [0.5, 0.5],
"setting_text_maxwidth": [40.0, 0.0],
"button": [4.25, 4.25],
"button_icon": [2.9, 2.9],
@ -160,7 +161,7 @@
"tooltip_margins": [1.0, 1.0],
"save_button_border": [0.06, 0.06],
"save_button_text_margin": [0.6, 0.6],
"save_button_text_margin": [0.3, 0.6],
"save_button_slicing_bar": [0.0, 2.2],
"save_button_label_margin": [0.5, 0.5],
"save_button_save_to_button": [0.3, 2.7],