GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 07:25:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Also emit active quality changed when no dialog interaction occured - CURA-4447

Browse Source
This commit is contained in:
ChrisTerBeke 2017-10-20 11:37:45 +02:00
parent e24242dc3c
commit 31a04ed8da
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cura/Settings/MachineManager.py
View File

@ -858,9 +858,11 @@ class MachineManager(QObject):
for stack in name_changed_connect_stacks: for stack in name_changed_connect_stacks:
stack.nameChanged.connect(self._onQualityNameChanged) stack.nameChanged.connect(self._onQualityNameChanged)
has_user_interaction = False
if self.hasUserSettings and Preferences.getInstance().getValue("cura/active_mode") == 1: if self.hasUserSettings and Preferences.getInstance().getValue("cura/active_mode") == 1:
# Show the keep/discard user settings dialog # Show the keep/discard user settings dialog
Application.getInstance().discardOrKeepProfileChanges() has_user_interaction = Application.getInstance().discardOrKeepProfileChanges()
else: else:
# If the user doesn't have any of adjusted settings then slicing will be triggered by emit() # If the user doesn't have any of adjusted settings then slicing will be triggered by emit()
# Send emits that are postponed in replaceContainer. # Send emits that are postponed in replaceContainer.
@ -868,6 +870,7 @@ class MachineManager(QObject):
for setting_info in new_quality_settings_list: for setting_info in new_quality_settings_list:
setting_info["stack"].sendPostponedEmits() setting_info["stack"].sendPostponedEmits()
if not has_user_interaction:
self.activeQualityChanged.emit() self.activeQualityChanged.emit()
## Determine the quality and quality changes settings for the current machine for a quality name. ## Determine the quality and quality changes settings for the current machine for a quality name.