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

Merge branch 'CURA-6153_wrong_name_on_disconnect' of github.com:Ultimaker/Cura into 4.0

Browse source
This commit is contained in:
Jaime van Kessel 2019-02-01 11:54:35 +01:00
commit 4aaeb8c2d5
9 changed files with 29 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/Menus/NetworkPrinterMenu.qml
View file

@ -14,9 +14,9 @@ Instantiator
{
property string connectGroupName:
{
if("connect_group_name" in model.metadata)
if("group_name" in model.metadata)
{
return model.metadata["connect_group_name"]
return model.metadata["group_name"]
}
return ""
}

2
resources/qml/Preferences/MachinesPage.qml
View file

@ -56,7 +56,7 @@ UM.ManagementPage
{
text: catalog.i18nc("@action:button", "Rename");
iconName: "edit-rename";
enabled: base.currentItem != null && base.currentItem.metadata.connect_group_name == null
enabled: base.currentItem != null && base.currentItem.metadata.group_name == null
onClicked: renameDialog.open();
}
]

2
resources/qml/PrinterSelector/MachineSelectorList.qml
View file

@ -38,7 +38,7 @@ ListView
var result = Cura.MachineManager.activeMachineId == model.id
if (Cura.MachineManager.activeMachineHasRemoteConnection)
{
result |= Cura.MachineManager.activeMachineNetworkGroupName == model.metadata["connect_group_name"]
result |= Cura.MachineManager.activeMachineNetworkGroupName == model.metadata["group_name"]
}
return result
}