From 324d1415d7fd12970c23b945599db11282e0aa8e Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Thu, 4 Aug 2016 17:55:16 +0200 Subject: [PATCH] Fix updating active quality Contributes to CURA-2006 --- cura/Settings/ContainerManager.py | 3 +++ cura/Settings/MachineManager.py | 2 ++ 2 files changed, 5 insertions(+) diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index 528248f7ae..797b5d7cec 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -377,6 +377,8 @@ class ContainerManager(QObject): for merge_into, merge in containers_to_merge: self._performMerge(merge_into, merge) + cura.Settings.MachineManager.getInstance().activeQualityChanged.emit() + @pyqtSlot() def clearUserContainers(self): global_stack = UM.Application.getInstance().getGlobalContainerStack() @@ -432,6 +434,7 @@ class ContainerManager(QObject): stack.replaceContainer(stack.getContainerIndex(quality_changes_container), new_quality_changes) stack.getTop().clear() + cura.Settings.MachineManager.getInstance().activeQualityChanged.emit() return True # Factory function, used by QML diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 3b239ce770..e1cc784d9e 100644 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -605,6 +605,8 @@ class MachineManager(QObject): catalog.i18nc("@label", "If you transfer your settings they will override settings in the profile."), details, buttons = QMessageBox.Yes + QMessageBox.No, icon = QMessageBox.Question, callback = self._keepUserSettingsDialogCallback) + self.activeQualityChanged.emit() + def _keepUserSettingsDialogCallback(self, button): if button == QMessageBox.Yes: # Yes, keep the settings in the user profile with this profile