Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection

This commit is contained in:
Daniel Schiavini 2018-12-04 16:15:19 +01:00
commit 54744b46a7
11 changed files with 123 additions and 32 deletions

View file

@ -527,6 +527,12 @@ class MachineManager(QObject):
return self._global_container_stack.getMetaDataEntry("um_network_key", "")
return ""
@pyqtProperty(str, notify=printerConnectedStatusChanged)
def activeMachineCloudKey(self) -> str:
if self._global_container_stack:
return self._global_container_stack.getMetaDataEntry("um_cloud_cluster_id", "")
return ""
@pyqtProperty(str, notify = printerConnectedStatusChanged)
def activeMachineNetworkGroupName(self) -> str:
if self._global_container_stack: