Просмотр исходного кода

Suggest unique name when creating/duplicating profiles

CURA-2161
fieldOfView 8 лет назад
Родитель
Сommit
a52bb1422b
2 измененных файлов с 7 добавлено и 3 удалено
  1. 4 0
      cura/Settings/ContainerManager.py
  2. 3 3
      resources/qml/Preferences/ProfilesPage.qml

+ 4 - 0
cura/Settings/ContainerManager.py

@@ -254,6 +254,10 @@ class ContainerManager(QObject):
                 return True
         return False
 
+    @pyqtSlot(str, result = str)
+    def makeUniqueName(self, original_name):
+        return self._container_registry.uniqueName(original_name)
+
     ##  Get a list of string that can be used as name filters for a Qt File Dialog
     #
     #   This will go through the list of available container types and generate a list of strings

+ 3 - 3
resources/qml/Preferences/ProfilesPage.qml

@@ -84,7 +84,7 @@ UM.ManagementPage
 
             onClicked:
             {
-                newNameDialog.object = base.currentItem != null ? base.currentItem.name : "";
+                newNameDialog.object = base.currentItem != null ? Cura.ContainerManager.makeUniqueName(base.currentItem.name) : "";
                 newNameDialog.open();
                 newNameDialog.selectText();
             }
@@ -100,7 +100,7 @@ UM.ManagementPage
 
             onClicked:
             {
-                newDuplicateNameDialog.object = base.currentItem.name;
+                newDuplicateNameDialog.object = Cura.ContainerManager.makeUniqueName(base.currentItem.name);
                 newDuplicateNameDialog.open();
                 newDuplicateNameDialog.selectText();
             }
@@ -144,7 +144,7 @@ UM.ManagementPage
     signal createProfile()
     onCreateProfile:
     {
-        newNameDialog.object = base.currentItem != null ? base.currentItem.name : "";
+        newNameDialog.object = base.currentItem != null ? Cura.ContainerManager.makeUniqueName(base.currentItem.name) : "";
         newNameDialog.open();
         newNameDialog.selectText();
     }