added basic scene subview (no functionality yet)

apps/opencs/CMakeLists.txt

@@ -59,7 +59,7 @@ opencs_hdrs_noqt (view/doc
 
 opencs_units (view/world
     table tablesubview scriptsubview util regionmapsubview tablebottombox creator genericcreator
-    cellcreator referenceablecreator referencecreator
+    cellcreator referenceablecreator referencecreator scenesubview scenetoolbar
     )
 
 opencs_units_noqt (view/world

apps/opencs/model/world/universalid.cpp

@@ -87,6 +87,7 @@ namespace
     static const TypeData sIndexArg[] =
     {
         { CSMWorld::UniversalId::Class_Transient, CSMWorld::UniversalId::Type_VerificationResults, "Verification Results", 0 },
+        { CSMWorld::UniversalId::Class_Collection, CSMWorld::UniversalId::Type_Scene, "Scene", 0 },
 
         { CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, 0, 0 } // end marker
     };

apps/opencs/model/world/universalid.hpp

@@ -86,10 +86,11 @@ namespace CSMWorld
                 Type_Reference,
                 Type_RegionMap,
                 Type_Filter,
-                Type_Filters
+                Type_Filters,
+                Type_Scene
             };
 
-            enum { NumberOfTypes = Type_Filters+1 };
+            enum { NumberOfTypes = Type_Scene+1 };
 
         private:
 

apps/opencs/view/doc/view.cpp

@@ -115,6 +115,10 @@ void CSVDoc::View::setupWorldMenu()
 
     world->addSeparator(); // items that don't represent single record lists follow here
 
+    QAction *scene = new QAction (tr ("Scene"), this);
+    connect (scene, SIGNAL (triggered()), this, SLOT (addSceneSubView()));
+    world->addAction (scene);
+
     QAction *regionMap = new QAction (tr ("Region Map"), this);
     connect (regionMap, SIGNAL (triggered()), this, SLOT (addRegionMapSubView()));
     world->addAction (regionMap);
@@ -403,6 +407,11 @@ void CSVDoc::View::addFiltersSubView()
     addSubView (CSMWorld::UniversalId::Type_Filters);
 }
 
+void CSVDoc::View::addSceneSubView()
+{
+    addSubView (CSMWorld::UniversalId::Type_Scene);
+}
+
 void CSVDoc::View::abortOperation (int type)
 {
     mDocument->abortOperation (type);

apps/opencs/view/doc/view.hpp

@@ -164,6 +164,8 @@ namespace CSVDoc
 
             void addFiltersSubView();
 
+            void addSceneSubView();
+
             void toggleShowStatusBar (bool show);
     };
 }

apps/opencs/view/world/scenesubview.cpp

@@ -0,0 +1,72 @@
+
+#include "scenesubview.hpp"
+
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QLabel>
+
+#include "../../model/doc/document.hpp"
+
+#include "../filter/filterbox.hpp"
+
+#include "tablebottombox.hpp"
+#include "creator.hpp"
+#include "scenetoolbar.hpp"
+
+CSVWorld::SceneSubView::SceneSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document)
+: SubView (id)
+{
+    QVBoxLayout *layout = new QVBoxLayout;
+
+    layout->setContentsMargins (QMargins (0, 0, 0, 0));
+
+    layout->addWidget (mBottom =
+        new TableBottomBox (NullCreatorFactory(), document.getData(), document.getUndoStack(), id,
+        this), 0);
+
+    QHBoxLayout *layout2 = new QHBoxLayout;
+
+    layout2->setContentsMargins (QMargins (0, 0, 0, 0));
+
+    SceneToolbar *toolbar = new SceneToolbar (this);
+    layout2->addWidget (toolbar, 0);
+
+    /// \todo replace with rendering widget
+    QPalette palette2 (palette());
+    palette2.setColor (QPalette::Background, Qt::white);
+    QLabel *placeholder = new QLabel ("Here goes the 3D scene", this);
+    placeholder->setAutoFillBackground (true);
+    placeholder->setPalette (palette2);
+    placeholder->setAlignment (Qt::AlignHCenter);
+
+    layout2->addWidget (placeholder, 1);
+
+    layout->insertLayout (0, layout2, 1);
+
+    CSVFilter::FilterBox *filterBox = new CSVFilter::FilterBox (document.getData(), this);
+
+    layout->insertWidget (0, filterBox);
+
+    QWidget *widget = new QWidget;
+
+    widget->setLayout (layout);
+
+    setWidget (widget);
+}
+
+void CSVWorld::SceneSubView::setEditLock (bool locked)
+{
+
+
+}
+
+void CSVWorld::SceneSubView::updateEditorSetting(const QString &settingName, const QString &settingValue)
+{
+
+
+}
+
+void CSVWorld::SceneSubView::setStatusBar (bool show)
+{
+    mBottom->setStatusBar (show);
+}

apps/opencs/view/world/scenesubview.hpp

@@ -0,0 +1,37 @@
+#ifndef CSV_WORLD_SCENESUBVIEW_H
+#define CSV_WORLD_SCENESUBVIEW_H
+
+#include "../doc/subview.hpp"
+
+class QModelIndex;
+
+namespace CSMDoc
+{
+    class Document;
+}
+
+namespace CSVWorld
+{
+    class Table;
+    class TableBottomBox;
+    class CreatorFactoryBase;
+
+    class SceneSubView : public CSVDoc::SubView
+    {
+            Q_OBJECT
+
+            TableBottomBox *mBottom;
+
+        public:
+
+            SceneSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document);
+
+            virtual void setEditLock (bool locked);
+
+            virtual void updateEditorSetting (const QString& key, const QString& value);
+
+            virtual void setStatusBar (bool show);
+    };
+}
+
+#endif

apps/opencs/view/world/scenetoolbar.cpp

@@ -0,0 +1,8 @@
+
+#include "scenetoolbar.hpp"
+
+CSVWorld::SceneToolbar::SceneToolbar (QWidget *parent) : QWidget (parent)
+{
+    setFixedWidth (52);
+
+}

apps/opencs/view/world/scenetoolbar.hpp

@@ -0,0 +1,20 @@
+#ifndef CSV_WORLD_SCENETOOLBAR_H
+#define CSV_WORLD_SCENETOOLBAR_H
+
+#include <QWidget>
+
+namespace CSVWorld
+{
+    class SceneToolbar : public QWidget
+    {
+            Q_OBJECT
+
+        public:
+
+            SceneToolbar (QWidget *parent);
+
+
+    };
+}
+
+#endif

apps/opencs/view/world/subviews.cpp

@@ -13,6 +13,7 @@
 #include "cellcreator.hpp"
 #include "referenceablecreator.hpp"
 #include "referencecreator.hpp"
+#include "scenesubview.hpp"
 
 void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
 {
@@ -62,4 +63,5 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
         new CSVDoc::SubViewFactoryWithCreator<TableSubView,
         CreatorFactory<CSVFilter::FilterCreator> >);
 
+    manager.add (CSMWorld::UniversalId::Type_Scene, new CSVDoc::SubViewFactory<SceneSubView>);
 }