From 829d341f7fbdf2a666c845e7068afea8d3666eff Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 27 Sep 2016 14:13:06 +0200 Subject: [PATCH] When import multi extrusion profile, they now all get the same name CURA-2462 --- cura/Settings/CuraContainerRegistry.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cura/Settings/CuraContainerRegistry.py b/cura/Settings/CuraContainerRegistry.py index 87dec62f8d..a948a25d5e 100644 --- a/cura/Settings/CuraContainerRegistry.py +++ b/cura/Settings/CuraContainerRegistry.py @@ -144,12 +144,14 @@ class CuraContainerRegistry(ContainerRegistry): self._configureProfile(profile, name_seed) return { "status": "ok", "message": catalog.i18nc("@info:status", "Successfully imported profile {0}", profile.getName()) } else: + new_name = self.createUniqueName("quality_changes", "", name_seed, catalog.i18nc("@label", "Custom profile")) for profile in profile_or_list: profile.setDirty(True) # Ensure the profiles are correctly saved if profile.getId() != "": container_registry.addContainer(profile) else: self._configureProfile(profile, name_seed) + profile.setName(new_name) if len(profile_or_list) == 1: return {"status": "ok", "message": catalog.i18nc("@info:status", "Successfully imported profile {0}", profile_or_list[0].getName())} @@ -160,12 +162,11 @@ class CuraContainerRegistry(ContainerRegistry): #If it hasn't returned by now, none of the plugins loaded the profile successfully. return { "status": "error", "message": catalog.i18nc("@info:status", "Profile {0} has an unknown file type.", file_name)} - def _configureProfile(self, profile, name_seed): + def _configureProfile(self, profile, id_seed): profile.setReadOnly(False) - new_name = self.createUniqueName("quality_changes", "", name_seed, catalog.i18nc("@label", "Custom profile")) - profile.setName(new_name) - profile._id = new_name + new_id = self.createUniqueName("quality_changes", "", id_seed, catalog.i18nc("@label", "Custom profile")) + profile._id = new_id if self._machineHasOwnQualities(): profile.setDefinition(self._activeDefinition())