diff --git a/DiscoverUM3Action.py b/DiscoverUM3Action.py index 48cd3de247..be71a05e28 100644 --- a/DiscoverUM3Action.py +++ b/DiscoverUM3Action.py @@ -26,7 +26,7 @@ class DiscoverUM3Action(MachineAction): @pyqtProperty("QVariantList", notify = printerDetected) def foundDevices(self): if self._network_plugin: - print(list(self._network_plugin.getPrinters().keys())) + return list(self._network_plugin.getPrinters().keys()) else: return [] diff --git a/DiscoverUM3Action.qml b/DiscoverUM3Action.qml index 7935298008..b9883cb47c 100644 --- a/DiscoverUM3Action.qml +++ b/DiscoverUM3Action.qml @@ -9,7 +9,7 @@ import QtQuick.Window 2.1 Cura.MachineAction { anchors.fill: parent; - Item + Column { anchors.fill: parent; id: discoverUM3Action @@ -27,5 +27,26 @@ Cura.MachineAction text: "Start looking!" onClicked: manager.startDiscovery() } + + ListView + { + model: manager.foundDevices + width: parent.width + height: 500 + delegate: Rectangle + { + height: childrenRect.height; + color: "white" + width: parent.width + Label + { + anchors.left: parent.left; + anchors.leftMargin: UM.Theme.getSize("default_margin").width; + anchors.right: parent.right; + text: modelData + elide: Text.ElideRight + } + } + } } } \ No newline at end of file diff --git a/NetworkPrinterOutputDevicePlugin.py b/NetworkPrinterOutputDevicePlugin.py index cd4de6e4f8..6697e05bd9 100644 --- a/NetworkPrinterOutputDevicePlugin.py +++ b/NetworkPrinterOutputDevicePlugin.py @@ -67,7 +67,7 @@ class NetworkPrinterOutputDevicePlugin(OutputDevicePlugin): if state_change == ServiceStateChange.Added: info = zeroconf.get_service_info(service_type, name) if info: - if info.properties.get(b"type", None): + if info.properties.get(b"type", None) == b'printer': address = '.'.join(map(lambda n: str(n), info.address)) self.addPrinterSignal.emit(str(name), address, info.properties)