Merge branch 'CURA-6800_project_file_intent' of github.com:Ultimaker/Cura into feature_intent

This commit is contained in:
Jaime van Kessel 2019-09-24 10:34:21 +02:00
commit 56c7fb9f7d
No known key found for this signature in database
GPG key ID: 3710727397403C91
5 changed files with 76 additions and 12 deletions

View file

@ -613,8 +613,8 @@ class MachineManager(QObject):
return False
return Util.parseBool(global_container_stack.quality.getMetaDataEntry("is_experimental", False))
@pyqtProperty(str, notify=activeIntentChanged)
def activeIntentCategory(self):
@pyqtProperty(str, notify = activeIntentChanged)
def activeIntentCategory(self) -> str:
global_container_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack()
if not global_container_stack: