Merge branch 'master' into feature_separate_stage_qml

This commit is contained in:
fieldOfView 2018-03-29 14:47:58 +02:00
commit 3a9371837c
5 changed files with 2 additions and 29 deletions

View file

@ -83,16 +83,4 @@ ToolButton
}
menu: PrinterMenu { }
// Make the toolbutton react when the global container changes, otherwise if Cura is not connected to the printer,
// switching printers make no reaction
Connections
{
target: Cura.MachineManager
onGlobalContainerChanged:
{
base.isNetworkPrinter = Cura.MachineManager.activeMachineNetworkKey != ""
base.printerConnected = Cura.MachineManager.printerOutputDevices.length != 0
}
}
}

View file

@ -610,16 +610,4 @@ Rectangle
watchedProperties: [ "value" ]
storeIndex: 0
}
// Make the ConfigurationSelector react when the global container changes, otherwise if Cura is not connected to the printer,
// switching printers make no reaction
Connections
{
target: Cura.MachineManager
onGlobalContainerChanged:
{
base.isNetworkPrinter = Cura.MachineManager.activeMachineNetworkKey != ""
base.printerConnected = Cura.MachineManager.printerOutputDevices.length != 0
}
}
}