From 4487bda702da64a34913219ccf22a318e0545a21 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 26 Jun 2015 18:19:00 +0200
Subject: [PATCH] size limits for meta data strings

---
 apps/opencs/model/world/columnbase.cpp |  3 ++-
 apps/opencs/model/world/columnbase.hpp |  2 ++
 apps/opencs/model/world/columnimp.hpp  |  4 ++--
 apps/opencs/view/world/util.cpp        | 16 ++++++++++++++++
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/apps/opencs/model/world/columnbase.cpp b/apps/opencs/model/world/columnbase.cpp
index 938503875..f209e48c6 100644
--- a/apps/opencs/model/world/columnbase.cpp
+++ b/apps/opencs/model/world/columnbase.cpp
@@ -100,7 +100,8 @@ bool CSMWorld::ColumnBase::isId (Display display)
 
 bool CSMWorld::ColumnBase::isText (Display display)
 {
-    return display==Display_String || display==Display_LongString;
+    return display==Display_String || display==Display_LongString ||
+        display==Display_String32 || display==Display_LongString256;
 }
 
 bool CSMWorld::ColumnBase::isScript (Display display)
diff --git a/apps/opencs/model/world/columnbase.hpp b/apps/opencs/model/world/columnbase.hpp
index 789823d5c..59f2836c2 100644
--- a/apps/opencs/model/world/columnbase.hpp
+++ b/apps/opencs/model/world/columnbase.hpp
@@ -123,6 +123,8 @@ namespace CSMWorld
             Display_InfoCondVar,
             Display_InfoCondComp,
             Display_RaceSkill,
+            Display_String32,
+            Display_LongString256,
 
             //top level columns that nest other columns
             Display_NestedHeader
diff --git a/apps/opencs/model/world/columnimp.hpp b/apps/opencs/model/world/columnimp.hpp
index ba23a3603..15dd2c15b 100644
--- a/apps/opencs/model/world/columnimp.hpp
+++ b/apps/opencs/model/world/columnimp.hpp
@@ -2331,7 +2331,7 @@ namespace CSMWorld
     struct AuthorColumn : public Column<ESXRecordT>
     {
         AuthorColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_Author, ColumnBase::Display_String)
+        : Column<ESXRecordT> (Columns::ColumnId_Author, ColumnBase::Display_String32)
         {}
 
         virtual QVariant get (const Record<ESXRecordT>& record) const
@@ -2358,7 +2358,7 @@ namespace CSMWorld
     struct FileDescriptionColumn : public Column<ESXRecordT>
     {
         FileDescriptionColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_FileDescription, ColumnBase::Display_LongString)
+        : Column<ESXRecordT> (Columns::ColumnId_FileDescription, ColumnBase::Display_LongString256)
         {}
 
         virtual QVariant get (const Record<ESXRecordT>& record) const
diff --git a/apps/opencs/view/world/util.cpp b/apps/opencs/view/world/util.cpp
index 62cde4608..f21658581 100644
--- a/apps/opencs/view/world/util.cpp
+++ b/apps/opencs/view/world/util.cpp
@@ -232,6 +232,14 @@ QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleO
             return edit;
         }
 
+        case CSMWorld::ColumnBase::Display_LongString256:
+        {
+            /// \todo implement size limit. QPlainTextEdit does not support a size limit.
+            QPlainTextEdit *edit = new QPlainTextEdit(parent);
+            edit->setUndoRedoEnabled (false);
+            return edit;
+        }
+        
         case CSMWorld::ColumnBase::Display_Boolean:
 
             return new QCheckBox(parent);
@@ -245,6 +253,14 @@ QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleO
 
             return new CSVWidget::DropLineEdit(display, parent);
 
+        case CSMWorld::ColumnBase::Display_String32:
+        {
+        // For other Display types (that represent record IDs) with drop support IdCompletionDelegate is used
+            CSVWidget::DropLineEdit *widget = new CSVWidget::DropLineEdit(display, parent);
+            widget->setMaxLength (32);
+            return widget;
+        }
+            
         default:
 
             return QStyledItemDelegate::createEditor (parent, option, index);