Add Edit 'ID' action for nested tables

Conflicts:
	apps/opencs/view/world/nestedtable.cpp

apps/opencs/view/world/dialoguesubview.cpp

@@ -567,6 +567,11 @@ void CSVWorld::EditWidget::remake(int row)
 
                 tablesLayout->addWidget(label);
                 tablesLayout->addWidget(table);
+
+                connect(table, 
+                        SIGNAL(editRequest(const CSMWorld::UniversalId &, const std::string &)), 
+                        this, 
+                        SIGNAL(editIdRequest(const CSMWorld::UniversalId &, const std::string &)));
             }
             else if (!(flags & CSMWorld::ColumnBase::Flag_Dialogue_List))
             {

apps/opencs/view/world/nestedtable.cpp

@@ -1,23 +1,25 @@
 #include "nestedtable.hpp"
-#include "../../model/world/nestedtableproxymodel.hpp"
-#include "../../model/world/universalid.hpp"
-#include "../../model/world/commands.hpp"
-#include "../../model/world/commanddispatcher.hpp"
-#include "util.hpp"
 
 #include <QHeaderView>
 #include <QContextMenuEvent>
 #include <QMenu>
 #include <QDebug>
 
+#include "../../model/world/nestedtableproxymodel.hpp"
+#include "../../model/world/universalid.hpp"
+#include "../../model/world/commands.hpp"
+#include "../../model/world/commanddispatcher.hpp"
+
+#include "tableeditidaction.hpp"
+#include "util.hpp"
+
 CSVWorld::NestedTable::NestedTable(CSMDoc::Document& document,
                                    CSMWorld::UniversalId id,
                                    CSMWorld::NestedTableProxyModel* model,
                                    QWidget* parent,
                                    bool editable)
     : DragRecordTable(document, parent),
-      mAddNewRowAction(0),
+      mEditIdAction(0),
-      mRemoveRowAction(0),
       mModel(model)
 {
     setSelectionBehavior (QAbstractItemView::SelectRows);
@@ -61,6 +63,9 @@ CSVWorld::NestedTable::NestedTable(CSMDoc::Document& document,
 
         connect(mRemoveRowAction, SIGNAL(triggered()),
                 this, SLOT(removeRowActionTriggered()));
+
+        mEditIdAction = new TableEditIdAction(*this, this);
+        connect(mEditIdAction, SIGNAL(triggered()), this, SLOT(editCell()));
     }
 }
 
@@ -72,13 +77,22 @@ std::vector<CSMWorld::UniversalId> CSVWorld::NestedTable::getDraggedRecords() co
 
 void CSVWorld::NestedTable::contextMenuEvent (QContextMenuEvent *event)
 {
-    if (!mRemoveRowAction || !mAddNewRowAction)
+    if (!mEditIdAction)
         return;
 
     QModelIndexList selectedRows = selectionModel()->selectedRows();
 
     QMenu menu(this);
 
+    int currentRow = rowAt(event->y());
+    int currentColumn = columnAt(event->x());
+    if (mEditIdAction->isValidIdCell(currentRow, currentColumn))
+    {
+        mEditIdAction->setCell(currentRow, currentColumn);
+        menu.addAction(mEditIdAction);
+        menu.addSeparator();
+    }
+
     if (selectionModel()->selectedRows().size() == 1)
         menu.addAction(mRemoveRowAction);
 
@@ -102,3 +116,8 @@ void CSVWorld::NestedTable::addNewRowActionTriggered()
                                                                  selectionModel()->selectedRows().size(),
                                                                  mModel->getParentColumn()));
 }
+
+void CSVWorld::NestedTable::editCell()
+{
+    emit editRequest(mEditIdAction->getCurrentId(), "");
+}

apps/opencs/view/world/nestedtable.hpp

@@ -22,12 +22,15 @@ namespace CSMDoc
 
 namespace CSVWorld
 {
+    class TableEditIdAction;
+
     class NestedTable : public DragRecordTable
     {
         Q_OBJECT
 
         QAction *mAddNewRowAction;
         QAction *mRemoveRowAction;
+        TableEditIdAction *mEditIdAction;
         CSMWorld::NestedTableProxyModel* mModel;
         CSMWorld::CommandDispatcher *mDispatcher;
 
@@ -47,6 +50,11 @@ namespace CSVWorld
         void removeRowActionTriggered();
 
         void addNewRowActionTriggered();
+
+        void editCell();
+
+    signals:
+        void editRequest(const CSMWorld::UniversalId &id, const std::string &hint);
     };
 }