3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Diego Prado Gesto 2019-04-12 13:54:45 +02:00
commit 1d9d10c909
8 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -205,7 +205,7 @@ Item
Row
{
height: visible ? childrenRect.height : 0
height: visible ? UM.Theme.getSize("setting_control").height : 0
visible: extrudersModel.count > 1 // If there is only one extruder, there is no point to enable/disable that.
Label
@ -223,7 +223,7 @@ Item
{
checked: Cura.MachineManager.activeStack != null ? Cura.MachineManager.activeStack.isEnabled : false
enabled: !checked || Cura.MachineManager.numberExtrudersEnabled > 1 //Disable if it's the last enabled extruder.
height: UM.Theme.getSize("setting_control").height
height: parent.height
style: UM.Theme.styles.checkbox
/* Use a MouseArea to process the click on this checkbox.
@ -242,7 +242,7 @@ Item
Row
{
height: visible ? childrenRect.height: 0
height: visible ? UM.Theme.getSize("print_setup_big_item").height : 0
visible: Cura.MachineManager.hasMaterials
Label
@ -267,7 +267,7 @@ Item
tooltip: text
width: selectors.controlWidth
height: UM.Theme.getSize("print_setup_big_item").height
height: parent.height
style: UM.Theme.styles.print_setup_header_button
activeFocusOnPress: true
@ -302,7 +302,7 @@ Item
Row
{
height: visible ? childrenRect.height: 0
height: visible ? UM.Theme.getSize("print_setup_big_item").height : 0
visible: Cura.MachineManager.hasVariants
Label
@ -321,7 +321,7 @@ Item
id: variantSelection
text: Cura.MachineManager.activeVariantName
tooltip: Cura.MachineManager.activeVariantName
height: UM.Theme.getSize("print_setup_big_item").height
height: parent.height
width: selectors.controlWidth
style: UM.Theme.styles.print_setup_header_button
activeFocusOnPress: true;

9
resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
View file

@ -133,7 +133,14 @@ Item
supportExtruderCombobox.color = supportExtruderCombobox.model.getItem(supportExtruderCombobox.currentIndex).color
}
}
onCurrentIndexChanged: supportExtruderCombobox.color = supportExtruderCombobox.model.getItem(supportExtruderCombobox.currentIndex).color
onCurrentIndexChanged:
{
var maybeColor = supportExtruderCombobox.model.getItem(supportExtruderCombobox.currentIndex).color
if(maybeColor)
{
supportExtruderCombobox.color = maybeColor
}
}
Binding
{