Merge branch 'resources'

apps/opencs/CMakeLists.txt

@@ -18,13 +18,13 @@ opencs_hdrs_noqt (model/doc
 
 
 opencs_units (model/world
-    idtable idtableproxymodel regionmap data commanddispatcher
+    idtable idtableproxymodel regionmap data commanddispatcher idtablebase resourcetable
     )
 
 
 opencs_units_noqt (model/world
     universalid record commands columnbase scriptcontext cell refidcollection
-    refidadapter refiddata refidadapterimp ref collectionbase refcollection columns infocollection tablemimedata cellcoordinates cellselection
+    refidadapter refiddata refidadapterimp ref collectionbase refcollection columns infocollection tablemimedata cellcoordinates cellselection resources resourcesmanager
     )
 
 opencs_hdrs_noqt (model/world

apps/opencs/editor.cpp

@@ -35,6 +35,8 @@ CS::Editor::Editor (OgreInit::OgreInit& ogreInit)
     Bsa::registerResources (Files::Collections (config.first, !mFsStrict), config.second, true,
         mFsStrict);
 
+    mDocumentManager.listResources();
+
     mNewGame.setLocalData (mLocal);
     mFileDialog.setLocalData (mLocal);
 

apps/opencs/model/doc/document.cpp

@@ -2205,9 +2205,9 @@ void CSMDoc::Document::createBase()
 CSMDoc::Document::Document (const Files::ConfigurationManager& configuration,
     const std::vector< boost::filesystem::path >& files, bool new_,
     const boost::filesystem::path& savePath, const boost::filesystem::path& resDir,
-    ToUTF8::FromType encoding)
+    ToUTF8::FromType encoding, const CSMWorld::ResourcesManager& resourcesManager)
-: mSavePath (savePath), mContentFiles (files), mNew (new_), mData (encoding), mTools (mData),
+: mSavePath (savePath), mContentFiles (files), mNew (new_), mData (encoding, resourcesManager),
-  mResDir(resDir),
+  mTools (mData), mResDir(resDir),
   mProjectPath ((configuration.getUserDataPath() / "projects") /
   (savePath.filename().string() + ".project")),
   mSaving (*this, mProjectPath, encoding)

apps/opencs/model/doc/document.hpp

@@ -31,6 +31,11 @@ namespace Files
     class ConfigurationManager;
 }
 
+namespace CSMWorld
+{
+    class ResourcesManager;
+}
+
 namespace CSMDoc
 {
     class Document : public QObject
@@ -73,7 +78,7 @@ namespace CSMDoc
             Document (const Files::ConfigurationManager& configuration,
                 const std::vector< boost::filesystem::path >& files, bool new_,
                 const boost::filesystem::path& savePath, const boost::filesystem::path& resDir,
-                ToUTF8::FromType encoding);
+                ToUTF8::FromType encoding, const CSMWorld::ResourcesManager& resourcesManager);
 
             ~Document();
 

apps/opencs/model/doc/documentmanager.cpp

@@ -52,7 +52,7 @@ CSMDoc::DocumentManager::~DocumentManager()
 void CSMDoc::DocumentManager::addDocument (const std::vector<boost::filesystem::path>& files, const boost::filesystem::path& savePath,
     bool new_)
 {
-    Document *document = new Document (mConfiguration, files, new_, savePath, mResDir, mEncoding);
+    Document *document = new Document (mConfiguration, files, new_, savePath, mResDir, mEncoding, mResourcesManager);
 
     mDocuments.push_back (document);
 
@@ -85,6 +85,11 @@ void CSMDoc::DocumentManager::setEncoding (ToUTF8::FromType encoding)
     mEncoding = encoding;
 }
 
+void CSMDoc::DocumentManager::listResources()
+{
+    mResourcesManager.listResources();
+}
+
 void CSMDoc::DocumentManager::documentLoaded (Document *document)
 {
     emit documentAdded (document);

apps/opencs/model/doc/documentmanager.hpp

@@ -11,6 +11,8 @@
 
 #include <components/to_utf8/to_utf8.hpp>
 
+#include "../world/resourcesmanager.hpp"
+
 #include "loader.hpp"
 
 namespace Files
@@ -31,6 +33,7 @@ namespace CSMDoc
             QThread mLoaderThread;
             Loader mLoader;
             ToUTF8::FromType mEncoding;
+            CSMWorld::ResourcesManager mResourcesManager;
 
             DocumentManager (const DocumentManager&);
             DocumentManager& operator= (const DocumentManager&);
@@ -50,6 +53,9 @@ namespace CSMDoc
 
             void setEncoding (ToUTF8::FromType encoding);
 
+            /// Ask OGRE for a list of available resources.
+            void listResources();
+
         private:
 
 	    boost::filesystem::path mResDir;

apps/opencs/model/filter/andnode.cpp

@@ -7,7 +7,7 @@ CSMFilter::AndNode::AndNode (const std::vector<boost::shared_ptr<Node> >& nodes)
 : NAryNode (nodes, "and")
 {}
 
-bool CSMFilter::AndNode::test (const CSMWorld::IdTable& table, int row,
+bool CSMFilter::AndNode::test (const CSMWorld::IdTableBase& table, int row,
     const std::map<int, int>& columns) const
 {
     int size = getSize();

apps/opencs/model/filter/andnode.hpp

@@ -11,7 +11,7 @@ namespace CSMFilter
 
             AndNode (const std::vector<boost::shared_ptr<Node> >& nodes);
 
-            virtual bool test (const CSMWorld::IdTable& table, int row,
+            virtual bool test (const CSMWorld::IdTableBase& table, int row,
                 const std::map<int, int>& columns) const;
             ///< \return Can the specified table row pass through to filter?
             /// \param columns column ID to column index mapping

apps/opencs/model/filter/booleannode.cpp

@@ -3,7 +3,7 @@
 
 CSMFilter::BooleanNode::BooleanNode (bool true_) : mTrue (true_) {}
 
-bool CSMFilter::BooleanNode::test (const CSMWorld::IdTable& table, int row,
+bool CSMFilter::BooleanNode::test (const CSMWorld::IdTableBase& table, int row,
     const std::map<int, int>& columns) const
 {
     return mTrue;

apps/opencs/model/filter/booleannode.hpp

@@ -13,7 +13,7 @@ namespace CSMFilter
 
             BooleanNode (bool true_);
 
-            virtual bool test (const CSMWorld::IdTable& table, int row,
+            virtual bool test (const CSMWorld::IdTableBase& table, int row,
                 const std::map<int, int>& columns) const;
             ///< \return Can the specified table row pass through to filter?
             /// \param columns column ID to column index mapping

apps/opencs/model/filter/node.hpp

@@ -11,7 +11,7 @@
 
 namespace CSMWorld
 {
-    class IdTable;
+    class IdTableBase;
 }
 
 namespace CSMFilter
@@ -32,7 +32,7 @@ namespace CSMFilter
 
             virtual ~Node();
 
-            virtual bool test (const CSMWorld::IdTable& table, int row,
+            virtual bool test (const CSMWorld::IdTableBase& table, int row,
                 const std::map<int, int>& columns) const = 0;
             ///< \return Can the specified table row pass through to filter?
             /// \param columns column ID to column index mapping

apps/opencs/model/filter/notnode.cpp

@@ -3,7 +3,7 @@
 
 CSMFilter::NotNode::NotNode (boost::shared_ptr<Node> child) : UnaryNode (child, "not") {}
 
-bool CSMFilter::NotNode::test (const CSMWorld::IdTable& table, int row,
+bool CSMFilter::NotNode::test (const CSMWorld::IdTableBase& table, int row,
     const std::map<int, int>& columns) const
 {
     return !getChild().test (table, row, columns);

apps/opencs/model/filter/notnode.hpp

@@ -11,7 +11,7 @@ namespace CSMFilter
 
             NotNode (boost::shared_ptr<Node> child);
 
-            virtual bool test (const CSMWorld::IdTable& table, int row,
+            virtual bool test (const CSMWorld::IdTableBase& table, int row,
                 const std::map<int, int>& columns) const;
             ///< \return Can the specified table row pass through to filter?
             /// \param columns column ID to column index mapping

apps/opencs/model/filter/ornode.cpp

@@ -7,7 +7,7 @@ CSMFilter::OrNode::OrNode (const std::vector<boost::shared_ptr<Node> >& nodes)
 : NAryNode (nodes, "or")
 {}
 
-bool CSMFilter::OrNode::test (const CSMWorld::IdTable& table, int row,
+bool CSMFilter::OrNode::test (const CSMWorld::IdTableBase& table, int row,
     const std::map<int, int>& columns) const
 {
     int size = getSize();

apps/opencs/model/filter/ornode.hpp

@@ -11,7 +11,7 @@ namespace CSMFilter
 
             OrNode (const std::vector<boost::shared_ptr<Node> >& nodes);
 
-            virtual bool test (const CSMWorld::IdTable& table, int row,
+            virtual bool test (const CSMWorld::IdTableBase& table, int row,
                 const std::map<int, int>& columns) const;
             ///< \return Can the specified table row pass through to filter?
             /// \param columns column ID to column index mapping

apps/opencs/model/filter/textnode.cpp

@@ -7,13 +7,13 @@
 #include <QRegExp>
 
 #include "../world/columns.hpp"
-#include "../world/idtable.hpp"
+#include "../world/idtablebase.hpp"
 
 CSMFilter::TextNode::TextNode (int columnId, const std::string& text)
 : mColumnId (columnId), mText (text)
 {}
 
-bool CSMFilter::TextNode::test (const CSMWorld::IdTable& table, int row,
+bool CSMFilter::TextNode::test (const CSMWorld::IdTableBase& table, int row,
     const std::map<int, int>& columns) const
 {
     const std::map<int, int>::const_iterator iter = columns.find (mColumnId);

apps/opencs/model/filter/textnode.hpp

@@ -14,7 +14,7 @@ namespace CSMFilter
 
             TextNode (int columnId, const std::string& text);
 
-            virtual bool test (const CSMWorld::IdTable& table, int row,
+            virtual bool test (const CSMWorld::IdTableBase& table, int row,
                 const std::map<int, int>& columns) const;
             ///< \return Can the specified table row pass through to filter?
             /// \param columns column ID to column index mapping

apps/opencs/model/filter/valuenode.cpp

@@ -5,13 +5,13 @@
 #include <stdexcept>
 
 #include "../world/columns.hpp"
-#include "../world/idtable.hpp"
+#include "../world/idtablebase.hpp"
 
 CSMFilter::ValueNode::ValueNode (int columnId, Type lowerType, Type upperType,
     double lower, double upper)
 : mColumnId (columnId), mLowerType (lowerType), mUpperType (upperType), mLower (lower), mUpper (upper){}
 
-bool CSMFilter::ValueNode::test (const CSMWorld::IdTable& table, int row,
+bool CSMFilter::ValueNode::test (const CSMWorld::IdTableBase& table, int row,
     const std::map<int, int>& columns) const
 {
     const std::map<int, int>::const_iterator iter = columns.find (mColumnId);

apps/opencs/model/filter/valuenode.hpp

@@ -27,7 +27,7 @@ namespace CSMFilter
 
             ValueNode (int columnId, Type lowerType, Type upperType, double lower, double upper);
 
-            virtual bool test (const CSMWorld::IdTable& table, int row,
+            virtual bool test (const CSMWorld::IdTableBase& table, int row,
                 const std::map<int, int>& columns) const;
             ///< \return Can the specified table row pass through to filter?
             /// \param columns column ID to column index mapping

apps/opencs/model/world/columnbase.hpp

@@ -92,7 +92,14 @@ namespace CSMWorld
             Display_EnchantmentType,
             Display_BodyPartType,
             Display_MeshType,
-            Display_Gender
+            Display_Gender,
+            Display_Mesh,
+            Display_Icon,
+            Display_Music,
+            Display_SoundRes,
+            Display_Texture,
+            Display_Video,
+            Display_Colour
         };
 
         int mColumnId;

apps/opencs/model/world/columnimp.hpp

@@ -604,7 +604,7 @@ namespace CSMWorld
     struct SoundFileColumn : public Column<ESXRecordT>
     {
         SoundFileColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_SoundFile, ColumnBase::Display_Sound)
+        : Column<ESXRecordT> (Columns::ColumnId_SoundFile, ColumnBase::Display_SoundRes)
         {}
 
         virtual QVariant get (const Record<ESXRecordT>& record) const
@@ -634,7 +634,7 @@ namespace CSMWorld
     {
         /// \todo Replace Display_Integer with something that displays the colour value more directly.
         MapColourColumn()
-        : Column<ESXRecordT> (Columns::ColumnId_MapColour, ColumnBase::Display_Integer)
+        : Column<ESXRecordT> (Columns::ColumnId_MapColour, ColumnBase::Display_Colour)
         {}
 
         virtual QVariant get (const Record<ESXRecordT>& record) const

apps/opencs/model/world/data.cpp

@@ -15,6 +15,8 @@
 #include "columnimp.hpp"
 #include "regionmap.hpp"
 #include "columns.hpp"
+#include "resourcesmanager.hpp"
+#include "resourcetable.hpp"
 
 void CSMWorld::Data::addModel (QAbstractItemModel *model, UniversalId::Type type, bool update)
 {
@@ -56,8 +58,9 @@ int CSMWorld::Data::count (RecordBase::State state, const CollectionBase& collec
     return number;
 }
 
-CSMWorld::Data::Data (ToUTF8::FromType encoding)
+CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourcesManager)
-: mEncoder (encoding), mRefs (mCells), mReader (0), mDialogue (0)
+: mEncoder (encoding), mRefs (mCells), mResourcesManager (resourcesManager), mReader (0),
+  mDialogue (0)
 {
     mGlobals.addColumn (new StringIdColumn<ESM::Global>);
     mGlobals.addColumn (new RecordStateColumn<ESM::Global>);
@@ -277,6 +280,18 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding)
         UniversalId::Type_Referenceable);
     addModel (new IdTable (&mRefs, IdTable::Feature_ViewCell | IdTable::Feature_Preview), UniversalId::Type_Reference);
     addModel (new IdTable (&mFilters), UniversalId::Type_Filter);
+    addModel (new ResourceTable (&mResourcesManager.get (UniversalId::Type_Mesh)),
+        UniversalId::Type_Mesh);
+    addModel (new ResourceTable (&mResourcesManager.get (UniversalId::Type_Icon)),
+        UniversalId::Type_Icon);
+    addModel (new ResourceTable (&mResourcesManager.get (UniversalId::Type_Music)),
+        UniversalId::Type_Music);
+    addModel (new ResourceTable (&mResourcesManager.get (UniversalId::Type_SoundRes)),
+        UniversalId::Type_SoundRes);
+    addModel (new ResourceTable (&mResourcesManager.get (UniversalId::Type_Texture)),
+        UniversalId::Type_Texture);
+    addModel (new ResourceTable (&mResourcesManager.get (UniversalId::Type_Video)),
+        UniversalId::Type_Video);
 }
 
 CSMWorld::Data::~Data()
@@ -498,6 +513,11 @@ CSMWorld::IdCollection<ESM::BodyPart>& CSMWorld::Data::getBodyParts()
     return mBodyParts;
 }
 
+const CSMWorld::Resources& CSMWorld::Data::getResources (const UniversalId& id) const
+{
+    return mResourcesManager.get (UniversalId::getParentType (id.getType()));
+}
+
 QAbstractItemModel *CSMWorld::Data::getTableModel (const CSMWorld::UniversalId& id)
 {
     std::map<UniversalId::Type, QAbstractItemModel *>::iterator iter = mModelIndex.find (id.getType());

apps/opencs/model/world/data.hpp

@@ -47,6 +47,9 @@ namespace ESM
 
 namespace CSMWorld
 {
+    class ResourcesManager;
+    class Resources;
+
     class Data : public QObject
     {
             Q_OBJECT
@@ -73,6 +76,7 @@ namespace CSMWorld
             RefIdCollection mReferenceables;
             RefCollection mRefs;
             IdCollection<CSMFilter::Filter> mFilters;
+            const ResourcesManager& mResourcesManager;
             std::vector<QAbstractItemModel *> mModels;
             std::map<UniversalId::Type, QAbstractItemModel *> mModelIndex;
             std::string mAuthor;
@@ -98,7 +102,7 @@ namespace CSMWorld
 
         public:
 
-            Data (ToUTF8::FromType encoding);
+            Data (ToUTF8::FromType encoding, const ResourcesManager& resourcesManager);
 
             virtual ~Data();
 
@@ -186,6 +190,9 @@ namespace CSMWorld
 
             IdCollection<ESM::BodyPart>& getBodyParts();
 
+            /// Throws an exception, if \a id does not match a resources list.
+            const Resources& getResources (const UniversalId& id) const;
+
             QAbstractItemModel *getTableModel (const UniversalId& id);
             ///< If no table model is available for \a id, an exception is thrown.
             ///

apps/opencs/model/world/idtable.cpp

@@ -5,7 +5,7 @@
 #include "columnbase.hpp"
 
 CSMWorld::IdTable::IdTable (CollectionBase *idCollection, unsigned int features)
-: mIdCollection (idCollection), mFeatures (features)
+: IdTableBase (features), mIdCollection (idCollection)
 {}
 
 CSMWorld::IdTable::~IdTable()
@@ -185,17 +185,12 @@ void CSMWorld::IdTable::reorderRows (int baseIndex, const std::vector<int>& newO
                 index (baseIndex+newOrder.size()-1, mIdCollection->getColumns()-1));
 }
 
-unsigned int CSMWorld::IdTable::getFeatures() const
-{
-    return mFeatures;
-}
-
 std::pair<CSMWorld::UniversalId, std::string> CSMWorld::IdTable::view (int row) const
 {
     std::string id;
     std::string hint;
 
-    if (mFeatures & Feature_ViewCell)
+    if (getFeatures() & Feature_ViewCell)
     {
         int cellColumn = mIdCollection->searchColumnIndex (Columns::ColumnId_Cell);
         int idColumn = mIdCollection->searchColumnIndex (Columns::ColumnId_Id);
@@ -206,7 +201,7 @@ std::pair<CSMWorld::UniversalId, std::string> CSMWorld::IdTable::view (int row)
             hint = "r:" + std::string (mIdCollection->getData (row, idColumn).toString().toUtf8().constData());
         }
     }
-    else if (mFeatures & Feature_ViewId)
+    else if (getFeatures() & Feature_ViewId)
     {
         int column = mIdCollection->searchColumnIndex (Columns::ColumnId_Id);
 
@@ -226,6 +221,11 @@ std::pair<CSMWorld::UniversalId, std::string> CSMWorld::IdTable::view (int row)
     return std::make_pair (UniversalId (UniversalId::Type_Scene, id), hint);
 }
 
+bool CSMWorld::IdTable::isDeleted (const std::string& id) const
+{
+    return getRecord (id).isDeleted();
+}
+
 int CSMWorld::IdTable::getColumnId(int column) const
 {
     return mIdCollection->getColumn(column).getId();

apps/opencs/model/world/idtable.hpp

@@ -3,8 +3,7 @@
 
 #include <vector>
 
-#include <QAbstractItemModel>
+#include "idtablebase.hpp"
-
 #include "universalid.hpp"
 #include "columns.hpp"
 
@@ -13,34 +12,13 @@ namespace CSMWorld
     class CollectionBase;
     class RecordBase;
 
-    class IdTable : public QAbstractItemModel
+    class IdTable : public IdTableBase
     {
             Q_OBJECT
 
-        public:
-
-            enum Features
-            {
-                Feature_ReorderWithinTopic = 1,
-
-                /// Use ID column to generate view request (ID is transformed into
-                /// worldspace and original ID is passed as hint with c: prefix).
-                Feature_ViewId = 2,
-
-                /// Use cell column to generate view request (cell ID is transformed
-                /// into worldspace and record ID is passed as hint with r: prefix).
-                Feature_ViewCell = 4,
-
-                Feature_View = Feature_ViewId | Feature_ViewCell,
-
-                Feature_Preview = 8
-            };
-
         private:
 
             CollectionBase *mIdCollection;
-            unsigned int mFeatures;
-            bool mPreview;
 
             // not implemented
             IdTable (const IdTable&);
@@ -79,17 +57,17 @@ namespace CSMWorld
                              const std::string& destination,
                              UniversalId::Type type = UniversalId::Type_None);
 
-            QModelIndex getModelIndex (const std::string& id, int column) const;
+            virtual QModelIndex getModelIndex (const std::string& id, int column) const;
 
             void setRecord (const std::string& id, const RecordBase& record);
             ///< Add record or overwrite existing recrod.
 
             const RecordBase& getRecord (const std::string& id) const;
 
-            int searchColumnIndex (Columns::ColumnId id) const;
+            virtual int searchColumnIndex (Columns::ColumnId id) const;
             ///< Return index of column with the given \a id. If no such column exists, -1 is returned.
 
-            int findColumnIndex (Columns::ColumnId id) const;
+            virtual int findColumnIndex (Columns::ColumnId id) const;
             ///< Return index of column with the given \a id. If no such column exists, an exception is
             /// thrown.
 
@@ -97,12 +75,13 @@ namespace CSMWorld
             ///< Reorder the rows [baseIndex, baseIndex+newOrder.size()) according to the indices
             /// given in \a newOrder (baseIndex+newOrder[0] specifies the new index of row baseIndex).
 
-            unsigned int getFeatures() const;
+            virtual std::pair<UniversalId, std::string> view (int row) const;
-
-            std::pair<UniversalId, std::string> view (int row) const;
             ///< Return the UniversalId and the hint for viewing \a row. If viewing is not
             /// supported by this table, return (UniversalId::Type_None, "").
 
+            /// Is \a id flagged as deleted?
+            virtual bool isDeleted (const std::string& id) const;
+
             int getColumnId(int column) const;
     };
 }

apps/opencs/model/world/idtablebase.cpp

@@ -0,0 +1,9 @@
+
+#include "idtablebase.hpp"
+
+CSMWorld::IdTableBase::IdTableBase (unsigned int features) : mFeatures (features) {}
+
+unsigned int CSMWorld::IdTableBase::getFeatures() const
+{
+    return mFeatures;
+}

apps/opencs/model/world/idtablebase.hpp

@@ -0,0 +1,67 @@
+#ifndef CSM_WOLRD_IDTABLEBASE_H
+#define CSM_WOLRD_IDTABLEBASE_H
+
+#include <QAbstractItemModel>
+
+#include "columns.hpp"
+
+namespace CSMWorld
+{
+    class UniversalId;
+
+    class IdTableBase : public QAbstractItemModel
+    {
+            Q_OBJECT
+
+        public:
+
+            enum Features
+            {
+                Feature_ReorderWithinTopic = 1,
+
+                /// Use ID column to generate view request (ID is transformed into
+                /// worldspace and original ID is passed as hint with c: prefix).
+                Feature_ViewId = 2,
+
+                /// Use cell column to generate view request (cell ID is transformed
+                /// into worldspace and record ID is passed as hint with r: prefix).
+                Feature_ViewCell = 4,
+
+                Feature_View = Feature_ViewId | Feature_ViewCell,
+
+                Feature_Preview = 8,
+
+                /// Table can not be modified through ordinary means.
+                Feature_Constant = 16
+            };
+
+        private:
+
+            unsigned int mFeatures;
+
+        public:
+
+            IdTableBase (unsigned int features);
+
+            virtual QModelIndex getModelIndex (const std::string& id, int column) const = 0;
+
+            /// Return index of column with the given \a id. If no such column exists, -1 is
+            /// returned.
+            virtual int searchColumnIndex (Columns::ColumnId id) const = 0;
+
+            /// Return index of column with the given \a id. If no such column exists, an
+            /// exception is thrown.
+            virtual int findColumnIndex (Columns::ColumnId id) const = 0;
+
+            /// Return the UniversalId and the hint for viewing \a row. If viewing is not
+            /// supported by this table, return (UniversalId::Type_None, "").
+            virtual std::pair<UniversalId, std::string> view (int row) const = 0;
+
+            /// Is \a id flagged as deleted?
+            virtual bool isDeleted (const std::string& id) const = 0;
+
+            unsigned int getFeatures() const;
+    };
+}
+
+#endif

apps/opencs/model/world/idtableproxymodel.cpp

@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "idtable.hpp"
+#include "idtablebase.hpp"
 
 void CSMWorld::IdTableProxyModel::updateColumnMap()
 {
@@ -13,7 +13,7 @@ void CSMWorld::IdTableProxyModel::updateColumnMap()
     {
         std::vector<int> columns = mFilter->getReferencedColumns();
 
-        const IdTable& table = dynamic_cast<const IdTable&> (*sourceModel());
+        const IdTableBase& table = dynamic_cast<const IdTableBase&> (*sourceModel());
 
         for (std::vector<int>::const_iterator iter (columns.begin()); iter!=columns.end(); ++iter)
             mColumnMap.insert (std::make_pair (*iter,
@@ -28,7 +28,7 @@ bool CSMWorld::IdTableProxyModel::filterAcceptsRow (int sourceRow, const QModelI
         return true;
 
     return mFilter->test (
-        dynamic_cast<IdTable&> (*sourceModel()), sourceRow, mColumnMap);
+        dynamic_cast<IdTableBase&> (*sourceModel()), sourceRow, mColumnMap);
 }
 
 CSMWorld::IdTableProxyModel::IdTableProxyModel (QObject *parent)
@@ -39,7 +39,7 @@ CSMWorld::IdTableProxyModel::IdTableProxyModel (QObject *parent)
 
 QModelIndex CSMWorld::IdTableProxyModel::getModelIndex (const std::string& id, int column) const
 {
-    return mapFromSource (dynamic_cast<IdTable&> (*sourceModel()).getModelIndex (id, column));
+    return mapFromSource (dynamic_cast<IdTableBase&> (*sourceModel()).getModelIndex (id, column));
 }
 
 void CSMWorld::IdTableProxyModel::setFilter (const boost::shared_ptr<CSMFilter::Node>& filter)

apps/opencs/model/world/refidcollection.cpp

@@ -52,7 +52,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
 
     ModelColumns modelColumns (baseColumns);
 
-    mColumns.push_back (RefIdColumn (Columns::ColumnId_Model, ColumnBase::Display_String));
+    mColumns.push_back (RefIdColumn (Columns::ColumnId_Model, ColumnBase::Display_Mesh));
     modelColumns.mModel = &mColumns.back();
 
     NameColumns nameColumns (modelColumns);
@@ -64,7 +64,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
 
     InventoryColumns inventoryColumns (nameColumns);
 
-    mColumns.push_back (RefIdColumn (Columns::ColumnId_Icon, ColumnBase::Display_String));
+    mColumns.push_back (RefIdColumn (Columns::ColumnId_Icon, ColumnBase::Display_Icon));
     inventoryColumns.mIcon = &mColumns.back();
     mColumns.push_back (RefIdColumn (Columns::ColumnId_Weight, ColumnBase::Display_Float));
     inventoryColumns.mWeight = &mColumns.back();

apps/opencs/model/world/resources.cpp

@@ -0,0 +1,103 @@
+
+#include "resources.hpp"
+
+#include <sstream>
+#include <stdexcept>
+
+#include <OgreResourceGroupManager.h>
+
+#include <components/misc/stringops.hpp>
+
+CSMWorld::Resources::Resources (const std::string& baseDirectory, UniversalId::Type type,
+    const char * const *extensions)
+: mBaseDirectory (baseDirectory), mType (type)
+{
+    int baseSize = mBaseDirectory.size();
+
+    Ogre::StringVector resourcesGroups =
+        Ogre::ResourceGroupManager::getSingleton().getResourceGroups();
+
+    for (Ogre::StringVector::iterator iter (resourcesGroups.begin());
+        iter!=resourcesGroups.end(); ++iter)
+    {
+        if (*iter=="General" || *iter=="Internal" || *iter=="Autodetect")
+            continue;
+
+        Ogre::StringVectorPtr resources =
+            Ogre::ResourceGroupManager::getSingleton().listResourceNames (*iter);
+
+        for (Ogre::StringVector::const_iterator iter (resources->begin());
+            iter!=resources->end(); ++iter)
+        {
+            if (static_cast<int> (iter->size())<baseSize+1 ||
+                iter->substr (0, baseSize)!=mBaseDirectory ||
+                ((*iter)[baseSize]!='/' && (*iter)[baseSize]!='\\'))
+                continue;
+
+            if (extensions)
+            {
+                std::string::size_type index = iter->find_last_of ('.');
+
+                if (index==std::string::npos)
+                    continue;
+
+                std::string extension = iter->substr (index+1);
+
+                int i = 0;
+
+                for (; extensions[i]; ++i)
+                    if (extensions[i]==extension)
+                        break;
+
+                if (!extensions[i])
+                    continue;
+            }
+
+            std::string file = iter->substr (baseSize+1);
+            mFiles.push_back (file);
+            mIndex.insert (std::make_pair (file, static_cast<int> (mFiles.size())-1));
+        }
+    }
+}
+
+int CSMWorld::Resources::getSize() const
+{
+    return mFiles.size();
+}
+
+std::string CSMWorld::Resources::getId (int index) const
+{
+    return mFiles.at (index);
+}
+
+int CSMWorld::Resources::getIndex (const std::string& id) const
+{
+    int index = searchId (id);
+
+    if (index==-1)
+    {
+        std::ostringstream stream;
+        stream << "Invalid resource: " << mBaseDirectory << '/' << id;
+
+        throw std::runtime_error (stream.str().c_str());
+    }
+
+    return index;
+}
+
+int CSMWorld::Resources::searchId (const std::string& id) const
+{
+    std::string id2 = Misc::StringUtils::lowerCase (id);
+
+    std::map<std::string, int>::const_iterator iter = mIndex.find (id2);
+
+    if (iter==mIndex.end())
+        return -1;
+
+    return iter->second;
+}
+
+CSMWorld::UniversalId::Type CSMWorld::Resources::getType() const
+{
+    return mType;
+}

apps/opencs/model/world/resources.hpp

@@ -0,0 +1,37 @@
+#ifndef CSM_WOLRD_RESOURCES_H
+#define CSM_WOLRD_RESOURCES_H
+
+#include <string>
+#include <map>
+#include <vector>
+
+#include "universalid.hpp"
+
+namespace CSMWorld
+{
+    class Resources
+    {
+            std::map<std::string, int> mIndex;
+            std::vector<std::string> mFiles;
+            std::string mBaseDirectory;
+            UniversalId::Type mType;
+
+        public:
+
+            /// \param type Type of resources in this table.
+            Resources (const std::string& baseDirectory, UniversalId::Type type,
+                const char * const *extensions = 0);
+
+            int getSize() const;
+
+            std::string getId (int index) const;
+
+            int getIndex (const std::string& id) const;
+
+            int searchId (const std::string& id) const;
+
+            UniversalId::Type getType() const;
+    };
+}
+
+#endif

apps/opencs/model/world/resourcesmanager.cpp

@@ -0,0 +1,31 @@
+
+#include "resourcesmanager.hpp"
+
+#include <stdexcept>
+
+void CSMWorld::ResourcesManager::addResources (const Resources& resources)
+{
+    mResources.insert (std::make_pair (resources.getType(), resources));
+}
+
+void CSMWorld::ResourcesManager::listResources()
+{
+    static const char * const sMeshTypes[] = { "nif", 0 };
+
+    addResources (Resources ("meshes", UniversalId::Type_Mesh, sMeshTypes));
+    addResources (Resources ("icons", UniversalId::Type_Icon));
+    addResources (Resources ("music", UniversalId::Type_Music));
+    addResources (Resources ("sound", UniversalId::Type_SoundRes));
+    addResources (Resources ("textures", UniversalId::Type_Texture));
+    addResources (Resources ("videos", UniversalId::Type_Video));
+}
+
+const CSMWorld::Resources& CSMWorld::ResourcesManager::get (UniversalId::Type type) const
+{
+    std::map<UniversalId::Type, Resources>::const_iterator iter = mResources.find (type);
+
+    if (iter==mResources.end())
+        throw std::logic_error ("Unknown resource type");
+
+    return iter->second;
+}

apps/opencs/model/world/resourcesmanager.hpp

@@ -0,0 +1,28 @@
+#ifndef CSM_WOLRD_RESOURCESMANAGER_H
+#define CSM_WOLRD_RESOURCESMANAGER_H
+
+#include <map>
+
+#include "universalid.hpp"
+#include "resources.hpp"
+
+namespace CSMWorld
+{
+    class ResourcesManager
+    {
+            std::map<UniversalId::Type, Resources> mResources;
+
+        private:
+
+            void addResources (const Resources& resources);
+
+        public:
+
+            /// Ask OGRE for a list of available resources.
+            void listResources();
+
+            const Resources& get (UniversalId::Type type) const;
+    };
+}
+
+#endif

apps/opencs/model/world/resourcetable.cpp

@@ -0,0 +1,148 @@
+
+#include "resourcetable.hpp"
+
+#include <stdexcept>
+
+#include "resources.hpp"
+#include "columnbase.hpp"
+#include "universalid.hpp"
+
+CSMWorld::ResourceTable::ResourceTable (const Resources *resources, unsigned int features)
+: IdTableBase (features | Feature_Constant), mResources (resources)
+{}
+
+CSMWorld::ResourceTable::~ResourceTable() {}
+
+int CSMWorld::ResourceTable::rowCount (const QModelIndex & parent) const
+{
+    if (parent.isValid())
+        return 0;
+
+    return mResources->getSize();
+}
+
+int CSMWorld::ResourceTable::columnCount (const QModelIndex & parent) const
+{
+    if (parent.isValid())
+        return 0;
+
+    return 2; // ID, type
+}
+
+QVariant CSMWorld::ResourceTable::data  (const QModelIndex & index, int role) const
+{
+    if (role!=Qt::DisplayRole)
+        return QVariant();
+
+    if (index.column()==0)
+        return QString::fromUtf8 (mResources->getId (index.row()).c_str());
+
+    if (index.column()==1)
+        return static_cast<int> (mResources->getType());
+
+    throw std::logic_error ("Invalid column in resource table");
+}
+
+QVariant CSMWorld::ResourceTable::headerData (int section, Qt::Orientation orientation,
+    int role ) const
+{
+    if (orientation==Qt::Vertical)
+        return QVariant();
+
+    if (role==ColumnBase::Role_Flags)
+        return ColumnBase::Flag_Table;
+
+    switch (section)
+    {
+        case 0:
+
+            if (role==Qt::DisplayRole)
+                return Columns::getName (Columns::ColumnId_Id).c_str();
+
+            if (role==ColumnBase::Role_Display)
+                return ColumnBase::Display_String;
+
+            break;
+
+        case 1:
+
+            if (role==Qt::DisplayRole)
+                return Columns::getName (Columns::ColumnId_RecordType).c_str();
+
+            if (role==ColumnBase::Role_Display)
+                return ColumnBase::Display_Integer;
+
+            break;
+    }
+
+    // xxx
+
+    return QVariant();
+}
+
+bool CSMWorld::ResourceTable::setData ( const QModelIndex &index, const QVariant &value,
+    int role)
+{
+    return false;
+}
+
+Qt::ItemFlags CSMWorld::ResourceTable::flags (const QModelIndex & index) const
+{
+    return Qt::ItemIsSelectable | Qt::ItemIsEnabled;;
+}
+
+QModelIndex CSMWorld::ResourceTable::index (int row, int column, const QModelIndex& parent)
+    const
+{
+    if (parent.isValid())
+        return QModelIndex();
+
+    if (row<0 || row>=mResources->getSize())
+        return QModelIndex();
+
+    if (column<0 || column>1)
+        return QModelIndex();
+
+    return createIndex (row, column);
+}
+
+QModelIndex CSMWorld::ResourceTable::parent (const QModelIndex& index) const
+{
+    return QModelIndex();
+}
+
+QModelIndex CSMWorld::ResourceTable::getModelIndex (const std::string& id, int column) const
+{
+    return index (mResources->getIndex (id), column);
+}
+
+int CSMWorld::ResourceTable::searchColumnIndex (Columns::ColumnId id) const
+{
+    if (id==Columns::ColumnId_Id)
+        return 0;
+
+    if (id==Columns::ColumnId_RecordType)
+        return 1;
+
+    return -1;
+}
+
+int CSMWorld::ResourceTable::findColumnIndex (Columns::ColumnId id) const
+{
+    int index = searchColumnIndex (id);
+
+    if (index==-1)
+        throw std::logic_error ("invalid column index");
+
+    return index;
+}
+
+std::pair<CSMWorld::UniversalId, std::string> CSMWorld::ResourceTable::view (int row) const
+{
+    return std::make_pair (UniversalId::Type_None, "");
+}
+
+bool CSMWorld::ResourceTable::isDeleted (const std::string& id) const
+{
+    return false;
+}

apps/opencs/model/world/resourcetable.hpp

@@ -0,0 +1,57 @@
+#ifndef CSM_WOLRD_RESOURCETABLE_H
+#define CSM_WOLRD_RESOURCETABLE_H
+
+#include "idtablebase.hpp"
+
+namespace CSMWorld
+{
+    class Resources;
+
+    class ResourceTable : public IdTableBase
+    {
+            const Resources *mResources;
+
+        public:
+
+            /// \note The feature Feature_Constant will be added implicitly.
+            ResourceTable (const Resources *resources, unsigned int features = 0);
+
+            virtual ~ResourceTable();
+
+            virtual int rowCount (const QModelIndex & parent = QModelIndex()) const;
+
+            virtual int columnCount (const QModelIndex & parent = QModelIndex()) const;
+
+            virtual QVariant data  (const QModelIndex & index, int role = Qt::DisplayRole) const;
+
+            virtual QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+
+            virtual bool setData ( const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
+
+            virtual Qt::ItemFlags flags (const QModelIndex & index) const;
+
+            virtual QModelIndex index (int row, int column, const QModelIndex& parent = QModelIndex())
+                const;
+
+            virtual QModelIndex parent (const QModelIndex& index) const;
+
+            virtual QModelIndex getModelIndex (const std::string& id, int column) const;
+
+            /// Return index of column with the given \a id. If no such column exists, -1 is
+            /// returned.
+            virtual int searchColumnIndex (Columns::ColumnId id) const;
+
+            /// Return index of column with the given \a id. If no such column exists, an
+            /// exception is thrown.
+            virtual int findColumnIndex (Columns::ColumnId id) const;
+
+            /// Return the UniversalId and the hint for viewing \a row. If viewing is not
+            /// supported by this table, return (UniversalId::Type_None, "").
+            virtual std::pair<UniversalId, std::string> view (int row) const;
+
+            /// Is \a id flagged as deleted?
+            virtual bool isDeleted (const std::string& id) const;
+    };
+}
+
+#endif

apps/opencs/model/world/tablemimedata.cpp

@@ -37,7 +37,7 @@ std::string CSMWorld::TableMimeData::getIcon() const
     if (mUniversalId.empty())
     {
         qDebug()<<"TableMimeData object does not hold any records!"; //because throwing in the event loop tends to be problematic
-        throw("TableMimeData object does not hold any records!");
+        throw std::runtime_error ("TableMimeData object does not hold any records!");
     }
 
     std::string tmpIcon;
@@ -179,7 +179,7 @@ CSMWorld::UniversalId CSMWorld::TableMimeData::returnMatching (CSMWorld::Univers
         }
     }
 
-    throw ("TableMimeData object does not hold object of the seeked type");
+    throw std::runtime_error ("TableMimeData object does not hold object of the seeked type");
 }
 
 CSMWorld::UniversalId CSMWorld::TableMimeData::returnMatching (CSMWorld::ColumnBase::Display type) const
@@ -201,7 +201,7 @@ CSMWorld::UniversalId CSMWorld::TableMimeData::returnMatching (CSMWorld::ColumnB
         }
     }
 
-    throw ("TableMimeData object does not hold object of the seeked type");
+    throw std::runtime_error ("TableMimeData object does not hold object of the seeked type");
 }
 
 bool CSMWorld::TableMimeData::fromDocument (const CSMDoc::Document& document) const
@@ -209,328 +209,83 @@ bool CSMWorld::TableMimeData::fromDocument (const CSMDoc::Document& document) co
     return &document == &mDocument;
 }
 
-CSMWorld::UniversalId::Type CSMWorld::TableMimeData::convertEnums (CSMWorld::ColumnBase::Display type)
+namespace
 {
-    switch (type)
+    struct Mapping
     {
-        case CSMWorld::ColumnBase::Display_Race:
+        CSMWorld::UniversalId::Type mUniversalIdType;
-            return CSMWorld::UniversalId::Type_Race;
+        CSMWorld::ColumnBase::Display mDisplayType;
+    };
+
+    const Mapping mapping[] =
+    {
+        { CSMWorld::UniversalId::Type_Race, CSMWorld::ColumnBase::Display_Race },
+        { CSMWorld::UniversalId::Type_Skill, CSMWorld::ColumnBase::Display_Skill },
+        { CSMWorld::UniversalId::Type_Class, CSMWorld::ColumnBase::Display_Class },
+        { CSMWorld::UniversalId::Type_Class, CSMWorld::ColumnBase::Display_Class },
+        { CSMWorld::UniversalId::Type_Faction, CSMWorld::ColumnBase::Display_Faction },
+        { CSMWorld::UniversalId::Type_Sound, CSMWorld::ColumnBase::Display_Sound },
+        { CSMWorld::UniversalId::Type_Region, CSMWorld::ColumnBase::Display_Region },
+        { CSMWorld::UniversalId::Type_Birthsign, CSMWorld::ColumnBase::Display_Birthsign },
+        { CSMWorld::UniversalId::Type_Spell, CSMWorld::ColumnBase::Display_Spell },
+        { CSMWorld::UniversalId::Type_Cell, CSMWorld::ColumnBase::Display_Cell },
+        { CSMWorld::UniversalId::Type_Referenceable, CSMWorld::ColumnBase::Display_Referenceable },
+        { CSMWorld::UniversalId::Type_Activator, CSMWorld::ColumnBase::Display_Activator },
+        { CSMWorld::UniversalId::Type_Potion, CSMWorld::ColumnBase::Display_Potion },
+        { CSMWorld::UniversalId::Type_Apparatus, CSMWorld::ColumnBase::Display_Apparatus },
+        { CSMWorld::UniversalId::Type_Armor, CSMWorld::ColumnBase::Display_Armor },
+        { CSMWorld::UniversalId::Type_Book, CSMWorld::ColumnBase::Display_Book },
+        { CSMWorld::UniversalId::Type_Clothing, CSMWorld::ColumnBase::Display_Clothing },
+        { CSMWorld::UniversalId::Type_Container, CSMWorld::ColumnBase::Display_Container },
+        { CSMWorld::UniversalId::Type_Creature, CSMWorld::ColumnBase::Display_Creature },
+        { CSMWorld::UniversalId::Type_Door, CSMWorld::ColumnBase::Display_Door },
+        { CSMWorld::UniversalId::Type_Ingredient, CSMWorld::ColumnBase::Display_Ingredient },
+        { CSMWorld::UniversalId::Type_CreatureLevelledList, CSMWorld::ColumnBase::Display_CreatureLevelledList },
+        { CSMWorld::UniversalId::Type_ItemLevelledList, CSMWorld::ColumnBase::Display_ItemLevelledList },
+        { CSMWorld::UniversalId::Type_Light, CSMWorld::ColumnBase::Display_Light },
+        { CSMWorld::UniversalId::Type_Lockpick, CSMWorld::ColumnBase::Display_Lockpick },
+        { CSMWorld::UniversalId::Type_Miscellaneous, CSMWorld::ColumnBase::Display_Miscellaneous },
+        { CSMWorld::UniversalId::Type_Npc, CSMWorld::ColumnBase::Display_Npc },
+        { CSMWorld::UniversalId::Type_Probe, CSMWorld::ColumnBase::Display_Probe },
+        { CSMWorld::UniversalId::Type_Repair, CSMWorld::ColumnBase::Display_Repair },
+        { CSMWorld::UniversalId::Type_Static, CSMWorld::ColumnBase::Display_Static },
+        { CSMWorld::UniversalId::Type_Weapon, CSMWorld::ColumnBase::Display_Weapon },
+        { CSMWorld::UniversalId::Type_Reference, CSMWorld::ColumnBase::Display_Reference },
+        { CSMWorld::UniversalId::Type_Filter, CSMWorld::ColumnBase::Display_Filter },
+        { CSMWorld::UniversalId::Type_Topic, CSMWorld::ColumnBase::Display_Topic },
+        { CSMWorld::UniversalId::Type_Journal, CSMWorld::ColumnBase::Display_Journal },
+        { CSMWorld::UniversalId::Type_TopicInfo, CSMWorld::ColumnBase::Display_TopicInfo },
+        { CSMWorld::UniversalId::Type_JournalInfo, CSMWorld::ColumnBase::Display_JournalInfo },
+        { CSMWorld::UniversalId::Type_Scene, CSMWorld::ColumnBase::Display_Scene },
+        { CSMWorld::UniversalId::Type_Script, CSMWorld::ColumnBase::Display_Script },
+        { CSMWorld::UniversalId::Type_Mesh, CSMWorld::ColumnBase::Display_Mesh },
+        { CSMWorld::UniversalId::Type_Icon, CSMWorld::ColumnBase::Display_Icon },
+        { CSMWorld::UniversalId::Type_Music, CSMWorld::ColumnBase::Display_Music },
+        { CSMWorld::UniversalId::Type_SoundRes, CSMWorld::ColumnBase::Display_SoundRes },
+        { CSMWorld::UniversalId::Type_Texture, CSMWorld::ColumnBase::Display_Texture },
+        { CSMWorld::UniversalId::Type_Video, CSMWorld::ColumnBase::Display_Video },
+
+        { CSMWorld::UniversalId::Type_None, CSMWorld::ColumnBase::Display_None } // end marker
+    };
+}
+
+CSMWorld::UniversalId::Type CSMWorld::TableMimeData::convertEnums (ColumnBase::Display type)
+{
+    for (int i=0; mapping[i].mUniversalIdType!=CSMWorld::UniversalId::Type_None; ++i)
+        if (mapping[i].mDisplayType==type)
+            return mapping[i].mUniversalIdType;
 
-
-        case CSMWorld::ColumnBase::Display_Skill:
-            return CSMWorld::UniversalId::Type_Skill;
-
-
-        case CSMWorld::ColumnBase::Display_Class:
-            return CSMWorld::UniversalId::Type_Class;
-
-
-        case CSMWorld::ColumnBase::Display_Faction:
-            return CSMWorld::UniversalId::Type_Faction;
-
-
-        case CSMWorld::ColumnBase::Display_Sound:
-            return CSMWorld::UniversalId::Type_Sound;
-
-
-        case CSMWorld::ColumnBase::Display_Region:
-            return CSMWorld::UniversalId::Type_Region;
-
-
-        case CSMWorld::ColumnBase::Display_Birthsign:
-            return CSMWorld::UniversalId::Type_Birthsign;
-
-
-        case CSMWorld::ColumnBase::Display_Spell:
-            return CSMWorld::UniversalId::Type_Spell;
-
-
-        case CSMWorld::ColumnBase::Display_Cell:
-            return CSMWorld::UniversalId::Type_Cell;
-
-
-        case CSMWorld::ColumnBase::Display_Referenceable:
-            return CSMWorld::UniversalId::Type_Referenceable;
-
-
-        case CSMWorld::ColumnBase::Display_Activator:
-            return CSMWorld::UniversalId::Type_Activator;
-
-
-        case CSMWorld::ColumnBase::Display_Potion:
-            return CSMWorld::UniversalId::Type_Potion;
-
-
-        case CSMWorld::ColumnBase::Display_Apparatus:
-            return CSMWorld::UniversalId::Type_Apparatus;
-
-
-        case CSMWorld::ColumnBase::Display_Armor:
-            return CSMWorld::UniversalId::Type_Armor;
-
-
-        case CSMWorld::ColumnBase::Display_Book:
-            return CSMWorld::UniversalId::Type_Book;
-
-
-        case CSMWorld::ColumnBase::Display_Clothing:
-            return CSMWorld::UniversalId::Type_Clothing;
-
-
-        case CSMWorld::ColumnBase::Display_Container:
-            return CSMWorld::UniversalId::Type_Container;
-
-
-        case CSMWorld::ColumnBase::Display_Creature:
-            return CSMWorld::UniversalId::Type_Creature;
-
-
-        case CSMWorld::ColumnBase::Display_Door:
-            return CSMWorld::UniversalId::Type_Door;
-
-
-        case CSMWorld::ColumnBase::Display_Ingredient:
-            return CSMWorld::UniversalId::Type_Ingredient;
-
-
-        case CSMWorld::ColumnBase::Display_CreatureLevelledList:
-            return CSMWorld::UniversalId::Type_CreatureLevelledList;
-
-
-        case CSMWorld::ColumnBase::Display_ItemLevelledList:
-            return CSMWorld::UniversalId::Type_ItemLevelledList;
-
-
-        case CSMWorld::ColumnBase::Display_Light:
-            return CSMWorld::UniversalId::Type_Light;
-
-
-        case CSMWorld::ColumnBase::Display_Lockpick:
-            return CSMWorld::UniversalId::Type_Lockpick;
-
-
-        case CSMWorld::ColumnBase::Display_Miscellaneous:
-            return CSMWorld::UniversalId::Type_Miscellaneous;
-
-
-        case CSMWorld::ColumnBase::Display_Npc:
-            return CSMWorld::UniversalId::Type_Npc;
-
-
-        case CSMWorld::ColumnBase::Display_Probe:
-            return CSMWorld::UniversalId::Type_Probe;
-
-
-        case CSMWorld::ColumnBase::Display_Repair:
-            return CSMWorld::UniversalId::Type_Repair;
-
-
-        case CSMWorld::ColumnBase::Display_Static:
-            return CSMWorld::UniversalId::Type_Static;
-
-
-        case CSMWorld::ColumnBase::Display_Weapon:
-            return CSMWorld::UniversalId::Type_Weapon;
-
-
-        case CSMWorld::ColumnBase::Display_Reference:
-            return CSMWorld::UniversalId::Type_Reference;
-
-
-        case CSMWorld::ColumnBase::Display_Filter:
-            return CSMWorld::UniversalId::Type_Filter;
-
-
-        case CSMWorld::ColumnBase::Display_Topic:
-            return CSMWorld::UniversalId::Type_Topic;
-
-
-        case CSMWorld::ColumnBase::Display_Journal:
-            return CSMWorld::UniversalId::Type_Journal;
-
-
-        case CSMWorld::ColumnBase::Display_TopicInfo:
-            return CSMWorld::UniversalId::Type_TopicInfo;
-
-
-        case CSMWorld::ColumnBase::Display_JournalInfo:
-            return CSMWorld::UniversalId::Type_JournalInfo;
-
-
-        case CSMWorld::ColumnBase::Display_Scene:
-            return CSMWorld::UniversalId::Type_Scene;
-
-
-        case CSMWorld::ColumnBase::Display_Script:
-            return CSMWorld::UniversalId::Type_Script;
-
-
-        default:
     return CSMWorld::UniversalId::Type_None;
-
-    }
 }
 
-CSMWorld::ColumnBase::Display CSMWorld::TableMimeData::convertEnums (CSMWorld::UniversalId::Type type)
+CSMWorld::ColumnBase::Display CSMWorld::TableMimeData::convertEnums (UniversalId::Type type)
 {
-    switch (type)
+    for (int i=0; mapping[i].mUniversalIdType!=CSMWorld::UniversalId::Type_None; ++i)
-    {
+        if (mapping[i].mUniversalIdType==type)
-        case CSMWorld::UniversalId::Type_Race:
+            return mapping[i].mDisplayType;
-            return CSMWorld::ColumnBase::Display_Race;
 
-
-        case CSMWorld::UniversalId::Type_Skill:
-            return CSMWorld::ColumnBase::Display_Skill;
-
-
-        case CSMWorld::UniversalId::Type_Class:
-            return CSMWorld::ColumnBase::Display_Class;
-
-
-        case CSMWorld::UniversalId::Type_Faction:
-            return CSMWorld::ColumnBase::Display_Faction;
-
-
-        case CSMWorld::UniversalId::Type_Sound:
-            return CSMWorld::ColumnBase::Display_Sound;
-
-
-        case CSMWorld::UniversalId::Type_Region:
-            return CSMWorld::ColumnBase::Display_Region;
-
-
-        case CSMWorld::UniversalId::Type_Birthsign:
-            return CSMWorld::ColumnBase::Display_Birthsign;
-
-
-        case CSMWorld::UniversalId::Type_Spell:
-            return CSMWorld::ColumnBase::Display_Spell;
-
-
-        case CSMWorld::UniversalId::Type_Cell:
-            return CSMWorld::ColumnBase::Display_Cell;
-
-
-        case CSMWorld::UniversalId::Type_Referenceable:
-            return CSMWorld::ColumnBase::Display_Referenceable;
-
-
-        case CSMWorld::UniversalId::Type_Activator:
-            return CSMWorld::ColumnBase::Display_Activator;
-
-
-        case CSMWorld::UniversalId::Type_Potion:
-            return CSMWorld::ColumnBase::Display_Potion;
-
-
-        case CSMWorld::UniversalId::Type_Apparatus:
-            return CSMWorld::ColumnBase::Display_Apparatus;
-
-
-        case CSMWorld::UniversalId::Type_Armor:
-            return CSMWorld::ColumnBase::Display_Armor;
-
-
-        case CSMWorld::UniversalId::Type_Book:
-            return CSMWorld::ColumnBase::Display_Book;
-
-
-        case CSMWorld::UniversalId::Type_Clothing:
-            return CSMWorld::ColumnBase::Display_Clothing;
-
-
-        case CSMWorld::UniversalId::Type_Container:
-            return CSMWorld::ColumnBase::Display_Container;
-
-
-        case CSMWorld::UniversalId::Type_Creature:
-            return CSMWorld::ColumnBase::Display_Creature;
-
-
-        case CSMWorld::UniversalId::Type_Door:
-            return CSMWorld::ColumnBase::Display_Door;
-
-
-        case CSMWorld::UniversalId::Type_Ingredient:
-            return CSMWorld::ColumnBase::Display_Ingredient;
-
-
-        case CSMWorld::UniversalId::Type_CreatureLevelledList:
-            return CSMWorld::ColumnBase::Display_CreatureLevelledList;
-
-
-        case CSMWorld::UniversalId::Type_ItemLevelledList:
-            return CSMWorld::ColumnBase::Display_ItemLevelledList;
-
-
-        case CSMWorld::UniversalId::Type_Light:
-            return CSMWorld::ColumnBase::Display_Light;
-
-
-        case CSMWorld::UniversalId::Type_Lockpick:
-            return CSMWorld::ColumnBase::Display_Lockpick;
-
-
-        case CSMWorld::UniversalId::Type_Miscellaneous:
-            return CSMWorld::ColumnBase::Display_Miscellaneous;
-
-
-        case CSMWorld::UniversalId::Type_Npc:
-            return CSMWorld::ColumnBase::Display_Npc;
-
-
-        case CSMWorld::UniversalId::Type_Probe:
-            return CSMWorld::ColumnBase::Display_Probe;
-
-
-        case CSMWorld::UniversalId::Type_Repair:
-            return CSMWorld::ColumnBase::Display_Repair;
-
-
-        case CSMWorld::UniversalId::Type_Static:
-            return CSMWorld::ColumnBase::Display_Static;
-
-
-        case CSMWorld::UniversalId::Type_Weapon:
-            return CSMWorld::ColumnBase::Display_Weapon;
-
-
-        case CSMWorld::UniversalId::Type_Reference:
-            return CSMWorld::ColumnBase::Display_Reference;
-
-
-        case CSMWorld::UniversalId::Type_Filter:
-            return CSMWorld::ColumnBase::Display_Filter;
-
-
-        case CSMWorld::UniversalId::Type_Topic:
-            return CSMWorld::ColumnBase::Display_Topic;
-
-
-        case CSMWorld::UniversalId::Type_Journal:
-            return CSMWorld::ColumnBase::Display_Journal;
-
-
-        case CSMWorld::UniversalId::Type_TopicInfo:
-            return CSMWorld::ColumnBase::Display_TopicInfo;
-
-
-        case CSMWorld::UniversalId::Type_JournalInfo:
-            return CSMWorld::ColumnBase::Display_JournalInfo;
-
-
-        case CSMWorld::UniversalId::Type_Scene:
-            return CSMWorld::ColumnBase::Display_Scene;
-
-
-        case CSMWorld::UniversalId::Type_Script:
-            return CSMWorld::ColumnBase::Display_Script;
-
-
-        default:
     return CSMWorld::ColumnBase::Display_None;
 }
-}
 
 const CSMDoc::Document* CSMWorld::TableMimeData::getDocumentPtr() const
 {

apps/opencs/model/world/universalid.cpp

@@ -44,6 +44,12 @@ namespace
         { CSMWorld::UniversalId::Class_NonRecord, CSMWorld::UniversalId::Type_RegionMap,
             "Region Map", 0 },
         { CSMWorld::UniversalId::Class_RecordList, CSMWorld::UniversalId::Type_Filters, "Filters", 0 },
+        { CSMWorld::UniversalId::Class_ResourceList, CSMWorld::UniversalId::Type_Meshes, "Meshes", 0 },
+        { CSMWorld::UniversalId::Class_ResourceList, CSMWorld::UniversalId::Type_Icons, "Icons", 0 },
+        { CSMWorld::UniversalId::Class_ResourceList, CSMWorld::UniversalId::Type_Musics, "Musics", 0 },
+        { CSMWorld::UniversalId::Class_ResourceList, CSMWorld::UniversalId::Type_SoundsRes, "Sound Files", 0 },
+        { CSMWorld::UniversalId::Class_ResourceList, CSMWorld::UniversalId::Type_Textures, "Textures", 0 },
+        { CSMWorld::UniversalId::Class_ResourceList, CSMWorld::UniversalId::Type_Videos, "Videos", 0 },
 
         { CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, 0, 0 } // end marker
     };
@@ -97,6 +103,12 @@ namespace
         { CSMWorld::UniversalId::Class_Collection, CSMWorld::UniversalId::Type_Preview, "Preview", 0 },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_Enchantment, "Enchantment", 0 },
         { CSMWorld::UniversalId::Class_Record, CSMWorld::UniversalId::Type_BodyPart, "Body Part", 0 },
+        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Mesh, "Mesh", 0 },
+        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Icon, "Icon", 0 },
+        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Music, "Music", 0 },
+        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_SoundRes, "Sound File", 0 },
+        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Texture, "Texture", 0 },
+        { CSMWorld::UniversalId::Class_Resource, CSMWorld::UniversalId::Type_Video, "Video", 0 },
 
         { CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, 0, 0 } // end marker
     };
@@ -331,7 +343,8 @@ CSMWorld::UniversalId::Type CSMWorld::UniversalId::getParentType (Type type)
             if (sIdArg[i].mClass==Class_RefRecord)
                 return Type_Referenceables;
 
-            if (sIdArg[i].mClass==Class_SubRecord || sIdArg[i].mClass==Class_Record)
+            if (sIdArg[i].mClass==Class_SubRecord || sIdArg[i].mClass==Class_Record ||
+                sIdArg[i].mClass==Class_Resource)
             {
                 if (type==Type_Cell_Missing)
                     return Type_Cells;

apps/opencs/model/world/universalid.hpp

@@ -22,7 +22,10 @@ namespace CSMWorld
                 Class_RecordList,
                 Class_Collection, // multiple types of records combined
                 Class_Transient, // not part of the world data or the project data
-                Class_NonRecord // record like data that is not part of the world
+                Class_NonRecord, // record like data that is not part of the world
+                Class_Resource, ///< \attention Resource IDs are unique only within the
+                                /// respective collection
+                Class_ResourceList
             };
 
             enum ArgumentType
@@ -104,7 +107,19 @@ namespace CSMWorld
                 Type_Enchantments,
                 Type_Enchantment,
                 Type_BodyParts,
-                Type_BodyPart
+                Type_BodyPart,
+                Type_Meshes,
+                Type_Mesh,
+                Type_Icons,
+                Type_Icon,
+                Type_Musics,
+                Type_Music,
+                Type_SoundsRes,
+                Type_SoundRes,
+                Type_Textures,
+                Type_Texture,
+                Type_Videos,
+                Type_Video
             };
 
             enum { NumberOfTypes = Type_BodyPart+1 };

apps/opencs/view/doc/view.cpp

@@ -204,6 +204,32 @@ void CSVDoc::View::setupAssetsMenu()
     QAction *sounds = new QAction (tr ("Sounds"), this);
     connect (sounds, SIGNAL (triggered()), this, SLOT (addSoundsSubView()));
     assets->addAction (sounds);
+
+    assets->addSeparator(); // resources follow here
+
+    QAction *meshes = new QAction (tr ("Meshes"), this);
+    connect (meshes, SIGNAL (triggered()), this, SLOT (addMeshesSubView()));
+    assets->addAction (meshes);
+
+    QAction *icons = new QAction (tr ("Icons"), this);
+    connect (icons, SIGNAL (triggered()), this, SLOT (addIconsSubView()));
+    assets->addAction (icons);
+
+    QAction *musics = new QAction (tr ("Music"), this);
+    connect (musics, SIGNAL (triggered()), this, SLOT (addMusicsSubView()));
+    assets->addAction (musics);
+
+    QAction *soundsRes = new QAction (tr ("Sound Files"), this);
+    connect (soundsRes, SIGNAL (triggered()), this, SLOT (addSoundsResSubView()));
+    assets->addAction (soundsRes);
+
+    QAction *textures = new QAction (tr ("Textures"), this);
+    connect (textures, SIGNAL (triggered()), this, SLOT (addTexturesSubView()));
+    assets->addAction (textures);
+
+    QAction *videos = new QAction (tr ("Videos"), this);
+    connect (videos, SIGNAL (triggered()), this, SLOT (addVideosSubView()));
+    assets->addAction (videos);
 }
 
 void CSVDoc::View::setupUi()
@@ -487,6 +513,36 @@ void CSVDoc::View::addBodyPartsSubView()
     addSubView (CSMWorld::UniversalId::Type_BodyParts);
 }
 
+void CSVDoc::View::addMeshesSubView()
+{
+    addSubView (CSMWorld::UniversalId::Type_Meshes);
+}
+
+void CSVDoc::View::addIconsSubView()
+{
+    addSubView (CSMWorld::UniversalId::Type_Icons);
+}
+
+void CSVDoc::View::addMusicsSubView()
+{
+    addSubView (CSMWorld::UniversalId::Type_Musics);
+}
+
+void CSVDoc::View::addSoundsResSubView()
+{
+    addSubView (CSMWorld::UniversalId::Type_SoundsRes);
+}
+
+void CSVDoc::View::addTexturesSubView()
+{
+    addSubView (CSMWorld::UniversalId::Type_Textures);
+}
+
+void CSVDoc::View::addVideosSubView()
+{
+    addSubView (CSMWorld::UniversalId::Type_Videos);
+}
+
 void CSVDoc::View::abortOperation (int type)
 {
     mDocument->abortOperation (type);

apps/opencs/view/doc/view.hpp

@@ -182,6 +182,18 @@ namespace CSVDoc
 
             void addBodyPartsSubView();
 
+            void addMeshesSubView();
+
+            void addIconsSubView();
+
+            void addMusicsSubView();
+
+            void addSoundsResSubView();
+
+            void addTexturesSubView();
+
+            void addVideosSubView();
+
             void toggleShowStatusBar (bool show);
 
             void loadErrorLog();

apps/opencs/view/world/subviews.cpp

@@ -70,6 +70,21 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
     manager.add (CSMWorld::UniversalId::Type_JournalInfos,
         new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<InfoCreator> > (false));
 
+    // Subviews for resources tables
+    manager.add (CSMWorld::UniversalId::Type_Meshes,
+        new CSVDoc::SubViewFactoryWithCreator<TableSubView, NullCreatorFactory>);
+    manager.add (CSMWorld::UniversalId::Type_Icons,
+        new CSVDoc::SubViewFactoryWithCreator<TableSubView, NullCreatorFactory>);
+    manager.add (CSMWorld::UniversalId::Type_Musics,
+        new CSVDoc::SubViewFactoryWithCreator<TableSubView, NullCreatorFactory>);
+    manager.add (CSMWorld::UniversalId::Type_SoundsRes,
+        new CSVDoc::SubViewFactoryWithCreator<TableSubView, NullCreatorFactory>);
+    manager.add (CSMWorld::UniversalId::Type_Textures,
+        new CSVDoc::SubViewFactoryWithCreator<TableSubView, NullCreatorFactory>);
+    manager.add (CSMWorld::UniversalId::Type_Videos,
+        new CSVDoc::SubViewFactoryWithCreator<TableSubView, NullCreatorFactory>);
+
+
     // Subviews for editing/viewing individual records
     manager.add (CSMWorld::UniversalId::Type_Script, new CSVDoc::SubViewFactory<ScriptSubView>);
 

apps/opencs/view/world/table.cpp

@@ -14,6 +14,7 @@
 #include "../../model/world/data.hpp"
 #include "../../model/world/commands.hpp"
 #include "../../model/world/idtableproxymodel.hpp"
+#include "../../model/world/idtablebase.hpp"
 #include "../../model/world/idtable.hpp"
 #include "../../model/world/record.hpp"
 #include "../../model/world/columns.hpp"
@@ -53,7 +54,7 @@ void CSVWorld::Table::contextMenuEvent (QContextMenuEvent *event)
 
     ///  \todo add menu items for select all and clear selection
 
-    if (!mEditLock)
+    if (!mEditLock && !(mModel->getFeatures() & CSMWorld::IdTableBase::Feature_Constant))
     {
         if (selectedRows.size()==1)
         {
@@ -82,7 +83,7 @@ void CSVWorld::Table::contextMenuEvent (QContextMenuEvent *event)
                 menu.addAction (mExtendedDeleteAction);
         }
 
-        if (mModel->getFeatures() & CSMWorld::IdTable::Feature_ReorderWithinTopic)
+        if (mModel->getFeatures() & CSMWorld::IdTableBase::Feature_ReorderWithinTopic)
         {
             /// \todo allow reordering of multiple rows
             if (selectedRows.size()==1)
@@ -119,7 +120,7 @@ void CSVWorld::Table::contextMenuEvent (QContextMenuEvent *event)
 
         row = mProxyModel->mapToSource (mProxyModel->index (row, 0)).row();
 
-        if (mModel->getFeatures() & CSMWorld::IdTable::Feature_View)
+        if (mModel->getFeatures() & CSMWorld::IdTableBase::Feature_View)
         {
             CSMWorld::UniversalId id = mModel->view (row).first;
 
@@ -131,7 +132,7 @@ void CSVWorld::Table::contextMenuEvent (QContextMenuEvent *event)
                 menu.addAction (mViewAction);
         }
 
-        if (mModel->getFeatures() & CSMWorld::IdTable::Feature_Preview)
+        if (mModel->getFeatures() & CSMWorld::IdTableBase::Feature_Preview)
         {
             QModelIndex index = mModel->index (row,
                 mModel->findColumnIndex (CSMWorld::Columns::ColumnId_Modification));
@@ -152,7 +153,7 @@ CSVWorld::Table::Table (const CSMWorld::UniversalId& id,
 : mCreateAction (0), mCloneAction(0), mRecordStatusDisplay (0),
   DragRecordTable(document)
 {
-    mModel = &dynamic_cast<CSMWorld::IdTable&> (*mDocument.getData().getTableModel (id));
+    mModel = &dynamic_cast<CSMWorld::IdTableBase&> (*mDocument.getData().getTableModel (id));
 
     mProxyModel = new CSMWorld::IdTableProxyModel (this);
     mProxyModel->setSourceModel (mModel);
@@ -275,7 +276,7 @@ CSMWorld::UniversalId CSVWorld::Table::getUniversalId (int row) const
 
 void CSVWorld::Table::editRecord()
 {
-    if (!mEditLock)
+    if (!mEditLock || (mModel->getFeatures() & CSMWorld::IdTableBase::Feature_Constant))
     {
         QModelIndexList selectedRows = selectionModel()->selectedRows();
 
@@ -286,11 +287,11 @@ void CSVWorld::Table::editRecord()
 
 void CSVWorld::Table::cloneRecord()
 {
-    if (!mEditLock)
+    if (!mEditLock || (mModel->getFeatures() & CSMWorld::IdTableBase::Feature_Constant))
     {
         QModelIndexList selectedRows = selectionModel()->selectedRows();
         const CSMWorld::UniversalId& toClone = getUniversalId(selectedRows.begin()->row());
-        if (selectedRows.size()==1 && !mModel->getRecord(toClone.getId()).isDeleted())
+        if (selectedRows.size()==1 && !mModel->isDeleted (toClone.getId()))
         {
             emit cloneRequest (toClone);
         }
@@ -299,7 +300,7 @@ void CSVWorld::Table::cloneRecord()
 
 void CSVWorld::Table::moveUpRecord()
 {
-    if (mEditLock)
+    if (mEditLock || (mModel->getFeatures() & CSMWorld::IdTableBase::Feature_Constant))
         return;
 
     QModelIndexList selectedRows = selectionModel()->selectedRows();
@@ -324,14 +325,15 @@ void CSVWorld::Table::moveUpRecord()
             for (int i=1; i<row2-row; ++i)
                 newOrder[i] = i;
 
-            mDocument.getUndoStack().push (new CSMWorld::ReorderRowsCommand (*mModel, row, newOrder));
+            mDocument.getUndoStack().push (new CSMWorld::ReorderRowsCommand (
+                dynamic_cast<CSMWorld::IdTable&> (*mModel), row, newOrder));
         }
     }
 }
 
 void CSVWorld::Table::moveDownRecord()
 {
-    if (mEditLock)
+    if (mEditLock || (mModel->getFeatures() & CSMWorld::IdTableBase::Feature_Constant))
         return;
 
     QModelIndexList selectedRows = selectionModel()->selectedRows();
@@ -356,7 +358,8 @@ void CSVWorld::Table::moveDownRecord()
             for (int i=1; i<row2-row; ++i)
                 newOrder[i] = i;
 
-            mDocument.getUndoStack().push (new CSMWorld::ReorderRowsCommand (*mModel, row, newOrder));
+            mDocument.getUndoStack().push (new CSMWorld::ReorderRowsCommand (
+                dynamic_cast<CSMWorld::IdTable&> (*mModel), row, newOrder));
         }
     }
 }
@@ -422,11 +425,14 @@ void CSVWorld::Table::tableSizeUpdate()
     {
         int rows = mProxyModel->rowCount();
 
+        int columnIndex = mModel->searchColumnIndex (CSMWorld::Columns::ColumnId_Modification);
+
+        if (columnIndex!=-1)
+        {
             for (int i=0; i<rows; ++i)
             {
                 QModelIndex index = mProxyModel->mapToSource (mProxyModel->index (i, 0));
 
-            int columnIndex = mModel->findColumnIndex (CSMWorld::Columns::ColumnId_Modification);
                 int state = mModel->data (mModel->index (index.row(), columnIndex)).toInt();
 
                 switch (state)
@@ -438,6 +444,9 @@ void CSVWorld::Table::tableSizeUpdate()
                 }
             }
         }
+        else
+            size = rows;
+    }
 
     tableSizeChanged (size, deleted, modified);
 }

apps/opencs/view/world/table.hpp

@@ -23,7 +23,7 @@ namespace CSMWorld
     class Data;
     class UniversalId;
     class IdTableProxyModel;
-    class IdTable;
+    class IdTableBase;
     class CommandDispatcher;
 }
 
@@ -49,7 +49,7 @@ namespace CSVWorld
             QAction *mExtendedDeleteAction;
             QAction *mExtendedRevertAction;
             CSMWorld::IdTableProxyModel *mProxyModel;
-            CSMWorld::IdTable *mModel;
+            CSMWorld::IdTableBase *mModel;
             int mRecordStatusDisplay;
             CSMWorld::CommandDispatcher *mDispatcher;
 

apps/opencs/view/world/util.cpp

@@ -143,48 +143,54 @@ QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleO
         }
     }
 
-    if (display != CSMWorld::ColumnBase::Display_None)
+    switch (display)
-    {
-        if (variant.type() == QVariant::Color)
     {
+        case CSMWorld::ColumnBase::Display_Colour:
+
             return new QLineEdit(parent);
-        }
+
-        if (display == CSMWorld::ColumnBase::Display_Integer)
+        case CSMWorld::ColumnBase::Display_Integer:
-        {
+
             return new QSpinBox(parent);
-        }
+
-        if (display == CSMWorld::ColumnBase::Display_Var)
+        case CSMWorld::ColumnBase::Display_Var:
-        {
+
             return new QLineEdit(parent);
-        }
+
-        if (display == CSMWorld::ColumnBase::Display_Float)
+        case CSMWorld::ColumnBase::Display_Float:
-        {
+
             return new QDoubleSpinBox(parent);
-        }
+
-        if (display == CSMWorld::ColumnBase::Display_LongString)
+        case CSMWorld::ColumnBase::Display_LongString:
-        {
+
             return new QTextEdit(parent);
-        }
+
-        if (display == CSMWorld::ColumnBase::Display_String ||
+        case CSMWorld::ColumnBase::Display_Boolean:
-            display == CSMWorld::ColumnBase::Display_Skill ||
+
-            display == CSMWorld::ColumnBase::Display_Script ||
-            display == CSMWorld::ColumnBase::Display_Race ||
-            display == CSMWorld::ColumnBase::Display_Class ||
-            display == CSMWorld::ColumnBase::Display_Faction ||
-            display == CSMWorld::ColumnBase::Display_Miscellaneous ||
-            display == CSMWorld::ColumnBase::Display_Sound)
-        {
-            return new DropLineEdit(parent);
-        }
-        if (display == CSMWorld::ColumnBase::Display_Boolean)
-        {
             return new QCheckBox(parent);
-        }
+
-    }
+        case CSMWorld::ColumnBase::Display_String:
+        case CSMWorld::ColumnBase::Display_Skill:
+        case CSMWorld::ColumnBase::Display_Script:
+        case CSMWorld::ColumnBase::Display_Race:
+        case CSMWorld::ColumnBase::Display_Class:
+        case CSMWorld::ColumnBase::Display_Faction:
+        case CSMWorld::ColumnBase::Display_Miscellaneous:
+        case CSMWorld::ColumnBase::Display_Sound:
+        case CSMWorld::ColumnBase::Display_Mesh:
+        case CSMWorld::ColumnBase::Display_Icon:
+        case CSMWorld::ColumnBase::Display_Music:
+        case CSMWorld::ColumnBase::Display_SoundRes:
+        case CSMWorld::ColumnBase::Display_Texture:
+        case CSMWorld::ColumnBase::Display_Video:
+
+            return new DropLineEdit(parent);
+
+        default:
 
             return QStyledItemDelegate::createEditor (parent, option, index);
     }
-
+}
 
 void CSVWorld::CommandDelegate::setEditLock (bool locked)
 {