From 9d50b1fb26090237f5f38b30f7f028dd3c4c730b Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Wed, 10 Jun 2015 15:32:57 +0200 Subject: [PATCH 1/5] Correct name of UM Original+ --- resources/settings/ultimaker_original_plus.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/settings/ultimaker_original_plus.json b/resources/settings/ultimaker_original_plus.json index d0b04879db..9e5cf6370d 100644 --- a/resources/settings/ultimaker_original_plus.json +++ b/resources/settings/ultimaker_original_plus.json @@ -1,6 +1,6 @@ { "id": "ultimaker_original_plus", - "name": "Ultimaker Original Plus", + "name": "Ultimaker Original+", "icon": "icon_ultimaker.png", "platform": "ultimaker2_platform.obj", "platform_texture": "UltimakerPlusbackplate.png", From fa671225c829f7acc1efeac74d08535a4e7ccb06 Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Wed, 10 Jun 2015 15:36:15 +0200 Subject: [PATCH 2/5] Update tool button styling for improved clarity Fixes #35 --- resources/themes/cura/styles.qml | 53 ++++++++++++++++++-------------- resources/themes/cura/theme.json | 6 ++-- 2 files changed, 33 insertions(+), 26 deletions(-) diff --git a/resources/themes/cura/styles.qml b/resources/themes/cura/styles.qml index e6c08b381c..3ca9ea6ea2 100644 --- a/resources/themes/cura/styles.qml +++ b/resources/themes/cura/styles.qml @@ -86,45 +86,52 @@ QtObject { property Component tool_button: Component { ButtonStyle { - background: UM.AngledCornerRectangle { - property bool down: control.pressed || (control.checkable && control.checked); - + background: Item { implicitWidth: UM.Theme.sizes.button.width; 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 { - anchors.bottom: parent.top; + anchors.bottom: parent.verticalCenter; width: parent.width; - height: control.hovered ? label.height : 0; - Behavior on height { NumberAnimation { duration: 75; } } + height: control.hovered ? parent.height / 2 + label.height : 0; + Behavior on height { NumberAnimation { duration: 100; } } opacity: control.hovered ? 1.0 : 0.0; - Behavior on opacity { NumberAnimation { duration: 75; } } + Behavior on opacity { NumberAnimation { duration: 100; } } Label { id: label anchors.horizontalCenter: parent.horizontalCenter; - text: control.text; + text: control.text.replace("&", ""); font: UM.Theme.fonts.button_tooltip; 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 { diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json index eda2badd71..a99fcc7f55 100644 --- a/resources/themes/cura/theme.json +++ b/resources/themes/cura/theme.json @@ -57,10 +57,10 @@ "text_hover": [35, 35, 35, 255], "text_pressed": [12, 169, 227, 255], - "button": [205, 202, 201, 255], - "button_hover": [174, 174, 174, 255], + "button": [160, 163, 171, 255], + "button_hover": [140, 144, 154, 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_disabled": [245, 245, 245, 255], "button_tooltip_text": [35, 35, 35, 255], From 9f1b6fc496118d208b59c2b959623cf2af6fd08c Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Wed, 10 Jun 2015 15:41:21 +0200 Subject: [PATCH 3/5] Use a darker text color for improved clarity Contributes to Asana Readability issue --- resources/themes/cura/theme.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json index a99fcc7f55..caf6dc5358 100644 --- a/resources/themes/cura/theme.json +++ b/resources/themes/cura/theme.json @@ -52,8 +52,8 @@ "border": [205, 202, 201, 255], "secondary": [205, 202, 201, 255], - "text": [174, 174, 174, 255], - "text_inactive": [205, 202, 201, 255], + "text": [140, 144, 154, 255], + "text_inactive": [174, 174, 174, 255], "text_hover": [35, 35, 35, 255], "text_pressed": [12, 169, 227, 255], @@ -77,7 +77,7 @@ "setting_category_active_hover": [34, 150, 190, 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_highlight": [245, 245, 245, 255], "setting_control_border": [174, 174, 174, 255], @@ -98,7 +98,7 @@ "checkbox_hover": [245, 245, 245, 255], "checkbox_border": [174, 174, 174, 255], "checkbox_mark": [35, 35, 35, 255], - "checkbox_text": [174, 174, 174, 255], + "checkbox_text": [140, 144, 154, 255], "tooltip": [255, 225, 146, 255], From 0b9986d34b0c6257e8a5db86c3407c4dd94ae871 Mon Sep 17 00:00:00 2001 From: Tamara Hogenhout Date: Thu, 11 Jun 2015 13:42:49 +0200 Subject: [PATCH 4/5] Changes icon size (within the buttons) to improve clarity Contributes to #43 --- resources/themes/cura/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json index caf6dc5358..9e5911e4e0 100644 --- a/resources/themes/cura/theme.json +++ b/resources/themes/cura/theme.json @@ -133,7 +133,7 @@ "setting_unit_margin": [0.5, 0.5], "button": [4.25, 4.25], - "button_icon": [3.57, 3.57], + "button_icon": [2.9, 2.9], "scrollbar": [0.5, 0.5], From 4bd5aeda6a2acc2f74288c2321d3a0f87d264650 Mon Sep 17 00:00:00 2001 From: Tamara Hogenhout Date: Thu, 11 Jun 2015 14:41:52 +0200 Subject: [PATCH 5/5] Removes the default tooltips of the buttons to improve clarity Put the automatically added tooltips back to the default value (empty qSt) so the user doensn't sees two 'tooltips' Contributes to #43 --- resources/qml/Cura.qml | 4 ++-- resources/qml/Toolbar.qml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 8c5c43d83c..7067c88c12 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -193,7 +193,7 @@ UM.MainWindow { iconSource: UM.Theme.icons.open; style: UM.Backend.progress < 0 ? UM.Theme.styles.open_file_button : UM.Theme.styles.tool_button; - + tooltip: ''; anchors { top: parent.top; topMargin: UM.Theme.sizes.window_margin.height; @@ -232,7 +232,7 @@ UM.MainWindow { iconSource: UM.Theme.icons.viewmode; style: UM.Theme.styles.tool_button; - + tooltip: ''; menu: Menu { id: viewMenu; Instantiator { diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml index e7cb0788c5..d5126db481 100644 --- a/resources/qml/Toolbar.qml +++ b/resources/qml/Toolbar.qml @@ -47,7 +47,6 @@ Item { Button { text: model.name; iconSource: UM.Theme.icons[model.icon]; - tooltip: model.description; checkable: true; checked: model.active;