Merge branch 'master' into CURA-6793_performance

This commit is contained in:
Ghostkeeper 2019-10-16 15:47:41 +02:00
commit c12817170c
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
31 changed files with 537 additions and 94 deletions

View file

@ -46,6 +46,8 @@ class IntentCategoryModel(ListModel):
self.addRoleName(self.WeightRole, "weight")
self.addRoleName(self.QualitiesRole, "qualities")
application = cura.CuraApplication.CuraApplication.getInstance()
ContainerRegistry.getInstance().containerAdded.connect(self._onContainerChange)
ContainerRegistry.getInstance().containerRemoved.connect(self._onContainerChange)
machine_manager = cura.CuraApplication.CuraApplication.getInstance().getMachineManager()
@ -53,6 +55,9 @@ class IntentCategoryModel(ListModel):
machine_manager.activeVariantChanged.connect(self.update)
machine_manager.extruderChanged.connect(self.update)
extruder_manager = application.getExtruderManager()
extruder_manager.extrudersChanged.connect(self.update)
self.update()
## Updates the list of intents if an intent profile was added or removed.