From b8e6fd2b66f79aaef54e01e8f7227798e0d5d08c Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 4 May 2011 12:06:21 +0200
Subject: [PATCH] Debugger: Add Disassembler to register window context menu.

---
 src/plugins/debugger/registerwindow.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/plugins/debugger/registerwindow.cpp b/src/plugins/debugger/registerwindow.cpp
index 62ba31da0f0..30a6771063d 100644
--- a/src/plugins/debugger/registerwindow.cpp
+++ b/src/plugins/debugger/registerwindow.cpp
@@ -33,6 +33,7 @@
 #include "registerwindow.h"
 #include "memoryview.h"
 #include "debuggeractions.h"
+#include "debuggerdialogs.h"
 #include "debuggerconstants.h"
 #include "debuggercore.h"
 #include "debuggerengine.h"
@@ -201,17 +202,26 @@ void RegisterWindow::contextMenuEvent(QContextMenuEvent *ev)
     const quint64 address = addressV.type() == QVariant::ULongLong ? addressV.toULongLong() : 0;
     QAction *actViewMemory = menu.addAction(QString());
     QAction *actEditMemory = menu.addAction(QString());
+
+    QAction *actShowDisassemblerAt = menu.addAction(QString());
+    QAction *actShowDisassembler = menu.addAction(tr("Open Disassembler..."));
+    actShowDisassembler->setEnabled(engineCapabilities & DisassemblerCapability);
+
     if (address) {
         const bool canShow = actionsEnabled && (engineCapabilities & ShowMemoryCapability);
         actEditMemory->setText(tr("Open Memory Editor at 0x%1").arg(address, 0, 16));
         actEditMemory->setEnabled(canShow);
         actViewMemory->setText(tr("Open Memory View at Value of Register %1 0x%2")
                                .arg(QString::fromAscii(aRegister.name)).arg(address, 0, 16));
+        actShowDisassemblerAt->setText(tr("Open Disassembler at 0x%1").arg(address, 0, 16));
+        actShowDisassemblerAt->setEnabled(engineCapabilities & DisassemblerCapability);
     } else {
         actEditMemory->setText(tr("Open Memory Editor"));
         actViewMemory->setText(tr("Open Memory View at Value of Register"));
         actEditMemory->setEnabled(false);
         actViewMemory->setEnabled(false);
+        actShowDisassemblerAt->setText(tr("Open Disassembler"));
+        actShowDisassemblerAt->setEnabled(false);
     }
     menu.addSeparator();
 
@@ -250,6 +260,14 @@ void RegisterWindow::contextMenuEvent(QContextMenuEvent *ev)
     } else if (act == actViewMemory) {
         engine->openMemoryView(idx.row(), DebuggerEngine::MemoryTrackRegister|DebuggerEngine::MemoryView,
                                QList<MemoryMarkup>(), position, QString(), this);
+    } else if (act == actShowDisassembler) {
+        AddressDialog dialog;
+        if (address)
+            dialog.setAddress(address);
+        if (dialog.exec() == QDialog::Accepted)
+            currentEngine()->openDisassemblerView(Location(dialog.address()));
+    } else if (act == actShowDisassemblerAt) {
+        engine->openDisassemblerView(Location(address));
     } else if (act == act16)
         handler->setNumberBase(16);
     else if (act == act10)