From 1fe574b3516a1bd872880ee805783d9c960a2312 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Thu, 6 Oct 2016 11:49:50 +0200 Subject: [PATCH] Details of profile changes now shows changes in all stacks. CURA-2558 --- cura/Settings/MachineManager.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 7bcf155e06..6d38d9968b 100644 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -745,10 +745,20 @@ class MachineManager(QObject): def _askUserToKeepOrClearCurrentSettings(self): # Ask the user if the user profile should be cleared or not (discarding the current settings) # In Simple Mode we assume the user always wants to keep the (limited) current settings - details = catalog.i18nc("@label", "You made changes to the following setting(s):") - user_settings = self._active_container_stack.getTop().findInstances(**{}) - for setting in user_settings: - details = details + "\n " + setting.definition.label + details_text = catalog.i18nc("@label", "You made changes to the following setting(s):") + + # user changes in global stack + details_list = [setting.definition.label for setting in self._global_container_stack.getTop().findInstances(**{})] + + # user changes in extruder stacks + stacks = list(ExtruderManager.getInstance().getMachineExtruders(self._global_container_stack.getId())) + for stack in stacks: + details_list.extend([ + "%s (%s)" % (setting.definition.label, stack.getName()) + for setting in stack.getTop().findInstances(**{})]) + + # Format to output string + details = "\n ".join([details_text, ] + details_list) Application.getInstance().messageBox(catalog.i18nc("@window:title", "Switched profiles"), catalog.i18nc("@label",