From d8f89d83301c8b5ab80c48dfa927f6fc419429a6 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 29 Mar 2019 13:41:35 +0100 Subject: [PATCH] Fix sorting printers by name Because DiscoveredPrinter.name contains the MAC addresses of the printers. NetworkedPrinterOutputDevice.name contains the discovered name as communicated by ZeroConf. We already use that property from QML to display in the list. Contributes to issue CURA-6057. --- cura/Machines/Models/DiscoveredPrintersModel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/Models/DiscoveredPrintersModel.py b/cura/Machines/Models/DiscoveredPrintersModel.py index 9164958957..aa372a49e8 100644 --- a/cura/Machines/Models/DiscoveredPrintersModel.py +++ b/cura/Machines/Models/DiscoveredPrintersModel.py @@ -90,7 +90,7 @@ class DiscoveredPrintersModel(QObject): @pyqtProperty(list, notify = discoveredPrintersChanged) def discoveredPrinters(self) -> List["DiscoveredPrinter"]: item_list = list(x for x in self._discovered_printer_by_ip_dict.values()) - item_list.sort(key = lambda x: x.name) + item_list.sort(key = lambda x: x.device.name) return item_list def addDiscoveredPrinter(self, ip_address: str, key: str, name: str, create_callback: Callable[[str], None],