From 814f2d3376c398700aa72b429972241b841498a5 Mon Sep 17 00:00:00 2001
From: Stanislav Bas <stanislav.m.bas@gmail.com>
Date: Fri, 3 Jul 2015 16:24:08 +0300
Subject: [PATCH] Edit 'ID' action is available in dialogue sub-views (for
 LineEdits and Labels)

---
 apps/opencs/view/world/dialoguesubview.cpp | 33 ++++++++++++++++------
 apps/opencs/view/world/dialoguesubview.hpp |  4 +++
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/apps/opencs/view/world/dialoguesubview.cpp b/apps/opencs/view/world/dialoguesubview.cpp
index 5291e3429..040ca542a 100644
--- a/apps/opencs/view/world/dialoguesubview.cpp
+++ b/apps/opencs/view/world/dialoguesubview.cpp
@@ -332,6 +332,7 @@ CSVWorld::IdContextMenu::IdContextMenu(QWidget *widget, CSMWorld::ColumnBase::Di
             SLOT(showContextMenu(const QPoint &)));
 
     mEditIdAction = new QAction(this);
+    connect(mEditIdAction, SIGNAL(triggered()), this, SLOT(editIdRequest()));
 
     QLineEdit *lineEdit = qobject_cast<QLineEdit *>(mWidget);
     if (lineEdit != NULL)
@@ -352,8 +353,8 @@ CSVWorld::IdContextMenu::IdContextMenu(QWidget *widget, CSMWorld::ColumnBase::Di
 
 QString CSVWorld::IdContextMenu::getWidgetValue() const
 {
-    static QLineEdit *lineEdit = qobject_cast<QLineEdit *>(mWidget);   
-    static QLabel *label = qobject_cast<QLabel *>(mWidget);
+    QLineEdit *lineEdit = qobject_cast<QLineEdit *>(mWidget);   
+    QLabel *label = qobject_cast<QLabel *>(mWidget);
 
     QString value = "";
     if (lineEdit != NULL)
@@ -373,16 +374,16 @@ void CSVWorld::IdContextMenu::showContextMenu(const QPoint &pos)
     if (!value.isEmpty())
     {
         mEditIdAction->setText("Edit '" + value + "'");
-        
-        QAction *selectedAction = mContextMenu->exec(mWidget->mapToGlobal(pos));
-        if (selectedAction != NULL && selectedAction == mEditIdAction)
-        {
-            CSMWorld::UniversalId editId(mIdType, value.toUtf8().constData());
-            emit editIdRequest(editId, "");
-        }
+        mContextMenu->exec(mWidget->mapToGlobal(pos));
     }
 }
 
+void CSVWorld::IdContextMenu::editIdRequest()
+{
+    CSMWorld::UniversalId editId(mIdType, getWidgetValue().toUtf8().constData());
+    emit editIdRequest(editId, "");
+}
+
 /*
 =============================================================EditWidget=====================================================
 */
@@ -559,6 +560,15 @@ void CSVWorld::EditWidget::remake(int row)
                         editor->setEnabled(false);
                         label->setEnabled(false);
                     }
+
+                    if (CSMWorld::ColumnBase::isId(display))
+                    {
+                        IdContextMenu *menu = new IdContextMenu(editor, display);
+                        connect(menu,
+                                SIGNAL(editIdRequest(const CSMWorld::UniversalId &, const std::string &)),
+                                this,
+                                SIGNAL(editIdRequest(const CSMWorld::UniversalId &, const std::string &)));
+                    }
                 }
             }
             else
@@ -686,6 +696,11 @@ CSVWorld::SimpleDialogueSubView::SimpleDialogueSubView (const CSMWorld::Universa
     mEditWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
 
     dataChanged(mTable->getModelIndex (getUniversalId().getId(), 0));
+
+    connect(mEditWidget,
+            SIGNAL(editIdRequest(const CSMWorld::UniversalId &, const std::string &)),
+            this,
+            SIGNAL(focusId(const CSMWorld::UniversalId &, const std::string &)));
 }
 
 void CSVWorld::SimpleDialogueSubView::setEditLock (bool locked)
diff --git a/apps/opencs/view/world/dialoguesubview.hpp b/apps/opencs/view/world/dialoguesubview.hpp
index 5ac7ac20b..2055e67bd 100644
--- a/apps/opencs/view/world/dialoguesubview.hpp
+++ b/apps/opencs/view/world/dialoguesubview.hpp
@@ -168,6 +168,7 @@ namespace CSVWorld
 
         private slots:
             void showContextMenu(const QPoint &pos);
+            void editIdRequest();
 
         signals:
             void editIdRequest(const CSMWorld::UniversalId &id, const std::string &hint);
@@ -195,6 +196,9 @@ namespace CSVWorld
             virtual ~EditWidget();
 
             void remake(int row);
+
+        signals:
+            void editIdRequest(const CSMWorld::UniversalId &id, const std::string &hint);
     };
 
     class SimpleDialogueSubView : public CSVDoc::SubView