From 828695f295e07cd9ece9cbc6333a83c49cf033b3 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 8 Feb 2013 14:48:38 +0100
Subject: [PATCH] added value column to gmst table

---
 apps/opencs/model/world/columnbase.hpp     |  3 +-
 apps/opencs/model/world/columns.hpp        | 41 +++++++++++++++++++++-
 apps/opencs/model/world/data.cpp           |  2 +-
 apps/opencs/view/world/dialoguesubview.cpp |  4 +++
 4 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/apps/opencs/model/world/columnbase.hpp b/apps/opencs/model/world/columnbase.hpp
index 38b73ee3f..f1871a6a9 100644
--- a/apps/opencs/model/world/columnbase.hpp
+++ b/apps/opencs/model/world/columnbase.hpp
@@ -28,7 +28,8 @@ namespace CSMWorld
         {
             Display_String,
             Display_Integer,
-            Display_Float
+            Display_Float,
+            Display_Var
         };
 
         std::string mTitle;
diff --git a/apps/opencs/model/world/columns.hpp b/apps/opencs/model/world/columns.hpp
index 747387676..fb94cbf59 100644
--- a/apps/opencs/model/world/columns.hpp
+++ b/apps/opencs/model/world/columns.hpp
@@ -95,7 +95,7 @@ namespace CSMWorld
     template<typename ESXRecordT>
     struct VarTypeColumn : public Column<ESXRecordT>
     {
-        VarTypeColumn() : Column<ESXRecordT> ("Type", ColumnBase::Display_Float) {}
+        VarTypeColumn() : Column<ESXRecordT> ("Type", ColumnBase::Display_Integer) {}
 
         virtual QVariant get (const Record<ESXRecordT>& record) const
         {
@@ -114,6 +114,45 @@ namespace CSMWorld
             return true;
         }
     };
+
+    template<typename ESXRecordT>
+    struct VarValueColumn : public Column<ESXRecordT>
+    {
+        VarValueColumn() : Column<ESXRecordT> ("Value", ColumnBase::Display_Var) {}
+
+        virtual QVariant get (const Record<ESXRecordT>& record) const
+        {
+            switch (record.get().mType)
+            {
+                case ESM::VT_String: return record.get().mStr.c_str(); break;
+                case ESM::VT_Int: return record.get().mI; break;
+                case ESM::VT_Float: return record.get().mF; break;
+
+                default: return QVariant();
+            }
+        }
+
+        virtual void set (Record<ESXRecordT>& record, const QVariant& data)
+        {
+            ESXRecordT base = record.getBase();
+
+            switch (record.get().mType)
+            {
+                case ESM::VT_String: base.mStr = data.toString().toUtf8().constData(); break;
+                case ESM::VT_Int: base.mI = data.toInt(); break;
+                case ESM::VT_Float: base.mF = data.toFloat(); break;
+
+                default: break;
+            }
+
+            record.setModified (base);
+        }
+
+        virtual bool isEditable() const
+        {
+            return true;
+        }
+    };
 }
 
 #endif
\ No newline at end of file
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 69e62db01..f120c75f1 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -32,7 +32,7 @@ CSMWorld::Data::Data()
     mGmsts.addColumn (new RecordStateColumn<ESM::GameSetting>);
     mGmsts.addColumn (new FixedRecordTypeColumn<ESM::GameSetting> (UniversalId::Type_Gmst));
     mGmsts.addColumn (new VarTypeColumn<ESM::GameSetting>);
-    ///< \todo add value
+    mGmsts.addColumn (new VarValueColumn<ESM::GameSetting>);
 
     addModel (new IdTable (&mGlobals), UniversalId::Type_Globals, UniversalId::Type_Global);
     addModel (new IdTable (&mGmsts), UniversalId::Type_Gmsts, UniversalId::Type_Gmst);
diff --git a/apps/opencs/view/world/dialoguesubview.cpp b/apps/opencs/view/world/dialoguesubview.cpp
index 2bf6577b1..e16de99ef 100644
--- a/apps/opencs/view/world/dialoguesubview.cpp
+++ b/apps/opencs/view/world/dialoguesubview.cpp
@@ -64,6 +64,8 @@ CSVWorld::DialogueSubView::DialogueSubView (const CSMWorld::UniversalId& id, CSM
                         /// \todo configure widget properly (range, format?)
                         layout->addWidget (widget = new QDoubleSpinBox, i, 1);
                         break;
+
+                    default: break; // silence warnings for other times for now
                 }
             }
             else
@@ -76,6 +78,8 @@ CSVWorld::DialogueSubView::DialogueSubView (const CSMWorld::UniversalId& id, CSM
 
                         layout->addWidget (widget = new QLabel, i, 1);
                         break;
+
+                    default: break; // silence warnings for other times for now
                 }
             }