Merge branch 'fix_non_connect_networkprinters' of https://github.com/fieldOfView/Cura into 4.0

This commit is contained in:
Jaime van Kessel 2019-01-14 14:12:36 +01:00
commit 5ae05acd2c
4 changed files with 21 additions and 6 deletions

View file

@ -54,7 +54,7 @@ class ConfigurationModel(QObject):
for configuration in self._extruder_configurations:
if configuration is None:
return False
return self._printer_type is not None
return self._printer_type != ""
def __str__(self):
message_chunks = []

View file

@ -136,9 +136,9 @@ Cura.ExpandablePopup
onVisibleChanged:
{
is_connected = Cura.MachineManager.activeMachineHasRemoteConnection && Cura.MachineManager.printerConnected //Re-evaluate.
is_connected = Cura.MachineManager.activeMachineHasRemoteConnection && Cura.MachineManager.printerConnected && Cura.MachineManager.printerOutputDevices[0].uniqueConfigurations.length > 0 //Re-evaluate.
// If the printer is not connected, we switch always to the custom mode. If is connected instead, the auto mode
// If the printer is not connected or does not have configurations, we switch always to the custom mode. If is connected instead, the auto mode
// or the previous state is selected
configuration_method = is_connected ? (manual_selected_method == -1 ? ConfigurationMenu.ConfigurationMethod.Auto : manual_selected_method) : ConfigurationMenu.ConfigurationMethod.Custom
}

View file

@ -12,10 +12,18 @@ Instantiator
model: Cura.GlobalStacksModel {}
MenuItem
{
text: model.metadata["connect_group_name"]
property string connectGroupName:
{
if("connect_group_name" in model.metadata)
{
return model.metadata["connect_group_name"]
}
return ""
}
text: connectGroupName
checkable: true
visible: model.hasRemoteConnection
checked: Cura.MachineManager.activeMachineNetworkGroupName == model.metadata["connect_group_name"]
checked: Cura.MachineManager.activeMachineNetworkGroupName == connectGroupName
exclusiveGroup: group
onTriggered: Cura.MachineManager.setActiveMachine(model.id)
}

View file

@ -26,7 +26,14 @@ Cura.ExpandablePopup
headerItem: Cura.IconWithText
{
text: isNetworkPrinter ? Cura.MachineManager.activeMachineNetworkGroupName : Cura.MachineManager.activeMachineName
text:
{
if (isNetworkPrinter && Cura.MachineManager.activeMachineNetworkGroupName != "")
{
Cura.MachineManager.activeMachineNetworkGroupName
}
return Cura.MachineManager.activeMachineName
}
source:
{
if (isNetworkPrinter)