From ef8cd304dc847a61fd45f3b69aa49d30774faac8 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 8 Mar 2018 20:00:19 +0100 Subject: [PATCH] No keep/discard setting dialog in project loading CURA-4966 --- cura/Settings/MachineManager.py | 8 ++++---- plugins/3MFReader/ThreeMFWorkspaceReader.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index f8692da0e3..1b3f01170e 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1012,13 +1012,13 @@ class MachineManager(QObject): self._updateQualityWithMaterial() @pyqtSlot(QObject) - def setQualityGroup(self, quality_group): + def setQualityGroup(self, quality_group, no_dialog = False): self.blurSettings.emit() with postponeSignals(*self._getContainerChangedSignals(), compress = CompressTechnique.CompressPerParameterValue): self._setQualityGroup(quality_group) # See if we need to show the Discard or Keep changes screen - if self.hasUserSettings and Preferences.getInstance().getValue("cura/active_mode") == 1: + if not no_dialog and self.hasUserSettings and Preferences.getInstance().getValue("cura/active_mode") == 1: self._application.discardOrKeepProfileChanges() @pyqtProperty(QObject, fset = setQualityGroup, notify = activeQualityGroupChanged) @@ -1026,13 +1026,13 @@ class MachineManager(QObject): return self._current_quality_group @pyqtSlot(QObject) - def setQualityChangesGroup(self, quality_changes_group): + def setQualityChangesGroup(self, quality_changes_group, no_dialog = False): self.blurSettings.emit() with postponeSignals(*self._getContainerChangedSignals(), compress = CompressTechnique.CompressPerParameterValue): self._setQualityChangesGroup(quality_changes_group) # See if we need to show the Discard or Keep changes screen - if self.hasUserSettings and Preferences.getInstance().getValue("cura/active_mode") == 1: + if not no_dialog and self.hasUserSettings and Preferences.getInstance().getValue("cura/active_mode") == 1: self._application.discardOrKeepProfileChanges() @pyqtProperty(QObject, fset = setQualityChangesGroup, notify = activeQualityChangesGroupChanged) diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index 4698d498d2..b02dda4b83 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -980,7 +980,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): Logger.log("e", "Could not find quality_changes [%s]", self._quality_changes_to_apply) return quality_changes_group = quality_changes_group_dict[self._quality_changes_to_apply] - machine_manager.setQualityChangesGroup(quality_changes_group) + machine_manager.setQualityChangesGroup(quality_changes_group, no_dialog = True) else: self._quality_type_to_apply = self._quality_type_to_apply.lower() quality_group_dict = quality_manager.getQualityGroups(global_stack) @@ -995,7 +995,7 @@ class ThreeMFWorkspaceReader(WorkspaceReader): Logger.log("e", "Could not get preferred quality type [%s]", preferred_quality_type) if quality_group is not None: - machine_manager.setQualityGroup(quality_group) + machine_manager.setQualityGroup(quality_group, no_dialog = True) # Notify everything/one that is to notify about changes. global_stack.containersChanged.emit(global_stack.getTop())