From 12c296241436acf72fd171f00e914be74ffd3ba7 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 13 Nov 2018 16:59:02 +0100 Subject: [PATCH] Update the look & feel of openButton to the new design CURA-5785 --- plugins/PrepareStage/PrepareMenu.qml | 30 +++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/plugins/PrepareStage/PrepareMenu.qml b/plugins/PrepareStage/PrepareMenu.qml index c7164eb490..3c7235a26f 100644 --- a/plugins/PrepareStage/PrepareMenu.qml +++ b/plugins/PrepareStage/PrepareMenu.qml @@ -23,19 +23,30 @@ Item Item { anchors.horizontalCenter: parent.horizontalCenter - width: openFileButton.width + itemRowBackground.width + width: openFileButtonBackground.width + itemRowBackground.width height: parent.height - Button + Rectangle { - id: openFileButton - text: catalog.i18nc("@action:button", "Open File") - iconSource: UM.Theme.getIcon("load") - style: UM.Theme.styles.tool_button - tooltip: "" - action: Cura.Actions.open + id: openFileButtonBackground + height: UM.Theme.getSize("stage_menu").height + width: UM.Theme.getSize("stage_menu").height + + radius: UM.Theme.getSize("default_radius").width + color: UM.Theme.getColor("toolbar_background") + Button + { + id: openFileButton + text: catalog.i18nc("@action:button", "Open File") + iconSource: UM.Theme.getIcon("load") + style: UM.Theme.styles.toolbar_button + tooltip: "" + action: Cura.Actions.open + anchors.centerIn: parent + } } + Rectangle { id: itemRowBackground @@ -46,7 +57,7 @@ Item width: itemRow.width + UM.Theme.getSize("default_margin").width height: parent.height - anchors.left: openFileButton.right + anchors.left: openFileButtonBackground.right anchors.leftMargin: UM.Theme.getSize("default_margin").width RowLayout @@ -57,6 +68,7 @@ Item width: 0.9 * prepareMenu.width height: parent.height + spacing: 0 Cura.MachineSelector {