Simplify some checks for connection types and group size

This commit is contained in:
ChrisTerBeke 2018-12-20 14:26:30 +01:00
parent 2f92f6ef50
commit af2061cd52
3 changed files with 31 additions and 18 deletions

View file

@ -527,10 +527,15 @@ class MachineManager(QObject):
@pyqtProperty(bool, notify = printerConnectedStatusChanged)
def activeMachineHasRemoteConnection(self) -> bool:
if self._global_container_stack:
connection_type = self._global_container_stack.getMetaDataEntry("connection_type")
return connection_type in [ConnectionType.NetworkConnection.value, ConnectionType.CloudConnection.value]
return False
return self.activeMachineHasActiveNetworkConnection or self.activeMachineHasActiveCloudConnection
# if self._global_container_stack:
# connection_type = self._global_container_stack.getMetaDataEntry("connection_type")
# return connection_type in [ConnectionType.NetworkConnection.value, ConnectionType.CloudConnection.value]
# return False
@pyqtProperty(bool, notify = printerConnectedStatusChanged)
def activeMachineIsGroup(self) -> bool:
return self._printer_output_devices and self._printer_output_devices[0].clusterSize > 1
@pyqtProperty(bool, notify = printerConnectedStatusChanged)
def activeMachineHasActiveNetworkConnection(self) -> bool: