From 75c5316ad779a2ac5e6b989aea03e752c8198e26 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sun, 20 Oct 2013 17:26:09 +0200
Subject: [PATCH] added dialogue type column to topics table

---
 apps/opencs/model/world/columnbase.hpp |  3 ++-
 apps/opencs/model/world/columnimp.hpp  | 27 ++++++++++++++++++++++++++
 apps/opencs/model/world/columns.cpp    |  7 +++++++
 apps/opencs/model/world/columns.hpp    |  1 +
 apps/opencs/model/world/data.cpp       |  1 +
 apps/opencs/view/doc/viewmanager.cpp   |  3 ++-
 6 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/model/world/columnbase.hpp b/apps/opencs/model/world/columnbase.hpp
index c1b423c94c..9b8d7dafb8 100644
--- a/apps/opencs/model/world/columnbase.hpp
+++ b/apps/opencs/model/world/columnbase.hpp
@@ -43,7 +43,8 @@ namespace CSMWorld
             Display_CreatureType,
             Display_WeaponType,
             Display_RecordState,
-            Display_RefRecordType
+            Display_RefRecordType,
+            Display_DialogueType
         };
 
         int mColumnId;
diff --git a/apps/opencs/model/world/columnimp.hpp b/apps/opencs/model/world/columnimp.hpp
index a13ac9a8a9..eec0a41e2a 100644
--- a/apps/opencs/model/world/columnimp.hpp
+++ b/apps/opencs/model/world/columnimp.hpp
@@ -1284,6 +1284,33 @@ namespace CSMWorld
             return true;
         }
     };
+
+    template<typename ESXRecordT>
+    struct DialogueTypeColumn : public Column<ESXRecordT>
+    {
+        DialogueTypeColumn()
+        : Column<ESXRecordT> (Columns::ColumnId_DialogueType, ColumnBase::Display_DialogueType)
+        {}
+
+        virtual QVariant get (const Record<ESXRecordT>& record) const
+        {
+            return static_cast<int> (record.get().mType);
+        }
+
+        virtual void set (Record<ESXRecordT>& record, const QVariant& data)
+        {
+            ESXRecordT record2 = record.get();
+
+            record2.mType = data.toInt();
+
+            record.setModified (record2);
+        }
+
+        virtual bool isEditable() const
+        {
+            return false;
+        }
+    };
 }
 
 #endif
diff --git a/apps/opencs/model/world/columns.cpp b/apps/opencs/model/world/columns.cpp
index ca37840ad6..ae4136bd92 100644
--- a/apps/opencs/model/world/columns.cpp
+++ b/apps/opencs/model/world/columns.cpp
@@ -159,6 +159,7 @@ namespace CSMWorld
             { ColumnId_DoorPositionXRot, "Teleport Rot X" },
             { ColumnId_DoorPositionYRot, "Teleport Rot Y" },
             { ColumnId_DoorPositionZRot, "Teleport Rot Z" },
+            { ColumnId_DialogueType, "Dialogue Type" },
 
             { ColumnId_UseValue1, "Use value 1" },
             { ColumnId_UseValue2, "Use value 2" },
@@ -269,6 +270,11 @@ namespace
         "unknown", "none", "short", "integer", "long", "float", "string", 0
     };
 
+    static const char *sDialogueTypeEnums[] =
+    {
+        "Topic", "Voice", "Greeting", "Persuasion", 0
+    };
+
     const char **getEnumNames (CSMWorld::Columns::ColumnId column)
     {
         switch (column)
@@ -283,6 +289,7 @@ namespace
             case CSMWorld::Columns::ColumnId_WeaponType: return sWeaponTypes;
             case CSMWorld::Columns::ColumnId_Modification: return sModificationEnums;
             case CSMWorld::Columns::ColumnId_ValueType: return sVarTypeEnums;
+            case CSMWorld::Columns::ColumnId_DialogueType: return sDialogueTypeEnums;
 
             default: return 0;
         }
diff --git a/apps/opencs/model/world/columns.hpp b/apps/opencs/model/world/columns.hpp
index 9b26cac4c7..111931fa85 100644
--- a/apps/opencs/model/world/columns.hpp
+++ b/apps/opencs/model/world/columns.hpp
@@ -152,6 +152,7 @@ namespace CSMWorld
             ColumnId_DoorPositionXRot = 139,
             ColumnId_DoorPositionYRot = 140,
             ColumnId_DoorPositionZRot = 141,
+            ColumnId_DialogueType = 142,
 
             // Allocated to a separate value range, so we don't get a collision should we ever need
             // to extend the number of use values.
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 2af76cfa71..284e756f06 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -143,6 +143,7 @@ CSMWorld::Data::Data() : mRefs (mCells)
 
     mTopics.addColumn (new StringIdColumn<ESM::Dialogue>);
     mTopics.addColumn (new RecordStateColumn<ESM::Dialogue>);
+    mTopics.addColumn (new DialogueTypeColumn<ESM::Dialogue>);
 
     mJournals.addColumn (new StringIdColumn<ESM::Dialogue>);
     mJournals.addColumn (new RecordStateColumn<ESM::Dialogue>);
diff --git a/apps/opencs/view/doc/viewmanager.cpp b/apps/opencs/view/doc/viewmanager.cpp
index 83cd93e5dd..a4849795b2 100644
--- a/apps/opencs/view/doc/viewmanager.cpp
+++ b/apps/opencs/view/doc/viewmanager.cpp
@@ -74,7 +74,8 @@ CSVDoc::ViewManager::ViewManager (CSMDoc::DocumentManager& documentManager)
         { CSMWorld::ColumnBase::Display_ArmorType, CSMWorld::Columns::ColumnId_ArmorType, false },
         { CSMWorld::ColumnBase::Display_ClothingType, CSMWorld::Columns::ColumnId_ClothingType, false },
         { CSMWorld::ColumnBase::Display_CreatureType, CSMWorld::Columns::ColumnId_CreatureType, false },
-        { CSMWorld::ColumnBase::Display_WeaponType, CSMWorld::Columns::ColumnId_WeaponType, false }
+        { CSMWorld::ColumnBase::Display_WeaponType, CSMWorld::Columns::ColumnId_WeaponType, false },
+        { CSMWorld::ColumnBase::Display_DialogueType, CSMWorld::Columns::ColumnId_DialogueType, false }
     };
 
     for (std::size_t i=0; i<sizeof (sMapping)/sizeof (Mapping); ++i)