GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 03:35:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Solve populating Support Extruder Combobox at first time start, adjusted spacings. CURA-2767

Browse Source
This commit is contained in:
Jack Ha 2016-11-15 17:09:19 +01:00
parent d34c79249b
commit 3acddddc7c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
resources/qml/SidebarSimple.qml
View File

@ -214,7 +214,7 @@ Item
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.verticalCenter: enableSupportCheckBox.verticalCenter 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"); text: catalog.i18nc("@label", "Enable Support");
font: UM.Theme.getFont("default"); font: UM.Theme.getFont("default");
color: UM.Theme.getColor("text"); color: UM.Theme.getColor("text");
@ -259,7 +259,7 @@ Item
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.verticalCenter: supportExtruderCombobox.verticalCenter 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"); text: catalog.i18nc("@label", "Support Extruder");
font: UM.Theme.getFont("default"); font: UM.Theme.getFont("default");
color: UM.Theme.getColor("text"); color: UM.Theme.getColor("text");
@ -269,6 +269,7 @@ Item
id: supportExtruderCombobox id: supportExtruderCombobox
visible: (supportEnabled.properties.value == "True") && (machineExtruderCount.properties.value > 1) visible: (supportEnabled.properties.value == "True") && (machineExtruderCount.properties.value > 1)
model: extruderModel model: extruderModel
textRole: 'text' // this solves that the combobox isn't populated in the first time Cura is started
anchors.top: enableSupportCheckBox.bottom anchors.top: enableSupportCheckBox.bottom
anchors.topMargin: { anchors.topMargin: {
@ -280,7 +281,7 @@ Item
} }
anchors.left: supportExtruderLabel.right anchors.left: supportExtruderLabel.right
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
width: parent.width / 100 * 65 width: parent.width / 100 * 55
height: { height: {
if ((supportEnabled.properties.value == "True") && (machineExtruderCount.properties.value > 1)) { if ((supportEnabled.properties.value == "True") && (machineExtruderCount.properties.value > 1)) {
// default height when control is enabled // default height when control is enabled
@ -317,13 +318,12 @@ Item
} }
} }
Label{ Label{
id: adhesionHelperLabel id: adhesionHelperLabel
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.verticalCenter: adhesionCheckBox.verticalCenter 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"); text: catalog.i18nc("@label", "Build Plate Adhesion");
font: UM.Theme.getFont("default"); font: UM.Theme.getFont("default");
color: UM.Theme.getColor("text"); color: UM.Theme.getColor("text");