GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 17:59:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Switch out the containersModel for the more specific printersModel

Browse Source
This commit is contained in:
Jaime van Kessel 2018-12-21 11:20:09 +01:00
parent 5bf260f524
commit 81e356ea1b
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
resources/qml/Menus/LocalPrinterMenu.qml
View File

@ -7,16 +7,18 @@ import QtQuick.Controls 1.4
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura
Instantiator { Instantiator
model: UM.ContainerStacksModel { {
filter: {"type": "machine", "um_network_key": null} model: Cura.PrintersModel {}
}
MenuItem { MenuItem
text: model.name; {
checkable: true; text: model.name
checkable: true
checked: Cura.MachineManager.activeMachineId == model.id checked: Cura.MachineManager.activeMachineId == model.id
exclusiveGroup: group; exclusiveGroup: group
onTriggered: Cura.MachineManager.setActiveMachine(model.id); visible: !model.hasRemoteConnection
onTriggered: Cura.MachineManager.setActiveMachine(model.id)
} }
onObjectAdded: menu.insertItem(index, object) onObjectAdded: menu.insertItem(index, object)
onObjectRemoved: menu.removeItem(object) onObjectRemoved: menu.removeItem(object)

14
resources/qml/Menus/NetworkPrinterMenu.qml
View File

@ -9,19 +9,15 @@ import Cura 1.0 as Cura
Instantiator Instantiator
{ {
model: UM.ContainerStacksModel model: Cura.PrintersModel {}
{
filter: {"type": "machine", "um_network_key": "*", "hidden": "False"}
}
MenuItem MenuItem
{ {
// TODO: Use printer_group icon when it's a cluster. Not use it for now since it doesn't look as expected
// iconSource: UM.Theme.getIcon("printer_single")
text: model.metadata["connect_group_name"] text: model.metadata["connect_group_name"]
checkable: true; checkable: true
visible: model.hasRemoteConnection
checked: Cura.MachineManager.activeMachineNetworkGroupName == model.metadata["connect_group_name"] checked: Cura.MachineManager.activeMachineNetworkGroupName == model.metadata["connect_group_name"]
exclusiveGroup: group; exclusiveGroup: group
onTriggered: Cura.MachineManager.setActiveMachine(model.id); onTriggered: Cura.MachineManager.setActiveMachine(model.id)
} }
onObjectAdded: menu.insertItem(index, object) onObjectAdded: menu.insertItem(index, object)
onObjectRemoved: menu.removeItem(object) onObjectRemoved: menu.removeItem(object)