GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 20:16:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move visible to Rows for extruder configs

Browse Source 
CURA-5941

So the whole row, such as "material", will be shown/hiden based on
whether the machine has materials.
This commit is contained in:
Lipu Fei 2018-12-06 14:04:21 +01:00
parent 109586f69c
commit 85f2a7e8f6
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
View File

@ -140,6 +140,7 @@ Item
Row Row
{ {
height: UM.Theme.getSize("print_setup_item").height height: UM.Theme.getSize("print_setup_item").height
visible: extrudersModel.count > 1 // If there is only one extruder, there is no point to enable/disable that.
Label Label
{ {
@ -149,7 +150,6 @@ Item
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
height: parent.height height: parent.height
width: selectors.textWidth width: selectors.textWidth
visible: extrudersModel.count > 1
} }
OldControls.CheckBox OldControls.CheckBox
@ -158,7 +158,6 @@ Item
enabled: !checked || Cura.MachineManager.numberExtrudersEnabled > 1 //Disable if it's the last enabled extruder. enabled: !checked || Cura.MachineManager.numberExtrudersEnabled > 1 //Disable if it's the last enabled extruder.
height: UM.Theme.getSize("setting_control").height height: UM.Theme.getSize("setting_control").height
style: UM.Theme.styles.checkbox style: UM.Theme.styles.checkbox
visible: extrudersModel.count > 1
/* Use a MouseArea to process the click on this checkbox. /* Use a MouseArea to process the click on this checkbox.
This is necessary because actually clicking the checkbox This is necessary because actually clicking the checkbox
@ -177,6 +176,8 @@ Item
Row Row
{ {
height: UM.Theme.getSize("print_setup_item").height height: UM.Theme.getSize("print_setup_item").height
visible: Cura.MachineManager.hasMaterials
Label Label
{ {
text: catalog.i18nc("@label", "Material") text: catalog.i18nc("@label", "Material")
@ -185,7 +186,6 @@ Item
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
height: parent.height height: parent.height
width: selectors.textWidth width: selectors.textWidth
visible: materialSelection.visible
} }
OldControls.ToolButton OldControls.ToolButton
@ -197,7 +197,6 @@ Item
text: Cura.MachineManager.activeStack != null ? Cura.MachineManager.activeStack.material.name : "" text: Cura.MachineManager.activeStack != null ? Cura.MachineManager.activeStack.material.name : ""
tooltip: text tooltip: text
visible: Cura.MachineManager.hasMaterials
height: UM.Theme.getSize("setting_control").height height: UM.Theme.getSize("setting_control").height
width: selectors.controlWidth width: selectors.controlWidth
@ -214,6 +213,7 @@ Item
Row Row
{ {
height: UM.Theme.getSize("print_setup_item").height height: UM.Theme.getSize("print_setup_item").height
visible: Cura.MachineManager.hasVariants
Label Label
{ {
@ -223,15 +223,13 @@ Item
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
height: parent.height height: parent.height
width: selectors.textWidth width: selectors.textWidth
visible: variantSelection.visible
} }
OldControls.ToolButton OldControls.ToolButton
{ {
id: variantSelection id: variantSelection
text: Cura.MachineManager.activeVariantName text: Cura.MachineManager.activeVariantName
tooltip: Cura.MachineManager.activeVariantName; tooltip: Cura.MachineManager.activeVariantName
visible: Cura.MachineManager.hasVariants
height: UM.Theme.getSize("setting_control").height height: UM.Theme.getSize("setting_control").height
width: selectors.controlWidth width: selectors.controlWidth