diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py index 5211889801..c436f94421 100644 --- a/cura/Machines/Models/IntentCategoryModel.py +++ b/cura/Machines/Models/IntentCategoryModel.py @@ -10,7 +10,7 @@ from cura.Settings.IntentManager import IntentManager from UM.Qt.ListModel import ListModel from UM.Settings.ContainerRegistry import ContainerRegistry #To update the list if anything changes. from PyQt5.QtCore import pyqtProperty, pyqtSignal - +import cura.CuraApplication if TYPE_CHECKING: from UM.Settings.ContainerRegistry import ContainerInterface @@ -48,7 +48,7 @@ class IntentCategoryModel(ListModel): ContainerRegistry.getInstance().containerAdded.connect(self._onContainerChange) ContainerRegistry.getInstance().containerRemoved.connect(self._onContainerChange) - IntentManager.getInstance().configurationChanged.connect(self.update) + cura.CuraApplication.CuraApplication.getInstance().getMachineManager().activeStackChanged.connect(self.update) self.update() diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py index d4f12b9313..1a73fb818c 100644 --- a/cura/Settings/IntentManager.py +++ b/cura/Settings/IntentManager.py @@ -18,12 +18,6 @@ if TYPE_CHECKING: class IntentManager(QObject): __instance = None - def __init__(self) -> None: - super().__init__() - cura.CuraApplication.CuraApplication.getInstance().getMachineManager().activeStackChanged.connect(self.configurationChanged) - self.configurationChanged.connect(self.selectDefaultIntent) - pass - ## This class is a singleton. @classmethod def getInstance(cls): @@ -31,7 +25,6 @@ class IntentManager(QObject): cls.__instance = IntentManager() return cls.__instance - configurationChanged = pyqtSignal() #Triggered when something changed in the rest of the stack. intentCategoryChanged = pyqtSignal() #Triggered when we switch categories. ## Gets the metadata dictionaries of all intent profiles for a given @@ -150,13 +143,4 @@ class IntentManager(QObject): extruder_stack.intent = self.getDefaultIntent() application.getMachineManager().setQualityGroupByQualityType(quality_type) if old_intent_category != intent_category: - self.intentCategoryChanged.emit() - - ## Selects the default intents on every extruder. - def selectDefaultIntent(self) -> None: - application = cura.CuraApplication.CuraApplication.getInstance() - global_stack = application.getGlobalContainerStack() - if global_stack is None: - return - for extruder_stack in global_stack.extruderList: - extruder_stack.intent = self.getDefaultIntent() + self.intentCategoryChanged.emit() \ No newline at end of file