From aa61948801067f4d96cf0000c0862095275f4b27 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 22 Oct 2013 11:08:37 +0200
Subject: [PATCH] relaxed rules for new IDs when ID is also a user visible text

---
 apps/opencs/view/world/dialoguecreator.cpp |  2 +-
 apps/opencs/view/world/genericcreator.cpp  |  4 ++--
 apps/opencs/view/world/genericcreator.hpp  |  2 +-
 apps/opencs/view/world/idvalidator.cpp     | 20 +++++++++++++++-----
 apps/opencs/view/world/idvalidator.hpp     |  5 ++++-
 5 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/apps/opencs/view/world/dialoguecreator.cpp b/apps/opencs/view/world/dialoguecreator.cpp
index c16214283..3523d5e32 100644
--- a/apps/opencs/view/world/dialoguecreator.cpp
+++ b/apps/opencs/view/world/dialoguecreator.cpp
@@ -19,7 +19,7 @@ void CSVWorld::DialogueCreator::configureCreateCommand (CSMWorld::CreateCommand&
 
 CSVWorld::DialogueCreator::DialogueCreator (CSMWorld::Data& data, QUndoStack& undoStack,
     const CSMWorld::UniversalId& id, int type)
-: GenericCreator (data, undoStack, id), mType (type)
+: GenericCreator (data, undoStack, id, true), mType (type)
 {}
 
 CSVWorld::Creator *CSVWorld::TopicCreatorFactory::makeCreator (CSMWorld::Data& data,
diff --git a/apps/opencs/view/world/genericcreator.cpp b/apps/opencs/view/world/genericcreator.cpp
index df43d6c5f..ba2b3665a 100644
--- a/apps/opencs/view/world/genericcreator.cpp
+++ b/apps/opencs/view/world/genericcreator.cpp
@@ -57,14 +57,14 @@ const CSMWorld::UniversalId& CSVWorld::GenericCreator::getCollectionId() const
 }
 
 CSVWorld::GenericCreator::GenericCreator (CSMWorld::Data& data, QUndoStack& undoStack,
-    const CSMWorld::UniversalId& id)
+    const CSMWorld::UniversalId& id, bool relaxedIdRules)
 : mData (data), mUndoStack (undoStack), mListId (id), mLocked (false)
 {
     mLayout = new QHBoxLayout;
     mLayout->setContentsMargins (0, 0, 0, 0);
 
     mId = new QLineEdit;
-    mId->setValidator (new IdValidator (this));
+    mId->setValidator (new IdValidator (relaxedIdRules, this));
     mLayout->addWidget (mId, 1);
 
     mCreate = new QPushButton ("Create");
diff --git a/apps/opencs/view/world/genericcreator.hpp b/apps/opencs/view/world/genericcreator.hpp
index 6752d8591..8dd2ca911 100644
--- a/apps/opencs/view/world/genericcreator.hpp
+++ b/apps/opencs/view/world/genericcreator.hpp
@@ -51,7 +51,7 @@ namespace CSVWorld
         public:
 
             GenericCreator (CSMWorld::Data& data, QUndoStack& undoStack,
-                const CSMWorld::UniversalId& id);
+                const CSMWorld::UniversalId& id, bool relaxedIdRules = false);
 
             virtual void setEditLock (bool locked);
 
diff --git a/apps/opencs/view/world/idvalidator.cpp b/apps/opencs/view/world/idvalidator.cpp
index cf6e5d77b..c685e44ee 100644
--- a/apps/opencs/view/world/idvalidator.cpp
+++ b/apps/opencs/view/world/idvalidator.cpp
@@ -12,15 +12,25 @@ bool CSVWorld::IdValidator::isValid (const QChar& c, bool first) const
     return false;
 }
 
-CSVWorld::IdValidator::IdValidator (QObject *parent) : QValidator (parent) {}
+CSVWorld::IdValidator::IdValidator (bool relaxed, QObject *parent)
+: QValidator (parent), mRelaxed (relaxed)
+{}
 
 QValidator::State CSVWorld::IdValidator::validate (QString& input, int& pos) const
 {
-    bool first = true;
-
-    for (QString::const_iterator iter (input.begin()); iter!=input.end(); ++iter, first = false)
-        if (!isValid (*iter, first))
+    if (mRelaxed)
+    {
+        if (input.indexOf ('"')!=-1 || input.indexOf ("::")!=-1)
             return QValidator::Invalid;
+    }
+    else
+    {
+        bool first = true;
+
+        for (QString::const_iterator iter (input.begin()); iter!=input.end(); ++iter, first = false)
+            if (!isValid (*iter, first))
+                return QValidator::Invalid;
+    }
 
     return QValidator::Acceptable;
 }
\ No newline at end of file
diff --git a/apps/opencs/view/world/idvalidator.hpp b/apps/opencs/view/world/idvalidator.hpp
index db0ecb27a..8ca162440 100644
--- a/apps/opencs/view/world/idvalidator.hpp
+++ b/apps/opencs/view/world/idvalidator.hpp
@@ -7,13 +7,16 @@ namespace CSVWorld
 {
     class IdValidator : public QValidator
     {
+            bool mRelaxed;
+
         private:
 
             bool isValid (const QChar& c, bool first) const;
 
         public:
 
-            IdValidator (QObject *parent = 0);
+            IdValidator (bool relaxed = false, QObject *parent = 0);
+            ///< \param relaxed Relaxed rules for IDs that also functino as user visible text
 
             virtual State validate (QString& input, int& pos) const;