3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Some minor cleanup of the QML

Browse source 
CURA-5916
This commit is contained in:
Jaime van Kessel 2019-02-07 14:13:00 +01:00
parent 575f323ea1
commit c15089cd59
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
View file

@ -185,7 +185,7 @@ Item
Row Row
{ {
height: UM.Theme.getSize("print_setup_item").height height: visible ? childrenRect.height : 0
visible: extrudersModel.count > 1 // If there is only one extruder, there is no point to enable/disable that. visible: extrudersModel.count > 1 // If there is only one extruder, there is no point to enable/disable that.
Label Label
@ -222,7 +222,7 @@ Item
Row Row
{ {
height: UM.Theme.getSize("print_setup_big_item").height height: visible ? childrenRect.height: 0
visible: Cura.MachineManager.hasMaterials visible: Cura.MachineManager.hasMaterials
Label Label
@ -246,8 +246,8 @@ 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
height: UM.Theme.getSize("print_setup_big_item").height
width: selectors.controlWidth width: selectors.controlWidth
height: UM.Theme.getSize("print_setup_big_item").height
style: UM.Theme.styles.print_setup_header_button style: UM.Theme.styles.print_setup_header_button
activeFocusOnPress: true activeFocusOnPress: true
@ -260,7 +260,7 @@ Item
Row Row
{ {
height: UM.Theme.getSize("print_setup_big_item").height height: visible ? childrenRect.height: 0
visible: Cura.MachineManager.hasVariants visible: Cura.MachineManager.hasVariants
Label Label
@ -279,7 +279,6 @@ Item
id: variantSelection id: variantSelection
text: Cura.MachineManager.activeVariantName text: Cura.MachineManager.activeVariantName
tooltip: Cura.MachineManager.activeVariantName tooltip: Cura.MachineManager.activeVariantName
height: UM.Theme.getSize("print_setup_big_item").height height: UM.Theme.getSize("print_setup_big_item").height
width: selectors.controlWidth width: selectors.controlWidth
style: UM.Theme.styles.print_setup_header_button style: UM.Theme.styles.print_setup_header_button
@ -292,7 +291,7 @@ Item
Row Row
{ {
id: warnings id: warnings
height: UM.Theme.getSize("print_setup_big_item").height height: visible ? childrenRect.height : 0
visible: buildplateCompatibilityError || buildplateCompatibilityWarning visible: buildplateCompatibilityError || buildplateCompatibilityWarning
property bool buildplateCompatibilityError: !Cura.MachineManager.variantBuildplateCompatible && !Cura.MachineManager.variantBuildplateUsable property bool buildplateCompatibilityError: !Cura.MachineManager.variantBuildplateCompatible && !Cura.MachineManager.variantBuildplateUsable

1
resources/themes/cura-light/theme.json
View file

@ -442,7 +442,6 @@
"print_setup_widget": [38.0, 30.0], "print_setup_widget": [38.0, 30.0],
"print_setup_mode_toggle": [0.0, 2.0], "print_setup_mode_toggle": [0.0, 2.0],
"print_setup_item": [0.0, 2.0],
"print_setup_extruder_box": [0.0, 6.0], "print_setup_extruder_box": [0.0, 6.0],
"print_setup_slider_groove": [0.16, 0.16], "print_setup_slider_groove": [0.16, 0.16],
"print_setup_slider_handle": [1.0, 1.0], "print_setup_slider_handle": [1.0, 1.0],