From 3acddddc7c6ef3c51c9943d5ea41449d4e0fc8ec Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Tue, 15 Nov 2016 17:09:19 +0100 Subject: [PATCH] Solve populating Support Extruder Combobox at first time start, adjusted spacings. CURA-2767 --- resources/qml/SidebarSimple.qml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml index c9a7e12d07..4b8b31c2c2 100644 --- a/resources/qml/SidebarSimple.qml +++ b/resources/qml/SidebarSimple.qml @@ -214,7 +214,7 @@ Item anchors.left: parent.left anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.verticalCenter: enableSupportCheckBox.verticalCenter - width: parent.width / 100 * 35 - 3 * UM.Theme.getSize("default_margin").width + width: parent.width / 100 * 45 - 3 * UM.Theme.getSize("default_margin").width text: catalog.i18nc("@label", "Enable Support"); font: UM.Theme.getFont("default"); color: UM.Theme.getColor("text"); @@ -259,7 +259,7 @@ Item anchors.left: parent.left anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.verticalCenter: supportExtruderCombobox.verticalCenter - width: parent.width / 100 * 35 - 3 * UM.Theme.getSize("default_margin").width + width: parent.width / 100 * 45 - 3 * UM.Theme.getSize("default_margin").width text: catalog.i18nc("@label", "Support Extruder"); font: UM.Theme.getFont("default"); color: UM.Theme.getColor("text"); @@ -269,6 +269,7 @@ Item id: supportExtruderCombobox visible: (supportEnabled.properties.value == "True") && (machineExtruderCount.properties.value > 1) model: extruderModel + textRole: 'text' // this solves that the combobox isn't populated in the first time Cura is started anchors.top: enableSupportCheckBox.bottom anchors.topMargin: { @@ -280,7 +281,7 @@ Item } anchors.left: supportExtruderLabel.right anchors.leftMargin: UM.Theme.getSize("default_margin").width - width: parent.width / 100 * 65 + width: parent.width / 100 * 55 height: { if ((supportEnabled.properties.value == "True") && (machineExtruderCount.properties.value > 1)) { // default height when control is enabled @@ -317,13 +318,12 @@ Item } } - Label{ id: adhesionHelperLabel anchors.left: parent.left anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.verticalCenter: adhesionCheckBox.verticalCenter - width: parent.width / 100 * 35 - 3 * UM.Theme.getSize("default_margin").width + width: parent.width / 100 * 45 - 3 * UM.Theme.getSize("default_margin").width text: catalog.i18nc("@label", "Build Plate Adhesion"); font: UM.Theme.getFont("default"); color: UM.Theme.getColor("text");