From 6ff41c6a0063d1a2ea149c63bb6725eeea95c158 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Thu, 23 Oct 2014 11:28:58 +0200
Subject: [PATCH 1/7] intercept shift/ctrl double-clicks in tables

---
 apps/opencs/view/world/table.cpp | 13 +++++++++++++
 apps/opencs/view/world/table.hpp |  4 ++++
 2 files changed, 17 insertions(+)

diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp
index 6adf3e0c1..168a06356 100644
--- a/apps/opencs/view/world/table.cpp
+++ b/apps/opencs/view/world/table.cpp
@@ -177,6 +177,19 @@ void CSVWorld::Table::contextMenuEvent (QContextMenuEvent *event)
     menu.exec (event->globalPos());
 }
 
+void CSVWorld::Table::mouseDoubleClickEvent (QMouseEvent *event)
+{
+    Qt::KeyboardModifiers modifiers =
+        event->modifiers() & (Qt::ShiftModifier | Qt::ControlModifier);
+
+    if (!modifiers)
+        DragRecordTable::mouseDoubleClickEvent (event);
+    else
+    {
+
+    }
+}
+
 CSVWorld::Table::Table (const CSMWorld::UniversalId& id,
     bool createAndDelete, bool sorting, CSMDoc::Document& document)
 : mCreateAction (0), mCloneAction(0), mRecordStatusDisplay (0),
diff --git a/apps/opencs/view/world/table.hpp b/apps/opencs/view/world/table.hpp
index a80a0b362..9bd561bda 100644
--- a/apps/opencs/view/world/table.hpp
+++ b/apps/opencs/view/world/table.hpp
@@ -64,6 +64,10 @@ namespace CSVWorld
 
             void dropEvent(QDropEvent *event);
 
+        protected:
+
+            virtual void mouseDoubleClickEvent (QMouseEvent *event);
+
         public:
 
             Table (const CSMWorld::UniversalId& id, bool createAndDelete,

From a9f5632afdbdd5360626318090595387f5044dc6 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 25 Oct 2014 16:27:36 +0200
Subject: [PATCH 2/7] extended double click functionality in tables

---
 apps/opencs/view/world/table.cpp        | 76 +++++++++++++++++++++++--
 apps/opencs/view/world/table.hpp        | 16 +++++-
 apps/opencs/view/world/tablesubview.cpp |  7 +++
 apps/opencs/view/world/tablesubview.hpp |  2 +
 4 files changed, 96 insertions(+), 5 deletions(-)

diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp
index 168a06356..0502e7bbf 100644
--- a/apps/opencs/view/world/table.cpp
+++ b/apps/opencs/view/world/table.cpp
@@ -182,11 +182,71 @@ void CSVWorld::Table::mouseDoubleClickEvent (QMouseEvent *event)
     Qt::KeyboardModifiers modifiers =
         event->modifiers() & (Qt::ShiftModifier | Qt::ControlModifier);
 
-    if (!modifiers)
-        DragRecordTable::mouseDoubleClickEvent (event);
-    else
-    {
+    QModelIndex index = currentIndex();
 
+    selectionModel()->select (index,
+        QItemSelectionModel::Clear | QItemSelectionModel::Select | QItemSelectionModel::Rows);
+
+    std::map<Qt::KeyboardModifiers, DoubleClickAction>::iterator iter =
+        mDoubleClickActions.find (modifiers);
+
+    if (iter==mDoubleClickActions.end())
+    {
+        event->accept();
+        return;
+    }
+
+    switch (iter->second)
+    {
+        case Action_None:
+
+            event->accept();
+            break;
+
+        case Action_InPlaceEdit:
+
+            DragRecordTable::mouseDoubleClickEvent (event);
+            break;
+
+        case Action_EditRecord:
+
+            event->accept();
+            editRecord();
+            break;
+
+        case Action_View:
+
+            event->accept();
+            viewRecord();
+            break;
+
+        case Action_Revert:
+
+            event->accept();
+            if (mDispatcher->canRevert())
+                mDispatcher->executeRevert();
+            break;
+
+        case Action_Delete:
+
+            event->accept();
+            if (mDispatcher->canDelete())
+                mDispatcher->executeDelete();
+            break;
+
+        case Action_EditRecordAndClose:
+
+            event->accept();
+            editRecord();
+            emit closeRequest();
+            break;
+
+        case Action_ViewAndClose:
+
+            event->accept();
+            viewRecord();
+            emit closeRequest();
+            break;
     }
 }
 
@@ -297,6 +357,11 @@ CSVWorld::Table::Table (const CSMWorld::UniversalId& id,
         this, SLOT (selectionSizeUpdate ()));
 
     setAcceptDrops(true);
+
+    mDoubleClickActions.insert (std::make_pair (0, Action_InPlaceEdit));
+    mDoubleClickActions.insert (std::make_pair (Qt::ShiftModifier, Action_EditRecord));
+    mDoubleClickActions.insert (std::make_pair (Qt::ControlModifier, Action_View));
+    mDoubleClickActions.insert (std::make_pair (Qt::ShiftModifier | Qt::ControlModifier, Action_EditRecordAndClose));
 }
 
 void CSVWorld::Table::setEditLock (bool locked)
@@ -417,6 +482,9 @@ void CSVWorld::Table::editCell()
 
 void CSVWorld::Table::viewRecord()
 {
+    if (!(mModel->getFeatures() & CSMWorld::IdTableBase::Feature_View))
+        return;
+
     QModelIndexList selectedRows = selectionModel()->selectedRows();
 
     if (selectedRows.size()==1)
diff --git a/apps/opencs/view/world/table.hpp b/apps/opencs/view/world/table.hpp
index 9bd561bda..75161b8b6 100644
--- a/apps/opencs/view/world/table.hpp
+++ b/apps/opencs/view/world/table.hpp
@@ -36,6 +36,18 @@ namespace CSVWorld
     {
             Q_OBJECT
 
+            enum DoubleClickAction
+            {
+                Action_None,
+                Action_InPlaceEdit,
+                Action_EditRecord,
+                Action_View,
+                Action_Revert,
+                Action_Delete,
+                Action_EditRecordAndClose,
+                Action_ViewAndClose
+            };
+
             std::vector<CommandDelegate *> mDelegates;
             QAction *mEditAction;
             QAction *mCreateAction;
@@ -53,8 +65,8 @@ namespace CSVWorld
             CSMWorld::IdTableBase *mModel;
             int mRecordStatusDisplay;
             CSMWorld::CommandDispatcher *mDispatcher;
-
             CSMWorld::UniversalId mEditCellId;
+            std::map<Qt::KeyboardModifiers, DoubleClickAction> mDoubleClickActions;
 
         private:
 
@@ -98,6 +110,8 @@ namespace CSVWorld
 
             void cloneRequest(const CSMWorld::UniversalId&);
 
+            void closeRequest();
+
         private slots:
 
             void editCell();
diff --git a/apps/opencs/view/world/tablesubview.cpp b/apps/opencs/view/world/tablesubview.cpp
index e2c8d5c1e..8374da35d 100644
--- a/apps/opencs/view/world/tablesubview.cpp
+++ b/apps/opencs/view/world/tablesubview.cpp
@@ -69,6 +69,8 @@ CSVWorld::TableSubView::TableSubView (const CSMWorld::UniversalId& id, CSMDoc::D
 
     connect(mFilterBox, SIGNAL(recordDropped(std::vector<CSMWorld::UniversalId>&, Qt::DropAction)),
         this, SLOT(createFilterRequest(std::vector<CSMWorld::UniversalId>&, Qt::DropAction)));
+
+    connect (mTable, SIGNAL (closeRequest()), this, SLOT (closeRequest()));
 }
 
 void CSVWorld::TableSubView::setEditLock (bool locked)
@@ -150,3 +152,8 @@ bool CSVWorld::TableSubView::eventFilter (QObject* object, QEvent* event)
     }
     return false;
 }
+
+void CSVWorld::TableSubView::closeRequest()
+{
+    deleteLater();
+}
diff --git a/apps/opencs/view/world/tablesubview.hpp b/apps/opencs/view/world/tablesubview.hpp
index 9d86c32e4..ad5f334bf 100644
--- a/apps/opencs/view/world/tablesubview.hpp
+++ b/apps/opencs/view/world/tablesubview.hpp
@@ -63,6 +63,8 @@ namespace CSVWorld
             void cloneRequest (const CSMWorld::UniversalId& toClone);
             void createFilterRequest(std::vector< CSMWorld::UniversalId >& types,
                                      Qt::DropAction action);
+
+            void closeRequest();
     };
 }
 

From aad13e6bffa332e4a497c42e61f4837e2e9fca2d Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 25 Oct 2014 18:13:56 +0200
Subject: [PATCH 3/7] close view when closing last sub-view unless this view is
 the last view

---
 apps/opencs/view/doc/subview.cpp          |  5 +++++
 apps/opencs/view/doc/subview.hpp          |  6 ++++++
 apps/opencs/view/doc/view.cpp             | 12 +++++++++++-
 apps/opencs/view/doc/view.hpp             |  2 ++
 apps/opencs/view/world/previewsubview.cpp |  5 -----
 apps/opencs/view/world/previewsubview.hpp |  2 --
 apps/opencs/view/world/scenesubview.cpp   |  5 -----
 apps/opencs/view/world/scenesubview.hpp   |  2 --
 apps/opencs/view/world/scriptsubview.cpp  |  2 +-
 apps/opencs/view/world/tablesubview.cpp   |  4 ----
 apps/opencs/view/world/tablesubview.hpp   |  2 --
 11 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/apps/opencs/view/doc/subview.cpp b/apps/opencs/view/doc/subview.cpp
index ab4325cfc..1af6a7a2f 100644
--- a/apps/opencs/view/doc/subview.cpp
+++ b/apps/opencs/view/doc/subview.cpp
@@ -35,3 +35,8 @@ void CSVDoc::SubView::closeEvent (QCloseEvent *event)
     if(mParent)
         mParent->updateSubViewIndicies(this);
 }
+
+void CSVDoc::SubView::closeRequest()
+{
+    emit closeRequest (this);
+}
\ No newline at end of file
diff --git a/apps/opencs/view/doc/subview.hpp b/apps/opencs/view/doc/subview.hpp
index 6a3ddd8bd..60478f0bc 100644
--- a/apps/opencs/view/doc/subview.hpp
+++ b/apps/opencs/view/doc/subview.hpp
@@ -57,6 +57,12 @@ namespace CSVDoc
 
             void focusId (const CSMWorld::UniversalId& universalId, const std::string& hint);
 
+            void closeRequest (SubView *subView);
+
+        protected slots:
+
+            void closeRequest();
+
         public slots:
             virtual void updateUserSetting
                                     (const QString &, const QStringList &);
diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index d36e01901..299c07805 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -323,7 +323,7 @@ void CSVDoc::View::updateSubViewIndicies(SubView *view)
     if(view && mSubViews.contains(view))
         mSubViews.removeOne(view);
 
-    if(mSubViews.size() == 1)
+    if (mSubViews.size() == 1)
     {
         if(!mSubViews.at(0)->isFloating())
         {
@@ -518,6 +518,8 @@ void CSVDoc::View::addSubView (const CSMWorld::UniversalId& id, const std::strin
              view,
              SLOT (updateUserSetting (const QString &, const QStringList &)));
 
+    connect (view, SIGNAL (closeRequest (SubView *)), this, SLOT (closeRequest (SubView *)));
+
     view->show();
 }
 
@@ -761,3 +763,11 @@ void CSVDoc::View::stop()
 {
     mDocument->stopRunning();
 }
+
+void CSVDoc::View::closeRequest (SubView *subView)
+{
+    if (mSubViews.size()>1 || mViewTotal<=1)
+        subView->deleteLater();
+    else if (mViewManager.closeRequest (this))
+        mViewManager.removeDocAndView (mDocument);
+}
\ No newline at end of file
diff --git a/apps/opencs/view/doc/view.hpp b/apps/opencs/view/doc/view.hpp
index e3ada1f2e..32ef8071d 100644
--- a/apps/opencs/view/doc/view.hpp
+++ b/apps/opencs/view/doc/view.hpp
@@ -222,6 +222,8 @@ namespace CSVDoc
             void run (const std::string& profile, const std::string& startupInstruction = "");
 
             void stop();
+
+            void closeRequest (SubView *subView);
     };
 }
 
diff --git a/apps/opencs/view/world/previewsubview.cpp b/apps/opencs/view/world/previewsubview.cpp
index 1e106c69f..dd94a00e0 100644
--- a/apps/opencs/view/world/previewsubview.cpp
+++ b/apps/opencs/view/world/previewsubview.cpp
@@ -52,11 +52,6 @@ CSVWorld::PreviewSubView::PreviewSubView (const CSMWorld::UniversalId& id, CSMDo
 
 void CSVWorld::PreviewSubView::setEditLock (bool locked) {}
 
-void CSVWorld::PreviewSubView::closeRequest()
-{
-    deleteLater();
-}
-
 void CSVWorld::PreviewSubView::referenceableIdChanged (const std::string& id)
 {
     if (id.empty())
diff --git a/apps/opencs/view/world/previewsubview.hpp b/apps/opencs/view/world/previewsubview.hpp
index 4ca25c3cb..fb57ce7a3 100644
--- a/apps/opencs/view/world/previewsubview.hpp
+++ b/apps/opencs/view/world/previewsubview.hpp
@@ -29,8 +29,6 @@ namespace CSVWorld
 
         private slots:
 
-            void closeRequest();
-
             void referenceableIdChanged (const std::string& id);
     };
 }
diff --git a/apps/opencs/view/world/scenesubview.cpp b/apps/opencs/view/world/scenesubview.cpp
index d10eebb30..4cb6088cc 100644
--- a/apps/opencs/view/world/scenesubview.cpp
+++ b/apps/opencs/view/world/scenesubview.cpp
@@ -150,11 +150,6 @@ void CSVWorld::SceneSubView::useHint (const std::string& hint)
     mScene->useViewHint (hint);
 }
 
-void CSVWorld::SceneSubView::closeRequest()
-{
-    deleteLater();
-}
-
 void CSVWorld::SceneSubView::cellSelectionChanged (const CSMWorld::UniversalId& id)
 {
     setUniversalId(id);
diff --git a/apps/opencs/view/world/scenesubview.hpp b/apps/opencs/view/world/scenesubview.hpp
index c0905f0d6..acb7944d8 100644
--- a/apps/opencs/view/world/scenesubview.hpp
+++ b/apps/opencs/view/world/scenesubview.hpp
@@ -75,8 +75,6 @@ namespace CSVWorld
 
         private slots:
 
-            void closeRequest();
-
             void cellSelectionChanged (const CSMWorld::CellSelection& selection);
 
             void cellSelectionChanged (const CSMWorld::UniversalId& id);
diff --git a/apps/opencs/view/world/scriptsubview.cpp b/apps/opencs/view/world/scriptsubview.cpp
index df3fd87be..22d8e7e51 100644
--- a/apps/opencs/view/world/scriptsubview.cpp
+++ b/apps/opencs/view/world/scriptsubview.cpp
@@ -81,6 +81,6 @@ void CSVWorld::ScriptSubView::rowsAboutToBeRemoved (const QModelIndex& parent, i
     QModelIndex index = mModel->getModelIndex (getUniversalId().getId(), mColumn);
 
     if (!parent.isValid() && index.row()>=start && index.row()<=end)
-        deleteLater();
+        emit closeRequest();
 }
 
diff --git a/apps/opencs/view/world/tablesubview.cpp b/apps/opencs/view/world/tablesubview.cpp
index 8374da35d..54518023b 100644
--- a/apps/opencs/view/world/tablesubview.cpp
+++ b/apps/opencs/view/world/tablesubview.cpp
@@ -153,7 +153,3 @@ bool CSVWorld::TableSubView::eventFilter (QObject* object, QEvent* event)
     return false;
 }
 
-void CSVWorld::TableSubView::closeRequest()
-{
-    deleteLater();
-}
diff --git a/apps/opencs/view/world/tablesubview.hpp b/apps/opencs/view/world/tablesubview.hpp
index ad5f334bf..9d86c32e4 100644
--- a/apps/opencs/view/world/tablesubview.hpp
+++ b/apps/opencs/view/world/tablesubview.hpp
@@ -63,8 +63,6 @@ namespace CSVWorld
             void cloneRequest (const CSMWorld::UniversalId& toClone);
             void createFilterRequest(std::vector< CSMWorld::UniversalId >& types,
                                      Qt::DropAction action);
-
-            void closeRequest();
     };
 }
 

From 275bf854edcf35963dd9c6584c34c212dfef955c Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Mon, 27 Oct 2014 08:57:18 +0100
Subject: [PATCH 4/7] added new user setting: window/hide-subview (hide subview
 titlebar if there is only one subview in the window)

---
 apps/opencs/model/settings/usersettings.cpp |  6 +++
 apps/opencs/view/doc/subview.cpp            |  5 ++
 apps/opencs/view/doc/subview.hpp            |  4 ++
 apps/opencs/view/doc/view.cpp               | 58 +++++++++++++--------
 apps/opencs/view/doc/view.hpp               |  4 +-
 apps/opencs/view/world/previewsubview.cpp   | 15 ++++--
 apps/opencs/view/world/previewsubview.hpp   |  3 ++
 apps/opencs/view/world/scenesubview.cpp     | 14 +++--
 apps/opencs/view/world/scenesubview.hpp     |  3 ++
 9 files changed, 82 insertions(+), 30 deletions(-)

diff --git a/apps/opencs/model/settings/usersettings.cpp b/apps/opencs/model/settings/usersettings.cpp
index 1813a97ff..170d1021e 100644
--- a/apps/opencs/model/settings/usersettings.cpp
+++ b/apps/opencs/model/settings/usersettings.cpp
@@ -127,6 +127,12 @@ void CSMSettings::UserSettings::buildSettingModelDefaults()
         maxSubView->setToolTip ("If the maximum number is reached and a new subview is opened "
             "it will be placed into a new top-level window.");
 
+        Setting *hide = createSetting (Type_CheckBox, "hide-subview", "Hide single subview");
+        hide->setDefaultValue ("false");
+        hide->setToolTip ("When a view contains only a single subview, hide the subview title "
+            "bar and if this subview is closed also close the view (unless it is the last "
+            "view for this document)");
+
         Setting *minWidth = createSetting (Type_SpinBox, "minimum-width",
             "Minimum subview width");
         minWidth->setDefaultValue (325);
diff --git a/apps/opencs/view/doc/subview.cpp b/apps/opencs/view/doc/subview.cpp
index 1af6a7a2f..e78f8bef4 100644
--- a/apps/opencs/view/doc/subview.cpp
+++ b/apps/opencs/view/doc/subview.cpp
@@ -36,6 +36,11 @@ void CSVDoc::SubView::closeEvent (QCloseEvent *event)
         mParent->updateSubViewIndicies(this);
 }
 
+std::string CSVDoc::SubView::getTitle() const
+{
+    return mUniversalId.toString();
+}
+
 void CSVDoc::SubView::closeRequest()
 {
     emit closeRequest (this);
diff --git a/apps/opencs/view/doc/subview.hpp b/apps/opencs/view/doc/subview.hpp
index 60478f0bc..384019e8b 100644
--- a/apps/opencs/view/doc/subview.hpp
+++ b/apps/opencs/view/doc/subview.hpp
@@ -49,6 +49,8 @@ namespace CSVDoc
 
             void setParent(View *parent) { mParent = parent; }
 
+            virtual std::string getTitle() const;
+
         private:
 
             void closeEvent (QCloseEvent *event);
@@ -59,6 +61,8 @@ namespace CSVDoc
 
             void closeRequest (SubView *subView);
 
+            void updateTitle();
+
         protected slots:
 
             void closeRequest();
diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index 299c07805..3b81e6dac 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -300,7 +300,7 @@ void CSVDoc::View::setupUi()
     setupDebugMenu();
 }
 
-void CSVDoc::View::updateTitle(const std::string subview)
+void CSVDoc::View::updateTitle()
 {
     std::ostringstream stream;
 
@@ -312,8 +312,13 @@ void CSVDoc::View::updateTitle(const std::string subview)
     if (mViewTotal>1)
         stream << " [" << (mViewIndex+1) << "/" << mViewTotal << "]";
 
-    if (subview != "")
-        stream << " - " << subview;
+    CSMSettings::UserSettings &userSettings = CSMSettings::UserSettings::instance();
+
+    bool hideTitle = userSettings.setting ("window/hide-subview", QString ("false"))=="true" &&
+        mSubViews.size()==1 && !mSubViews.at (0)->isFloating();
+
+    if (hideTitle)
+        stream << " - " << mSubViews.at (0)->getTitle();
 
     setWindowTitle (stream.str().c_str());
 }
@@ -323,24 +328,26 @@ void CSVDoc::View::updateSubViewIndicies(SubView *view)
     if(view && mSubViews.contains(view))
         mSubViews.removeOne(view);
 
-    if (mSubViews.size() == 1)
+    CSMSettings::UserSettings &userSettings = CSMSettings::UserSettings::instance();
+
+    bool hideTitle = userSettings.setting ("window/hide-subview", QString ("false"))=="true" &&
+        mSubViews.size()==1 && !mSubViews.at (0)->isFloating();
+
+    updateTitle();
+
+    foreach (SubView *subView, mSubViews)
     {
-        if(!mSubViews.at(0)->isFloating())
+        if (!subView->isFloating())
         {
-            mSubViews.at(0)->setTitleBarWidget(new QWidget(this));
-            updateTitle(mSubViews.at(0)->getUniversalId().getTypeName().c_str());
-        }
-    }
-    else
-    {
-        updateTitle();
-        if(mSubViews.size() > 1)
-        {
-            foreach(SubView * sb, mSubViews)
+            if (hideTitle)
             {
-                QWidget * tb = sb->titleBarWidget();
-                if(tb) delete tb;
-                sb->setTitleBarWidget(0);
+                subView->setTitleBarWidget (new QWidget (this));
+                subView->setWindowTitle (QString::fromUtf8 (subView->getTitle().c_str()));
+            }
+            else
+            {
+                delete subView->titleBarWidget();
+                subView->setTitleBarWidget (0);
             }
         }
     }
@@ -520,6 +527,8 @@ void CSVDoc::View::addSubView (const CSMWorld::UniversalId& id, const std::strin
 
     connect (view, SIGNAL (closeRequest (SubView *)), this, SLOT (closeRequest (SubView *)));
 
+    connect (view, SIGNAL (updateTitle()), this, SLOT (updateTitle()));
+
     view->show();
 }
 
@@ -731,9 +740,11 @@ void CSVDoc::View::resizeViewHeight (int height)
         resize (geometry().width(), height);
 }
 
-void CSVDoc::View::updateUserSetting
-                                (const QString &name, const QStringList &list)
-{}
+void CSVDoc::View::updateUserSetting (const QString &name, const QStringList &list)
+{
+    if (name=="window/hide-subview")
+        updateSubViewIndicies (0);
+}
 
 void CSVDoc::View::toggleShowStatusBar (bool show)
 {
@@ -766,7 +777,10 @@ void CSVDoc::View::stop()
 
 void CSVDoc::View::closeRequest (SubView *subView)
 {
-    if (mSubViews.size()>1 || mViewTotal<=1)
+    CSMSettings::UserSettings &userSettings = CSMSettings::UserSettings::instance();
+
+    if (mSubViews.size()>1 || mViewTotal<=1 ||
+        userSettings.setting ("window/hide-subview", QString ("false"))!="true")
         subView->deleteLater();
     else if (mViewManager.closeRequest (this))
         mViewManager.removeDocAndView (mDocument);
diff --git a/apps/opencs/view/doc/view.hpp b/apps/opencs/view/doc/view.hpp
index 32ef8071d..ee062f725 100644
--- a/apps/opencs/view/doc/view.hpp
+++ b/apps/opencs/view/doc/view.hpp
@@ -75,8 +75,6 @@ namespace CSVDoc
 
             void setupUi();
 
-            void updateTitle(const std::string subview = "");
-
             void updateActions();
 
             void exitApplication();
@@ -139,6 +137,8 @@ namespace CSVDoc
 
             void updateUserSetting (const QString &, const QStringList &);
 
+            void updateTitle();
+
         private slots:
 
             void newView();
diff --git a/apps/opencs/view/world/previewsubview.cpp b/apps/opencs/view/world/previewsubview.cpp
index dd94a00e0..1ae466f42 100644
--- a/apps/opencs/view/world/previewsubview.cpp
+++ b/apps/opencs/view/world/previewsubview.cpp
@@ -9,7 +9,7 @@
 #include "../widget/scenetoolmode.hpp"
 
 CSVWorld::PreviewSubView::PreviewSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document)
-: SubView (id)
+: SubView (id), mTitle (id.toString().c_str())
 {
     QHBoxLayout *layout = new QHBoxLayout;
 
@@ -52,10 +52,19 @@ CSVWorld::PreviewSubView::PreviewSubView (const CSMWorld::UniversalId& id, CSMDo
 
 void CSVWorld::PreviewSubView::setEditLock (bool locked) {}
 
+std::string CSVWorld::PreviewSubView::getTitle() const
+{
+    return mTitle;
+}
+
 void CSVWorld::PreviewSubView::referenceableIdChanged (const std::string& id)
 {
     if (id.empty())
-        setWindowTitle ("Preview: Reference to <nothing>");
+        mTitle = "Preview: Reference to <nothing>";
     else
-        setWindowTitle (("Preview: Reference to " + id).c_str());
+        mTitle = "Preview: Reference to " + id;
+
+    setWindowTitle (QString::fromUtf8 (mTitle.c_str()));
+
+    emit updateTitle();
 }
\ No newline at end of file
diff --git a/apps/opencs/view/world/previewsubview.hpp b/apps/opencs/view/world/previewsubview.hpp
index fb57ce7a3..a28be5c36 100644
--- a/apps/opencs/view/world/previewsubview.hpp
+++ b/apps/opencs/view/world/previewsubview.hpp
@@ -20,6 +20,7 @@ namespace CSVWorld
             Q_OBJECT
 
             CSVRender::PreviewWidget *mScene;
+            std::string mTitle;
 
         public:
 
@@ -27,6 +28,8 @@ namespace CSVWorld
 
             virtual void setEditLock (bool locked);
 
+            virtual std::string getTitle() const;
+
         private slots:
 
             void referenceableIdChanged (const std::string& id);
diff --git a/apps/opencs/view/world/scenesubview.cpp b/apps/opencs/view/world/scenesubview.cpp
index 4cb6088cc..ce68da362 100644
--- a/apps/opencs/view/world/scenesubview.cpp
+++ b/apps/opencs/view/world/scenesubview.cpp
@@ -150,16 +150,22 @@ void CSVWorld::SceneSubView::useHint (const std::string& hint)
     mScene->useViewHint (hint);
 }
 
+std::string CSVWorld::SceneSubView::getTitle() const
+{
+    return mTitle;
+}
+
 void CSVWorld::SceneSubView::cellSelectionChanged (const CSMWorld::UniversalId& id)
 {
     setUniversalId(id);
     std::ostringstream stream;
     stream << "Scene: " << getUniversalId().getId();
 
-    setWindowTitle (QString::fromUtf8 (stream.str().c_str()));
+    mTitle = stream.str();
+    setWindowTitle (QString::fromUtf8 (mTitle.c_str()));
+    emit updateTitle();
 }
 
-
 void CSVWorld::SceneSubView::cellSelectionChanged (const CSMWorld::CellSelection& selection)
 {
     setUniversalId(CSMWorld::UniversalId(CSMWorld::UniversalId::Type_Scene, "sys::default"));
@@ -184,7 +190,9 @@ void CSVWorld::SceneSubView::cellSelectionChanged (const CSMWorld::CellSelection
             stream << "cell around it)";
     }
 
-    setWindowTitle (QString::fromUtf8 (stream.str().c_str()));
+    mTitle = stream.str();
+    setWindowTitle (QString::fromUtf8 (mTitle.c_str()));
+    emit updateTitle();
 }
 
 void CSVWorld::SceneSubView::handleDrop (const std::vector< CSMWorld::UniversalId >& data)
diff --git a/apps/opencs/view/world/scenesubview.hpp b/apps/opencs/view/world/scenesubview.hpp
index acb7944d8..fc45347d0 100644
--- a/apps/opencs/view/world/scenesubview.hpp
+++ b/apps/opencs/view/world/scenesubview.hpp
@@ -44,6 +44,7 @@ namespace CSVWorld
             QHBoxLayout* mLayout;
             CSMDoc::Document& mDocument;
             CSVWidget::SceneToolbar* mToolbar;
+            std::string mTitle;
 
         public:
 
@@ -57,6 +58,8 @@ namespace CSVWorld
 
             virtual void useHint (const std::string& hint);
 
+            virtual std::string getTitle() const;
+
         private:
 
             void makeConnections(CSVRender::PagedWorldspaceWidget* widget);

From b0a7b457f7e7adca3c8d320c2cbefaf890749d90 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Mon, 27 Oct 2014 09:32:02 +0100
Subject: [PATCH 5/7] made double click actions in tables configurable

---
 apps/opencs/model/settings/usersettings.cpp | 46 ++++++++++++++++
 apps/opencs/view/world/table.cpp            | 60 +++++++++++++++++----
 2 files changed, 96 insertions(+), 10 deletions(-)

diff --git a/apps/opencs/model/settings/usersettings.cpp b/apps/opencs/model/settings/usersettings.cpp
index 170d1021e..121ba7c76 100644
--- a/apps/opencs/model/settings/usersettings.cpp
+++ b/apps/opencs/model/settings/usersettings.cpp
@@ -156,6 +156,52 @@ void CSMSettings::UserSettings::buildSettingModelDefaults()
         ritd->setDeclaredValues (values);
     }
 
+    declareSection ("table-input", "Table Input");
+    {
+        QString inPlaceEdit ("Edit in Place");
+        QString editRecord ("Edit Record");
+        QString view ("View");
+        QString editRecordAndClose ("Edit Record and Close");
+
+        QStringList values;
+        values
+            << "None" << inPlaceEdit << editRecord << view << "Revert" << "Delete"
+            << editRecordAndClose << "View and Close";
+
+        QString toolTip = "<ul>"
+            "<li>None</li>"
+            "<li>Edit in Place: Edit the clicked cell</li>"
+            "<li>Edit Record: Open a dialogue subview for the clicked record</li>"
+            "<li>View: Open a scene subview for the clicked record (not available everywhere)</li>"
+            "<li>Revert: Revert record</li>"
+            "<li>Delete: Delete recordy</li>"
+            "<li>Edit Record and Close: Open a dialogue subview for the clicked record and close the table subview</li>"
+            "<li>View And Close: Open a scene subview for the clicked record and close the table subview</li>"
+            "</ul>";
+
+        Setting *doubleClick = createSetting (Type_ComboBox, "double", "Double Click");
+        doubleClick->setDeclaredValues (values);
+        doubleClick->setDefaultValue (inPlaceEdit);
+        doubleClick->setToolTip ("Action on double click in table:<p>" + toolTip);
+
+        Setting *shiftDoubleClick = createSetting (Type_ComboBox, "double-s",
+            "Shift Double Click");
+        shiftDoubleClick->setDeclaredValues (values);
+        shiftDoubleClick->setDefaultValue (editRecord);
+        shiftDoubleClick->setToolTip ("Action on shift double click in table:<p>" + toolTip);
+
+        Setting *ctrlDoubleClick = createSetting (Type_ComboBox, "double-c",
+            "Control Double Click");
+        ctrlDoubleClick->setDeclaredValues (values);
+        ctrlDoubleClick->setDefaultValue (view);
+        ctrlDoubleClick->setToolTip ("Action on control double click in table:<p>" + toolTip);
+
+        Setting *shiftCtrlDoubleClick = createSetting (Type_ComboBox, "double-sc",
+            "Shift Control Double Click");
+        shiftCtrlDoubleClick->setDeclaredValues (values);
+        shiftCtrlDoubleClick->setDefaultValue (editRecordAndClose);
+        shiftCtrlDoubleClick->setToolTip ("Action on shift control double click in table:<p>" + toolTip);
+    }
 
     {
         /******************************************************************
diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp
index 0502e7bbf..ce53dcf5c 100644
--- a/apps/opencs/view/world/table.cpp
+++ b/apps/opencs/view/world/table.cpp
@@ -520,18 +520,59 @@ void CSVWorld::Table::previewRecord()
 void CSVWorld::Table::updateUserSetting
                                 (const QString &name, const QStringList &list)
 {
-    int columns = mModel->columnCount();
+    if (name=="records/type-format" || name=="records/status-format")
+    {
+        int columns = mModel->columnCount();
 
-    for (int i=0; i<columns; ++i)
-        if (QAbstractItemDelegate *delegate = itemDelegateForColumn (i))
-        {
-            dynamic_cast<CommandDelegate&>
-                                    (*delegate).updateUserSetting (name, list);
+        for (int i=0; i<columns; ++i)
+            if (QAbstractItemDelegate *delegate = itemDelegateForColumn (i))
             {
-                emit dataChanged (mModel->index (0, i),
-                                  mModel->index (mModel->rowCount()-1, i));
+                dynamic_cast<CommandDelegate&>
+                                        (*delegate).updateUserSetting (name, list);
+                {
+                    emit dataChanged (mModel->index (0, i),
+                                    mModel->index (mModel->rowCount()-1, i));
+                }
             }
-        }
+        return;
+    }
+
+    QString base ("table-input/double");
+    if (name.startsWith (base))
+    {
+        QString modifierString = name.mid (base.size());
+        Qt::KeyboardModifiers modifiers = 0;
+
+        if (modifierString=="-s")
+            modifiers = Qt::ShiftModifier;
+        else if (modifierString=="-c")
+            modifiers = Qt::ControlModifier;
+        else if (modifierString=="-sc")
+            modifiers = Qt::ShiftModifier | Qt::ControlModifier;
+
+        DoubleClickAction action = Action_None;
+
+        QString value = list.at (0);
+
+        if (value=="Edit in Place")
+            action = Action_InPlaceEdit;
+        else if (value=="Edit Record")
+            action = Action_EditRecord;
+        else if (value=="View")
+            action = Action_View;
+        else if (value=="Revert")
+            action = Action_Revert;
+        else if (value=="Delete")
+            action = Action_Delete;
+        else if (value=="Edit Record and Close")
+            action = Action_EditRecordAndClose;
+        else if (value=="View and Close")
+            action = Action_ViewAndClose;
+
+        mDoubleClickActions[modifiers] = action;
+
+        return;
+    }
 }
 
 void CSVWorld::Table::tableSizeUpdate()
@@ -648,7 +689,6 @@ std::vector<std::string> CSVWorld::Table::getColumnsWithDisplay(CSMWorld::Column
 
 std::vector< CSMWorld::UniversalId > CSVWorld::Table::getDraggedRecords() const
 {
-
     QModelIndexList selectedRows = selectionModel()->selectedRows();
     std::vector<CSMWorld::UniversalId> idToDrag;
 

From 1aef9304e99a6e2af8ef817ff90f51178d8dd193 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Mon, 27 Oct 2014 09:44:18 +0100
Subject: [PATCH 6/7] replaced the signal/slot user settings update with a
 regular function call

---
 apps/opencs/view/doc/subview.hpp |  6 ++----
 apps/opencs/view/doc/view.cpp    | 10 +++++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/apps/opencs/view/doc/subview.hpp b/apps/opencs/view/doc/subview.hpp
index 384019e8b..e1331750a 100644
--- a/apps/opencs/view/doc/subview.hpp
+++ b/apps/opencs/view/doc/subview.hpp
@@ -51,6 +51,8 @@ namespace CSVDoc
 
             virtual std::string getTitle() const;
 
+            virtual void updateUserSetting (const QString& name, const QStringList& value);
+
         private:
 
             void closeEvent (QCloseEvent *event);
@@ -66,10 +68,6 @@ namespace CSVDoc
         protected slots:
 
             void closeRequest();
-
-        public slots:
-            virtual void updateUserSetting
-                                    (const QString &, const QStringList &);
     };
 }
 
diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index 3b81e6dac..d065631cb 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -520,11 +520,6 @@ void CSVDoc::View::addSubView (const CSMWorld::UniversalId& id, const std::strin
     connect (view, SIGNAL (focusId (const CSMWorld::UniversalId&, const std::string&)), this,
         SLOT (addSubView (const CSMWorld::UniversalId&, const std::string&)));
 
-    connect (&CSMSettings::UserSettings::instance(),
-             SIGNAL (userSettingUpdated (const QString &, const QStringList &)),
-             view,
-             SLOT (updateUserSetting (const QString &, const QStringList &)));
-
     connect (view, SIGNAL (closeRequest (SubView *)), this, SLOT (closeRequest (SubView *)));
 
     connect (view, SIGNAL (updateTitle()), this, SLOT (updateTitle()));
@@ -744,6 +739,11 @@ void CSVDoc::View::updateUserSetting (const QString &name, const QStringList &li
 {
     if (name=="window/hide-subview")
         updateSubViewIndicies (0);
+
+    foreach (SubView *subView, mSubViews)
+    {
+        subView->updateUserSetting (name, list);
+    }
 }
 
 void CSVDoc::View::toggleShowStatusBar (bool show)

From 6f4b75375003ddb07d69fea8b0b9f4bcfdcd40ae Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Mon, 27 Oct 2014 09:51:55 +0100
Subject: [PATCH 7/7] replaced regular function call from SubView to View with
 signal-slot-connection

---
 apps/opencs/view/doc/subview.cpp | 6 ++----
 apps/opencs/view/doc/subview.hpp | 7 ++++---
 apps/opencs/view/doc/view.cpp    | 3 +++
 apps/opencs/view/doc/view.hpp    | 6 +++---
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/apps/opencs/view/doc/subview.cpp b/apps/opencs/view/doc/subview.cpp
index e78f8bef4..a9dce25be 100644
--- a/apps/opencs/view/doc/subview.cpp
+++ b/apps/opencs/view/doc/subview.cpp
@@ -3,7 +3,7 @@
 #include "view.hpp"
 
 CSVDoc::SubView::SubView (const CSMWorld::UniversalId& id)
- : mUniversalId (id), mParent (NULL)
+ : mUniversalId (id)
 {
     /// \todo  add a button to the title bar that clones this sub view
 
@@ -31,9 +31,7 @@ void CSVDoc::SubView::setUniversalId (const CSMWorld::UniversalId& id)
 
 void CSVDoc::SubView::closeEvent (QCloseEvent *event)
 {
-    // update title bars of view and subviews
-    if(mParent)
-        mParent->updateSubViewIndicies(this);
+    emit updateSubViewIndicies (this);
 }
 
 std::string CSVDoc::SubView::getTitle() const
diff --git a/apps/opencs/view/doc/subview.hpp b/apps/opencs/view/doc/subview.hpp
index e1331750a..a8aa3cda1 100644
--- a/apps/opencs/view/doc/subview.hpp
+++ b/apps/opencs/view/doc/subview.hpp
@@ -25,12 +25,13 @@ namespace CSVDoc
             Q_OBJECT
 
             CSMWorld::UniversalId mUniversalId;
-            View *mParent;
 
             // not implemented
             SubView (const SubView&);
             SubView& operator= (SubView&);
+
         protected:
+
             void setUniversalId(const CSMWorld::UniversalId& id);
 
         public:
@@ -47,8 +48,6 @@ namespace CSVDoc
             virtual void useHint (const std::string& hint);
             ///< Default implementation: ignored
 
-            void setParent(View *parent) { mParent = parent; }
-
             virtual std::string getTitle() const;
 
             virtual void updateUserSetting (const QString& name, const QStringList& value);
@@ -65,6 +64,8 @@ namespace CSVDoc
 
             void updateTitle();
 
+            void updateSubViewIndicies (SubView *view = 0);
+
         protected slots:
 
             void closeRequest();
diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index d065631cb..23bd0a941 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -524,6 +524,9 @@ void CSVDoc::View::addSubView (const CSMWorld::UniversalId& id, const std::strin
 
     connect (view, SIGNAL (updateTitle()), this, SLOT (updateTitle()));
 
+    connect (view, SIGNAL (updateSubViewIndicies (SubView *)),
+        this, SLOT (updateSubViewIndicies (SubView *)));
+
     view->show();
 }
 
diff --git a/apps/opencs/view/doc/view.hpp b/apps/opencs/view/doc/view.hpp
index ee062f725..55ea5ee51 100644
--- a/apps/opencs/view/doc/view.hpp
+++ b/apps/opencs/view/doc/view.hpp
@@ -112,9 +112,6 @@ namespace CSVDoc
             /// Function called by view manager when user preferences are updated
             void updateEditorSetting (const QString &, const QString &);
 
-            // called when subviews are added or removed
-            void updateSubViewIndicies(SubView *view = 0);
-
         signals:
 
             void newGameRequest();
@@ -139,6 +136,9 @@ namespace CSVDoc
 
             void updateTitle();
 
+            // called when subviews are added or removed
+            void updateSubViewIndicies (SubView *view = 0);
+
         private slots:
 
             void newView();