Browse Source

Add fallback name property in PrinterOutputDevice

It'll call this property, which gives an empty string, if the device doesn't implement giving a name.

Contributes to issue CURA-3161.
Ghostkeeper 8 years ago
parent
commit
0c9b9a3033

+ 6 - 0
cura/PrinterOutputDevice.py

@@ -170,6 +170,12 @@ class PrinterOutputDevice(QObject, OutputDevice):
     def address(self):
         Logger.log("w", "address is not implemented by this output device.")
 
+    ##  A human-readable name for the device.
+    @pyqtProperty(str, constant = True)
+    def name(self):
+        Logger.log("w", "name is not implemented by this output device.")
+        return ""
+
     @pyqtProperty(str, notify = errorTextChanged)
     def errorText(self):
         return self._error_text

+ 2 - 2
plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py

@@ -227,12 +227,12 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
     def address(self):
         return self._properties.get(b"address", b"").decode("utf-8")
 
-    ##  Name of the printer (as returned from the zeroConf properties)
+    ##  Name of the printer (as returned from the ZeroConf properties)
     @pyqtProperty(str, constant = True)
     def name(self):
         return self._properties.get(b"name", b"").decode("utf-8")
 
-    ##  Firmware version (as returned from the zeroConf properties)
+    ##  Firmware version (as returned from the ZeroConf properties)
     @pyqtProperty(str, constant=True)
     def firmwareVersion(self):
         return self._properties.get(b"firmware_version", b"").decode("utf-8")