From 4724df7e9bb0c0dfbdca1b86022651ec8adf60bf Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sun, 3 Nov 2013 10:48:50 +0100
Subject: [PATCH] added topic/journal column to info tables

---
 apps/opencs/model/world/columnimp.hpp | 30 +++++++++++++++++++++++++++
 apps/opencs/model/world/columns.cpp   |  2 ++
 apps/opencs/model/world/columns.hpp   |  2 ++
 apps/opencs/model/world/data.cpp      |  2 ++
 4 files changed, 36 insertions(+)

diff --git a/apps/opencs/model/world/columnimp.hpp b/apps/opencs/model/world/columnimp.hpp
index dc80f6eeb4..5d9fe9a1b1 100644
--- a/apps/opencs/model/world/columnimp.hpp
+++ b/apps/opencs/model/world/columnimp.hpp
@@ -1395,6 +1395,36 @@ namespace CSMWorld
             return true;
         }
     };
+
+    template<typename ESXRecordT>
+    struct TopicColumn : public Column<ESXRecordT>
+    {
+        TopicColumn (bool journal) : Column<ESXRecordT> (journal ? Columns::ColumnId_Journal : Columns::ColumnId_Topic, ColumnBase::Display_String) {}
+
+        virtual QVariant get (const Record<ESXRecordT>& record) const
+        {
+            return QString::fromUtf8 (record.get().mTopicId.c_str());
+        }
+
+        virtual void set (Record<ESXRecordT>& record, const QVariant& data)
+        {
+            ESXRecordT record2 = record.get();
+
+            record2.mTopicId = data.toString().toUtf8().constData();
+
+            record.setModified (record2);
+        }
+
+        virtual bool isEditable() const
+        {
+            return true;
+        }
+
+        virtual bool isUserEditable() const
+        {
+            return false;
+        }
+    };
 }
 
 #endif
diff --git a/apps/opencs/model/world/columns.cpp b/apps/opencs/model/world/columns.cpp
index 307862b1bb..286afc64d4 100644
--- a/apps/opencs/model/world/columns.cpp
+++ b/apps/opencs/model/world/columns.cpp
@@ -163,6 +163,8 @@ namespace CSMWorld
             { ColumnId_QuestIndex, "Quest Index" },
             { ColumnId_QuestStatusType, "Quest Status" },
             { ColumnId_QuestDescription, "Quest Description" },
+            { ColumnId_Topic, "Topic" },
+            { ColumnId_Journal, "Journal", },
 
             { ColumnId_UseValue1, "Use value 1" },
             { ColumnId_UseValue2, "Use value 2" },
diff --git a/apps/opencs/model/world/columns.hpp b/apps/opencs/model/world/columns.hpp
index d7b96cab6b..6965d4c313 100644
--- a/apps/opencs/model/world/columns.hpp
+++ b/apps/opencs/model/world/columns.hpp
@@ -156,6 +156,8 @@ namespace CSMWorld
             ColumnId_QuestIndex = 143,
             ColumnId_QuestStatusType = 144,
             ColumnId_QuestDescription = 145,
+            ColumnId_Topic = 146,
+            ColumnId_Journal = 147,
 
             // 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 bfec13f909..88fb9fdedb 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -151,9 +151,11 @@ CSMWorld::Data::Data() : mRefs (mCells)
 
     mTopicInfos.addColumn (new StringIdColumn<Info>);
     mTopicInfos.addColumn (new RecordStateColumn<Info>);
+    mTopicInfos.addColumn (new TopicColumn<Info> (false));
 
     mJournalInfos.addColumn (new StringIdColumn<Info>);
     mJournalInfos.addColumn (new RecordStateColumn<Info>);
+    mJournalInfos.addColumn (new TopicColumn<Info> (true));
     mJournalInfos.addColumn (new QuestStatusTypeColumn<Info>);
     mJournalInfos.addColumn (new QuestIndexColumn<Info>);
     mJournalInfos.addColumn (new QuestDescriptionColumn<Info>);