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

Merge branch '15.06'

Browse Source
This commit is contained in:
Arjen Hiemstra 2015-06-12 12:19:29 +02:00
commit eb7714ce19
3 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/settings/ultimaker_original_plus.json
View File

@ -1,6 +1,6 @@
{ {
"id": "ultimaker_original_plus", "id": "ultimaker_original_plus",
"name": "Ultimaker Original Plus", "name": "Ultimaker Original+",
"icon": "icon_ultimaker.png", "icon": "icon_ultimaker.png",
"platform": "ultimaker2_platform.obj", "platform": "ultimaker2_platform.obj",
"platform_texture": "UltimakerPlusbackplate.png", "platform_texture": "UltimakerPlusbackplate.png",

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

@ -86,45 +86,52 @@ QtObject {
property Component tool_button: Component { property Component tool_button: Component {
ButtonStyle { ButtonStyle {
background: UM.AngledCornerRectangle { background: Item {
property bool down: control.pressed || (control.checkable && control.checked);
implicitWidth: UM.Theme.sizes.button.width; implicitWidth: UM.Theme.sizes.button.width;
implicitHeight: UM.Theme.sizes.button.height; implicitHeight: UM.Theme.sizes.button.height;
color: {
if(!control.enabled) {
return UM.Theme.colors.button_disabled;
} else if(control.checkable && control.checked && control.hovered) {
return UM.Theme.colors.button_active_hover;
} else if(control.pressed || (control.checkable && control.checked)) {
return UM.Theme.colors.button_active;
} else if(control.hovered) {
return UM.Theme.colors.button_hover;
} else {
return UM.Theme.colors.button;
}
}
Behavior on color { ColorAnimation { duration: 50; } }
cornerSize: UM.Theme.sizes.default_margin.width;
Rectangle { Rectangle {
anchors.bottom: parent.top; anchors.bottom: parent.verticalCenter;
width: parent.width; width: parent.width;
height: control.hovered ? label.height : 0; height: control.hovered ? parent.height / 2 + label.height : 0;
Behavior on height { NumberAnimation { duration: 75; } } Behavior on height { NumberAnimation { duration: 100; } }
opacity: control.hovered ? 1.0 : 0.0; opacity: control.hovered ? 1.0 : 0.0;
Behavior on opacity { NumberAnimation { duration: 75; } } Behavior on opacity { NumberAnimation { duration: 100; } }
Label { Label {
id: label id: label
anchors.horizontalCenter: parent.horizontalCenter; anchors.horizontalCenter: parent.horizontalCenter;
text: control.text; text: control.text.replace("&", "");
font: UM.Theme.fonts.button_tooltip; font: UM.Theme.fonts.button_tooltip;
color: UM.Theme.colors.button_tooltip_text; color: UM.Theme.colors.button_tooltip_text;
} }
} }
UM.AngledCornerRectangle {
id: buttonFace;
anchors.fill: parent;
property bool down: control.pressed || (control.checkable && control.checked);
color: {
if(!control.enabled) {
return UM.Theme.colors.button_disabled;
} else if(control.checkable && control.checked && control.hovered) {
return UM.Theme.colors.button_active_hover;
} else if(control.pressed || (control.checkable && control.checked)) {
return UM.Theme.colors.button_active;
} else if(control.hovered) {
return UM.Theme.colors.button_hover;
} else {
return UM.Theme.colors.button;
}
}
Behavior on color { ColorAnimation { duration: 50; } }
cornerSize: UM.Theme.sizes.default_margin.width;
}
} }
label: Item { label: Item {

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

@ -52,15 +52,15 @@
"border": [205, 202, 201, 255], "border": [205, 202, 201, 255],
"secondary": [205, 202, 201, 255], "secondary": [205, 202, 201, 255],
"text": [174, 174, 174, 255], "text": [140, 144, 154, 255],
"text_inactive": [205, 202, 201, 255], "text_inactive": [174, 174, 174, 255],
"text_hover": [35, 35, 35, 255], "text_hover": [35, 35, 35, 255],
"text_pressed": [12, 169, 227, 255], "text_pressed": [12, 169, 227, 255],
"button": [205, 202, 201, 255], "button": [160, 163, 171, 255],
"button_hover": [174, 174, 174, 255], "button_hover": [140, 144, 154, 255],
"button_active": [12, 169, 227, 255], "button_active": [12, 169, 227, 255],
"button_active_hover": [34, 150, 190, 255], "button_active_hover": [34, 150, 199, 255],
"button_text": [255, 255, 255, 255], "button_text": [255, 255, 255, 255],
"button_disabled": [245, 245, 245, 255], "button_disabled": [245, 245, 245, 255],
"button_tooltip_text": [35, 35, 35, 255], "button_tooltip_text": [35, 35, 35, 255],
@ -77,7 +77,7 @@
"setting_category_active_hover": [34, 150, 190, 255], "setting_category_active_hover": [34, 150, 190, 255],
"setting_category_text": [255, 255, 255, 255], "setting_category_text": [255, 255, 255, 255],
"setting_label": [174, 174, 174, 255], "setting_label": [140, 144, 154, 255],
"setting_control": [255, 255, 255, 255], "setting_control": [255, 255, 255, 255],
"setting_control_highlight": [245, 245, 245, 255], "setting_control_highlight": [245, 245, 245, 255],
"setting_control_border": [174, 174, 174, 255], "setting_control_border": [174, 174, 174, 255],
@ -98,7 +98,7 @@
"checkbox_hover": [245, 245, 245, 255], "checkbox_hover": [245, 245, 245, 255],
"checkbox_border": [174, 174, 174, 255], "checkbox_border": [174, 174, 174, 255],
"checkbox_mark": [35, 35, 35, 255], "checkbox_mark": [35, 35, 35, 255],
"checkbox_text": [174, 174, 174, 255], "checkbox_text": [140, 144, 154, 255],
"tooltip": [255, 225, 146, 255], "tooltip": [255, 225, 146, 255],