From 02aee8baf04e4a18322015077feebbb1be97494a Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 19 Aug 2015 17:00:06 +0200 Subject: [PATCH 1/4] Update README.md Added link to post processing plugin --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 2fb2d6f682..0313f267f2 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ Please checkout [cura-build](https://github.com/Ultimaker/cura-build) Third party plugins ------------- [Print time calculator](https://github.com/nallath/PrintCostCalculator) +[Post processing plugin](https://github.com/nallath/PostProcessingPlugin) Making profiles for other printers ---------------------------------- From a0e37d58e9b1a5b54c26fa25f58712440ced21f7 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 19 Aug 2015 17:01:16 +0200 Subject: [PATCH 2/4] Update README.md Third party plugins are now in a list. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0313f267f2..f118fa66d5 100644 --- a/README.md +++ b/README.md @@ -39,8 +39,8 @@ Please checkout [cura-build](https://github.com/Ultimaker/cura-build) Third party plugins ------------- -[Print time calculator](https://github.com/nallath/PrintCostCalculator) -[Post processing plugin](https://github.com/nallath/PostProcessingPlugin) +* [Print time calculator](https://github.com/nallath/PrintCostCalculator) +* [Post processing plugin](https://github.com/nallath/PostProcessingPlugin) Making profiles for other printers ---------------------------------- From b7e9accf7522c0adcc7ed2d3bb25dca1b03124ee Mon Sep 17 00:00:00 2001 From: Tamara Hogenhout Date: Wed, 19 Aug 2015 17:05:59 +0200 Subject: [PATCH 3/4] 15.10 Restyling toolbar, viewmode button Contributes to: issue CURA-60 --- resources/qml/Toolbar.qml | 4 +- resources/themes/cura/styles.qml | 91 +++++++++++++++++++++++++++++--- resources/themes/cura/theme.json | 20 +++---- 3 files changed, 97 insertions(+), 18 deletions(-) diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml index 5d4400bfda..e14dfdc99d 100644 --- a/resources/qml/Toolbar.qml +++ b/resources/qml/Toolbar.qml @@ -19,7 +19,7 @@ Item { anchors.bottom: parent.bottom; anchors.left: parent.left; - spacing: 1 + spacing: UM.Theme.sizes.default_lining.width Repeater { id: repeat @@ -67,6 +67,8 @@ Item { Behavior on opacity { NumberAnimation { duration: 100 } } color: UM.Theme.colors.tool_panel_background; + border.width: UM.Theme.sizes.default_lining.width + border.color: UM.Theme.colors.button_lining Loader { id: panel diff --git a/resources/themes/cura/styles.qml b/resources/themes/cura/styles.qml index 4f2ab10422..31258b9538 100644 --- a/resources/themes/cura/styles.qml +++ b/resources/themes/cura/styles.qml @@ -45,9 +45,9 @@ QtObject { height: parent.height color: { if(control.hovered) { - return UM.Theme.colors.open_file_button_hover + return UM.Theme.colors.load_save_button_hover } else { - return UM.Theme.colors.open_file_button + return UM.Theme.colors.load_save_button } } Behavior on color { ColorAnimation { duration: 50; } } @@ -55,7 +55,7 @@ QtObject { Label { anchors.centerIn: parent text: control.text - color: UM.Theme.colors.open_file_button_text + color: UM.Theme.colors.load_save_button_text font: UM.Theme.fonts.default } } @@ -68,7 +68,6 @@ QtObject { property Component tool_button: Component { ButtonStyle { background: Item { - ///////////TODO CHANGE SIZES!! implicitWidth: UM.Theme.sizes.button.width; implicitHeight: UM.Theme.sizes.button.height; @@ -77,7 +76,6 @@ QtObject { anchors.top: parent.verticalCenter; width: parent.width; - ///////////TODO CHANGE LABELHEIGHT!! height: control.hovered ? parent.height / 2 + label.height : 0; Behavior on height { NumberAnimation { duration: 100; } } @@ -87,7 +85,7 @@ QtObject { Label { id: label anchors.bottom: parent.bottom - text: control.text.replace("&", ""); + text: control.text font: UM.Theme.fonts.button_tooltip; color: UM.Theme.colors.button_tooltip_text; } @@ -116,13 +114,90 @@ QtObject { Behavior on color { ColorAnimation { duration: 50; } } Label { + id: tool_button_arrow anchors.right: parent.right; - anchors.rightMargin: UM.Theme.sizes.default_margin.width / 2; + anchors.rightMargin: (UM.Theme.sizes.button.width - UM.Theme.sizes.button_icon.width - tool_button_arrow.width) / 2 anchors.verticalCenter: parent.verticalCenter; text: "▼"; font: UM.Theme.fonts.small; visible: control.menu != null; - color: "white"; + color: UM.Theme.colors.button_text + } + } + } + + label: Item { + Image { + anchors.centerIn: parent; + + source: control.iconSource; + width: UM.Theme.sizes.button_icon.width; + height: UM.Theme.sizes.button_icon.height; + + sourceSize: UM.Theme.sizes.button_icon; + } + } + } + } + property Component tool_button_panel: Component { + ButtonStyle { + background: Item { + implicitWidth: UM.Theme.sizes.button.width; + implicitHeight: UM.Theme.sizes.button.height; + + Rectangle { + id: tool_button_background + anchors.top: parent.verticalCenter; + + width: parent.width; + 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: 100; } } + + Label { + id: label + anchors.bottom: parent.bottom + text: control.text + width: UM.Theme.sizes.button.width; + wrapMode: Text.WordWrap + font: UM.Theme.fonts.button_tooltip; + color: UM.Theme.colors.button_tooltip_text; + } + } + + Rectangle { + 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; } } + + Label { + id: tool_button_arrow + anchors.right: parent.right; + anchors.rightMargin: (UM.Theme.sizes.button.width - UM.Theme.sizes.button_icon.width - tool_button_arrow.width) / 2 + anchors.verticalCenter: parent.verticalCenter; + text: "▼"; + font: UM.Theme.fonts.small; + visible: control.menu != null; + color: UM.Theme.colors.button_text } } } diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json index 1d0c1d29b7..e85857d77a 100644 --- a/resources/themes/cura/theme.json +++ b/resources/themes/cura/theme.json @@ -66,18 +66,19 @@ "text_hover": [35, 35, 35, 255], "text_pressed": [12, 169, 227, 255], - "button": [160, 163, 171, 255], - "button_hover": [140, 144, 154, 255], + "button": [139, 143, 153, 255], + "button_hover": [116, 120, 127, 255], "button_active": [12, 169, 227, 255], - "button_active_hover": [34, 150, 199, 255], - "button_lining": [140, 144, 154, 255], + "button_active_hover": [77, 184, 226, 255], + "button_lining": [208, 210, 211, 255], "button_text": [255, 255, 255, 255], "button_disabled": [245, 245, 245, 255], "button_tooltip_text": [35, 35, 35, 255], - "open_file_button": [0, 0, 0, 255], - "open_file_button_text": [255, 255, 255, 255], - "open_file_button_hover": [43, 45, 46, 255], + "load_save_button": [0, 0, 0, 255], + "load_save_button_text": [255, 255, 255, 255], + "load_save_button_hover": [43, 45, 46, 255], + "load_save_button_active": [43, 45, 46, 255], "scrollbar_background": [245, 245, 245, 255], "scrollbar_handle": [205, 202, 201, 255], @@ -139,6 +140,7 @@ "sizes": { "window_margin": [2.0, 2.0], "default_margin": [1.0, 1.0], + "default_lining": [0.1, 0.1], "panel": [22.0, 10.0], "logo": [9.5, 2.0], "toolbar_button": [2.0, 2.0], @@ -160,8 +162,8 @@ "standard_list_lineheight": [1.5, 1.5], "standard_list_input": [20.0, 25.0], - "button": [4.25, 4.25], - "button_icon": [2.9, 2.9], + "button": [3.2, 3.2], + "button_icon": [2.5, 2.5], "progressbar": [26.0, 0.5], "progressbar_control": [8.0, 0.5], From 0ea042a140b4a3415742c2e43b2a9177acdf1b3d Mon Sep 17 00:00:00 2001 From: Tamara Hogenhout Date: Wed, 19 Aug 2015 17:11:23 +0200 Subject: [PATCH 4/4] Cleanup --- resources/themes/cura/styles.qml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/resources/themes/cura/styles.qml b/resources/themes/cura/styles.qml index 31258b9538..de41c44d04 100644 --- a/resources/themes/cura/styles.qml +++ b/resources/themes/cura/styles.qml @@ -188,17 +188,6 @@ QtObject { } } Behavior on color { ColorAnimation { duration: 50; } } - - Label { - id: tool_button_arrow - anchors.right: parent.right; - anchors.rightMargin: (UM.Theme.sizes.button.width - UM.Theme.sizes.button_icon.width - tool_button_arrow.width) / 2 - anchors.verticalCenter: parent.verticalCenter; - text: "▼"; - font: UM.Theme.fonts.small; - visible: control.menu != null; - color: UM.Theme.colors.button_text - } } }