sorting out some Display enum mixup

apps/opencs/model/world/columnbase.cpp

@@ -66,6 +66,7 @@ bool CSMWorld::ColumnBase::isId (Display display)
         Display_JournalInfo,
         Display_Scene,
         Display_GlobalVariable,
+        Display_Script,
 
         Display_Mesh,
         Display_Icon,
@@ -74,8 +75,6 @@ bool CSMWorld::ColumnBase::isId (Display display)
         Display_Texture,
         Display_Video,
 
-        Display_Id,
-        
         Display_None
     };
 
@@ -93,5 +92,5 @@ bool CSMWorld::ColumnBase::isText (Display display)
 
 bool CSMWorld::ColumnBase::isScript (Display display)
 {
-    return display==Display_Script || display==Display_ScriptLines;
+    return display==Display_ScriptFile || display==Display_ScriptLines;
 }

apps/opencs/model/world/columnbase.hpp

@@ -101,6 +101,7 @@ namespace CSMWorld
             Display_Texture,
             Display_Video,
             Display_Colour,
+            Display_ScriptFile,
             Display_ScriptLines, // console context
             Display_SoundGeneratorType,
             Display_School,

apps/opencs/model/world/columnimp.hpp

@@ -818,7 +818,7 @@ namespace CSMWorld
 
         ScriptColumn (Type type)
         : Column<ESXRecordT> (Columns::ColumnId_ScriptText,
-            type==Type_File ? ColumnBase::Display_Script : ColumnBase::Display_ScriptLines,
+            type==Type_File ? ColumnBase::Display_ScriptFile : ColumnBase::Display_ScriptLines,
             type==Type_File ? 0 : ColumnBase::Flag_Dialogue)
         {}
 

apps/opencs/model/world/refidcollection.cpp

@@ -40,7 +40,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
 {
     BaseColumns baseColumns;
 
-    mColumns.push_back (RefIdColumn (Columns::ColumnId_Id, ColumnBase::Display_String,
+    mColumns.push_back (RefIdColumn (Columns::ColumnId_Id, ColumnBase::Display_Id,
         ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue, false, false));
     baseColumns.mId = &mColumns.back();
     mColumns.push_back (RefIdColumn (Columns::ColumnId_Modification, ColumnBase::Display_RecordState,

apps/opencs/model/world/resourcetable.cpp

@@ -60,7 +60,7 @@ QVariant CSMWorld::ResourceTable::headerData (int section, Qt::Orientation orien
                 return Columns::getName (Columns::ColumnId_Id).c_str();
 
             if (role==ColumnBase::Role_Display)
-                return ColumnBase::Display_String;
+                return ColumnBase::Display_Id;
 
             break;
 

apps/opencs/view/world/scriptsubview.cpp

@@ -22,7 +22,7 @@ CSVWorld::ScriptSubView::ScriptSubView (const CSMWorld::UniversalId& id, CSMDoc:
 
     for (int i=0; i<mModel->columnCount(); ++i)
         if (mModel->headerData (i, Qt::Horizontal, CSMWorld::ColumnBase::Role_Display)==
-            CSMWorld::ColumnBase::Display_Script)
+            CSMWorld::ColumnBase::Display_ScriptFile)
         {
             mColumn = i;
             break;