Merge branch '4.0'

This commit is contained in:
Ghostkeeper 2019-02-08 14:23:36 +01:00
commit 51420c8311
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
8 changed files with 306 additions and 15 deletions

View file

@ -509,6 +509,18 @@ class MachineManager(QObject):
return self._global_container_stack.getId()
return ""
@pyqtProperty(str, notify = globalContainerChanged)
def activeMachineFirmwareVersion(self) -> str:
if not self._printer_output_devices[0]:
return ""
return self._printer_output_devices[0].firmwareVersion
@pyqtProperty(str, notify = globalContainerChanged)
def activeMachineAddress(self) -> str:
if not self._printer_output_devices[0]:
return ""
return self._printer_output_devices[0].address
@pyqtProperty(bool, notify = printerConnectedStatusChanged)
def printerConnected(self) -> bool:
return bool(self._printer_output_devices)