From 48468b7d0ca5db689ca0b6d1141f8a4119a5b35f Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sun, 8 Jun 2014 14:10:08 +0200
Subject: [PATCH] some dialogue subview cleanup and start of command
 dispatching refactoring

---
 apps/opencs/view/world/dialoguesubview.cpp | 30 +++++++++-------------
 apps/opencs/view/world/dialoguesubview.hpp |  3 +++
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/apps/opencs/view/world/dialoguesubview.cpp b/apps/opencs/view/world/dialoguesubview.cpp
index 6b57f2685..ad2db8723 100644
--- a/apps/opencs/view/world/dialoguesubview.cpp
+++ b/apps/opencs/view/world/dialoguesubview.cpp
@@ -332,6 +332,7 @@ void CSVWorld::EditWidget::remake(int row)
     if (mMainWidget)
     {
         delete mMainWidget;
+        mMainWidget = 0;
     }
     mMainWidget = new QWidget (this);
 
@@ -339,6 +340,7 @@ void CSVWorld::EditWidget::remake(int row)
     if (mWidgetMapper)
     {
         delete mWidgetMapper;
+        mWidgetMapper = 0;
     }
     mWidgetMapper = new QDataWidgetMapper (this);
     mWidgetMapper->setModel(mTable);
@@ -396,7 +398,7 @@ void CSVWorld::EditWidget::remake(int row)
 
     mWidgetMapper->setCurrentModelIndex(mTable->index(row, 0));
 
-    this->setMinimumWidth(325); //TODO find better way to set the width or make it customizable
+    this->setMinimumWidth(325); /// \todo replace hardcoded value with a user setting
     this->setWidget(mMainWidget);
     this->setWidgetResizable(true);
 }
@@ -407,7 +409,6 @@ void CSVWorld::EditWidget::remake(int row)
 
 CSVWorld::DialogueSubView::DialogueSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document,
     const CreatorFactoryBase& creatorFactory, bool sorting) :
-
     SubView (id),
     mEditWidget(0),
     mMainLayout(NULL),
@@ -415,8 +416,8 @@ CSVWorld::DialogueSubView::DialogueSubView (const CSMWorld::UniversalId& id, CSM
     mTable(dynamic_cast<CSMWorld::IdTable*>(document.getData().getTableModel(id))),
     mRow (-1),
     mLocked(false),
-    mDocument(document)
-
+    mDocument(document),
+    mCommandDispatcher (document, CSMWorld::UniversalId::getParentType (id.getType()))
 {
     connect(mTable, SIGNAL(dataChanged (const QModelIndex&, const QModelIndex&)), this, SLOT(dataChanged(const QModelIndex&)));
     mRow = mTable->getModelIndex (id.getId(), 0).row();
@@ -560,14 +561,12 @@ void CSVWorld::DialogueSubView::nextId()
 void CSVWorld::DialogueSubView::setEditLock (bool locked)
 {
     mLocked = locked;
+
     CSMWorld::RecordBase::State state = static_cast<CSMWorld::RecordBase::State>(mTable->data (mTable->index (mRow, 1)).toInt());
-    if (state == CSMWorld::RecordBase::State_Deleted || state == CSMWorld::RecordBase::State_Erased)
-    {
-        mEditWidget->setDisabled(true);
-    } else
-    {
-        mEditWidget->setDisabled(mLocked);
-    }
+
+    mEditWidget->setDisabled (state==CSMWorld::RecordBase::State_Deleted || locked);
+
+    mCommandDispatcher.setEditLock (locked);
 }
 
 void CSVWorld::DialogueSubView::dataChanged(const QModelIndex & index)
@@ -575,13 +574,8 @@ void CSVWorld::DialogueSubView::dataChanged(const QModelIndex & index)
     if (index.row() == mRow)
     {
         CSMWorld::RecordBase::State state = static_cast<CSMWorld::RecordBase::State>(mTable->data (mTable->index (mRow, 1)).toInt());
-        if (state == CSMWorld::RecordBase::State_Deleted || state == CSMWorld::RecordBase::State_Erased)
-        {
-            mEditWidget->setDisabled(true);
-        } else
-        {
-            mEditWidget->setDisabled(mLocked);
-        }
+
+        mEditWidget->setDisabled (state==CSMWorld::RecordBase::State_Deleted || mLocked);
     }
 }
 
diff --git a/apps/opencs/view/world/dialoguesubview.hpp b/apps/opencs/view/world/dialoguesubview.hpp
index 5642f46a0..cbca0159c 100644
--- a/apps/opencs/view/world/dialoguesubview.hpp
+++ b/apps/opencs/view/world/dialoguesubview.hpp
@@ -8,7 +8,9 @@
 #include <QScrollArea>
 
 #include "../doc/subview.hpp"
+
 #include "../../model/world/columnbase.hpp"
+#include "../../model/world/commanddispatcher.hpp"
 
 class QDataWidgetMapper;
 class QSize;
@@ -169,6 +171,7 @@ namespace CSVWorld
         bool mLocked;
         const CSMDoc::Document& mDocument;
         TableBottomBox* mBottom;
+        CSMWorld::CommandDispatcher mCommandDispatcher;
 
         public: