Small changes that can prevent users from duplicate layer names

pencil2d · Oct 4, 2018 · 6075bdf · 6075bdf
1 parent 064b32d
commit 6075bdf
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 4 deletions.
diff --git a/app/src/actioncommands.cpp b/app/src/actioncommands.cpp
@@ -595,10 +595,14 @@ Status ActionCommands::addNewBitmapLayer()
     QString text = QInputDialog::getText(nullptr, tr("Layer Properties"),
                                          tr("Layer name:"), QLineEdit::Normal,
                                          tr("Bitmap Layer"), &ok);
-    if (ok && !text.isEmpty())
+    if (ok && !text.isEmpty() && checkNewLayerName(text))
     {
         mEditor->layers()->createBitmapLayer(text);
     }
+    else
+    {
+        uniqueNameMsg();
+    }
     return Status::OK;
 }
 
@@ -608,10 +612,14 @@ Status ActionCommands::addNewVectorLayer()
     QString text = QInputDialog::getText(nullptr, tr("Layer Properties"),
                                          tr("Layer name:"), QLineEdit::Normal,
                                          tr("Vector Layer"), &ok);
-    if (ok && !text.isEmpty())
+    if (ok && !text.isEmpty() && checkNewLayerName(text))
     {
         mEditor->layers()->createVectorLayer(text);
     }
+    else
+    {
+        uniqueNameMsg();
+    }
 
     return Status::OK;
 }
@@ -622,10 +630,14 @@ Status ActionCommands::addNewCameraLayer()
     QString text = QInputDialog::getText(nullptr, tr("Layer Properties"),
                                          tr("Layer name:"), QLineEdit::Normal,
                                          tr("Camera Layer"), &ok);
-    if (ok && !text.isEmpty())
+    if (ok && !text.isEmpty() && checkNewLayerName(text))
     {
         mEditor->layers()->createCameraLayer(text);
     }
+    else
+    {
+        uniqueNameMsg();
+    }
 
     return Status::OK;
 }
@@ -636,13 +648,17 @@ Status ActionCommands::addNewSoundLayer()
     QString strLayerName = QInputDialog::getText(nullptr, tr("Layer Properties"),
                                                  tr("Layer name:"), QLineEdit::Normal,
                                                  tr("Sound Layer"), &ok);
-    if (ok && !strLayerName.isEmpty())
+    if (ok && !strLayerName.isEmpty() && checkNewLayerName(strLayerName))
     {
         Layer* layer = mEditor->layers()->createSoundLayer(strLayerName);
         mEditor->layers()->setCurrentLayer(layer);
 
         return Status::OK;
     }
+    else
+    {
+        uniqueNameMsg();
+    }
     return Status::FAIL;
 }
 
@@ -668,6 +684,27 @@ Status ActionCommands::deleteCurrentLayer()
     return Status::OK;
 }
 
+bool ActionCommands::checkNewLayerName(QString s)
+{
+    LayerManager* layerMgr = mEditor->layers();
+    bool b = true;
+    for (int i = 0; i < layerMgr->count(); i++)
+    {
+        if (layerMgr->getLayer(i)->name() == s)
+        {
+            b = false;
+        }
+    }
+    return b;
+}
+
+void ActionCommands::uniqueNameMsg()
+{
+    QMessageBox msgBox;
+    msgBox.setText(tr("Filename must be unique and not empty"));
+    msgBox.exec();
+}
+
 
 void ActionCommands::help()
 {

diff --git a/app/src/actioncommands.h b/app/src/actioncommands.h
@@ -72,6 +72,8 @@ class ActionCommands : public QObject
     Status addNewCameraLayer();
     Status addNewSoundLayer();
     Status deleteCurrentLayer();
+    bool checkNewLayerName(QString s);
+    void uniqueNameMsg();
 
     // Help
     void help();