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

Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0

Browse source
This commit is contained in:
Jaime van Kessel 2018-12-19 14:09:32 +01:00
commit d33cb6dfe9
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/PrinterOutputDevice.py
View file

@ -230,7 +230,7 @@ class PrinterOutputDevice(QObject, OutputDevice):
# Returns the unique configurations of the printers within this output device # Returns the unique configurations of the printers within this output device
@pyqtProperty("QStringList", notify = uniqueConfigurationsChanged) @pyqtProperty("QStringList", notify = uniqueConfigurationsChanged)
def uniquePrinterTypes(self) -> List[str]: def uniquePrinterTypes(self) -> List[str]:
return list(set([configuration.printerType for configuration in self._unique_configurations])) return list(sorted(set([configuration.printerType for configuration in self._unique_configurations])))
def _onPrintersChanged(self) -> None: def _onPrintersChanged(self) -> None:
for printer in self._printers: for printer in self._printers:

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

@ -7,11 +7,14 @@ 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 { {
model: UM.ContainerStacksModel
{
filter: {"type": "machine", "um_network_key": "*", "hidden": "False"} 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 // 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") // iconSource: UM.Theme.getIcon("printer_single")
text: model.metadata["connect_group_name"] text: model.metadata["connect_group_name"]