From cab0349a9c8f2bdc64a924c6c7a3631749b37d04 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 24 Jan 2019 18:30:52 +0100 Subject: [PATCH 1/6] Change the alignent option to use the new style CURA-6115 --- plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py b/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py index fd56c101a0..58c00850cb 100644 --- a/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py +++ b/plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerMessage.py @@ -28,7 +28,7 @@ class FirmwareUpdateCheckerMessage(Message): "[no_icon]", "[no_description]", button_style = Message.ActionButtonStyle.LINK, - button_align = Message.ActionButtonStyle.BUTTON_ALIGN_LEFT) + button_align = Message.ActionButtonAlignment.ALIGN_LEFT) def getMachineId(self) -> int: return self._machine_id From 8f8b13f7c40a96480228f56ad263f121fdd2ef56 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Jan 2019 11:07:37 +0100 Subject: [PATCH 2/6] Let Cura define how the message actions look like CURA-6115 --- resources/qml/Cura.qml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index f3d2e7295a..8de982115b 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -373,6 +373,22 @@ UM.MainWindow bottom: parent.bottom bottomMargin: UM.Theme.getSize("default_margin").height } + + primaryButton: Component + { + Cura.PrimaryButton + { + text: model.name + } + } + + secondaryButton: Component + { + Cura.SecondaryButton + { + text: model.name + } + } } } From 228614a590896f46bd12434fa97dcca1d066ffc9 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Jan 2019 11:20:50 +0100 Subject: [PATCH 3/6] Remove unused values from theme.json CURA-6115 --- resources/themes/cura-light/theme.json | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index b12385c962..1dbb2a7846 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -320,17 +320,9 @@ "tooltip_text": [255, 255, 255, 255], "message_background": [255, 255, 255, 255], - "message_shadow": [0, 0, 0, 120], "message_border": [192, 193, 194, 255], - "message_text": [0, 0, 0, 255], "message_close": [102, 102, 102, 255], "message_close_hover": [8, 7, 63, 255], - "message_button": [38, 113, 231, 255], - "message_button_hover": [81, 145, 247, 255], - "message_button_active": [38, 113, 231, 255], - "message_button_text": [255, 255, 255, 255], - "message_button_text_hover": [255, 255, 255, 255], - "message_button_text_active": [255, 255, 255, 255], "message_progressbar_background": [245, 245, 245, 255], "message_progressbar_control": [50, 130, 255, 255], @@ -568,12 +560,8 @@ "message": [30.0, 5.0], "message_close": [1, 1], - "message_button": [6.0, 1.8], - "message_shadow": [0, 0], - "message_margin": [0, 1.0], "message_inner_margin": [1.5, 1.5], "message_radius": [0.25, 0.25], - "message_button_radius": [0.15, 0.15], "infill_button_margin": [0.5, 0.5], From 13b2b339006e54a4f3eef8c6bfae34986abab262 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 25 Jan 2019 13:02:39 +0100 Subject: [PATCH 4/6] Remove unused theme option --- resources/themes/cura-light/theme.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 1dbb2a7846..9c0ff933fc 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -560,7 +560,6 @@ "message": [30.0, 5.0], "message_close": [1, 1], - "message_inner_margin": [1.5, 1.5], "message_radius": [0.25, 0.25], "infill_button_margin": [0.5, 0.5], From 4151050127bed1a34da4a010aae2bd7f0e3cfbf7 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 29 Jan 2019 12:57:05 +0100 Subject: [PATCH 5/6] Setting the height of an action button now actually changes it's size CURA-6115 --- resources/qml/ActionButton.qml | 7 +++++-- resources/themes/cura-light/theme.json | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/resources/qml/ActionButton.qml b/resources/qml/ActionButton.qml index 6406e83efe..e4e2aedb8a 100644 --- a/resources/qml/ActionButton.qml +++ b/resources/qml/ActionButton.qml @@ -48,12 +48,13 @@ Button contentItem: Row { spacing: UM.Theme.getSize("narrow_margin").width + height: button.height //Left side icon. Only displayed if !isIconOnRightSide. UM.RecolorImage { id: buttonIconLeft source: "" - height: UM.Theme.getSize("action_button_icon").height + height: visible ? UM.Theme.getSize("action_button_icon").height : 0 width: visible ? height : 0 sourceSize.width: width sourceSize.height: height @@ -70,9 +71,11 @@ Button font: UM.Theme.getFont("medium") visible: text != "" renderType: Text.NativeRendering + height: parent.height anchors.verticalCenter: parent.verticalCenter width: fixedWidthMode ? button.width - button.leftPadding - button.rightPadding : undefined horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter elide: Text.ElideRight } @@ -81,7 +84,7 @@ Button { id: buttonIconRight source: buttonIconLeft.source - height: UM.Theme.getSize("action_button_icon").height + height: visible ? UM.Theme.getSize("action_button_icon").height : 0 width: visible ? height : 0 sourceSize.width: width sourceSize.height: height diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 9c0ff933fc..c4491d1c08 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -504,7 +504,7 @@ "button_icon": [2.5, 2.5], "button_lining": [0, 0], - "action_button": [15.0, 3.0], + "action_button": [15.0, 2.0], "action_button_icon": [1.0, 1.0], "action_button_radius": [0.15, 0.15], From 805b4dbe4cfa76aa79f697f9d39de5db22dce1f0 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 29 Jan 2019 13:28:32 +0100 Subject: [PATCH 6/6] Fixed height for action message buttons CURA-6115 --- resources/qml/Cura.qml | 2 ++ resources/themes/cura-light/theme.json | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 8de982115b..98356181cb 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -379,6 +379,7 @@ UM.MainWindow Cura.PrimaryButton { text: model.name + height: UM.Theme.getSize("message_action_button").height } } @@ -387,6 +388,7 @@ UM.MainWindow Cura.SecondaryButton { text: model.name + height: UM.Theme.getSize("message_action_button").height } } } diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index c4491d1c08..beabe3b4f7 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -504,7 +504,7 @@ "button_icon": [2.5, 2.5], "button_lining": [0, 0], - "action_button": [15.0, 2.0], + "action_button": [15.0, 2.5], "action_button_icon": [1.0, 1.0], "action_button_radius": [0.15, 0.15], @@ -561,6 +561,7 @@ "message": [30.0, 5.0], "message_close": [1, 1], "message_radius": [0.25, 0.25], + "message_action_button": [0, 2.0], "infill_button_margin": [0.5, 0.5],