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

Show Keep/Discard dialog after the containers have been changed

Browse Source 
CURA-4599

Or the default values will reflect those before the switch.
This commit is contained in:
Lipu Fei 2017-11-22 09:18:20 +01:00
parent f69d83cce1
commit 31c859b3d7
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cura/Settings/MachineManager.py
View File

@ -864,17 +864,10 @@ class MachineManager(QObject):
"quality_changes": stack_quality_changes "quality_changes": stack_quality_changes
}) })
has_user_interaction = False # show the keep/discard dialog after the containers have been switched. Otherwise, the default values on
# the dialog will be the those before the switching.
if self.hasUserSettings and Preferences.getInstance().getValue("cura/active_mode") == 1: self._executeDelayedActiveContainerStackChanges()
# Show the keep/discard user settings dialog Application.getInstance().discardOrKeepProfileChanges()
has_user_interaction = Application.getInstance().discardOrKeepProfileChanges()
# If there is no interaction with the user (it means the dialog showing "keep" or "discard" was not shown)
# because either there are not user changes or because the used already decided to always keep or discard,
# then the quality instance container is replaced, in which case, the activeQualityChanged signal is emitted.
if not has_user_interaction:
self._executeDelayedActiveContainerStackChanges()
## Used to update material and variant in the active container stack with a delay. ## Used to update material and variant in the active container stack with a delay.
# This delay prevents the stack from triggering a lot of signals (eventually resulting in slicing) # This delay prevents the stack from triggering a lot of signals (eventually resulting in slicing)