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

CURA-4870 Start showing the list of printers separating between local

Browse Source 
and networked priters.
This commit is contained in:
Diego Prado Gesto 2018-02-27 11:23:04 +01:00
parent 197508028a
commit 0d8302d864
4 changed files with 70 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
resources/qml/Menus/LocalPrinterMenu.qml Normal file
View File

@ -0,0 +1,26 @@
// Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2
import QtQuick.Controls 1.4
import UM 1.2 as UM
import Cura 1.0 as Cura
Instantiator
{
model: UM.ContainerStacksModel
{
filter: {"type": "machine", "um_network_key": null}
}
MenuItem
{
text: model.name;
checkable: true;
checked: Cura.MachineManager.activeMachineId == model.id
exclusiveGroup: group;
onTriggered: Cura.MachineManager.setActiveMachine(model.id);
}
onObjectAdded: menu.insertItem(index, object)
onObjectRemoved: menu.removeItem(object)
}

26
resources/qml/Menus/NetworkPrinterMenu.qml Normal file
View File

@ -0,0 +1,26 @@
// Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2
import QtQuick.Controls 1.4
import UM 1.2 as UM
import Cura 1.0 as Cura
Instantiator
{
model: UM.ContainerStacksModel
{
filter: {"type": "machine", "um_network_key": "*"}
}
MenuItem
{
text: model.name;
checkable: true;
checked: Cura.MachineManager.activeMachineId == model.id
exclusiveGroup: group;
onTriggered: Cura.MachineManager.setActiveMachine(model.id);
}
onObjectAdded: menu.insertItem(index, object)
onObjectRemoved: menu.removeItem(object)
}

30
resources/qml/Menus/PrinterMenu.qml
View File

@ -1,8 +1,8 @@
// Copyright (c) 2016 Ultimaker B.V.
// Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls 1.4
import UM 1.2 as UM
import Cura 1.0 as Cura
@ -11,24 +11,24 @@ Menu
{
id: menu;
Instantiator
{
model: UM.ContainerStacksModel
{
filter: {"type": "machine"}
}
MenuItem
{
text: model.name;
checkable: true;
checked: Cura.MachineManager.activeMachineId == model.id
exclusiveGroup: group;
onTriggered: Cura.MachineManager.setActiveMachine(model.id);
text: "Network printers"
checkable: false
}
onObjectAdded: menu.insertItem(index, object)
onObjectRemoved: menu.removeItem(object)
NetworkPrinterMenu { }
MenuSeparator { }
MenuItem
{
text: "Local printers"
checkable: false
}
LocalPrinterMenu { }
ExclusiveGroup { id: group; }
MenuSeparator { }

2
resources/qml/Topbar.qml
View File

@ -150,7 +150,7 @@ Rectangle
visible: base.width - allItemsWidth - 1 * this.width > 0
}
// #5 Left view
// #5 Right view
Button
{
iconSource: UM.Theme.getIcon("view_right")