GUI: separate icon for dump + added some menu options in MainWindow

Author: mrexodia

src/gui/Src/Gui/CPUDisassembly.cpp

@@ -303,7 +303,7 @@ void CPUDisassembly::setupRightClickContextMenu()
         return true;
     });
 
-    mMenuBuilder->addMenu(makeMenu(QIcon(":/icons/images/memory-map.png"), tr("&Follow in Dump")), [this](QMenu * menu)
+    mMenuBuilder->addMenu(makeMenu(QIcon(":/icons/images/dump.png"), tr("&Follow in Dump")), [this](QMenu * menu)
     {
         setupFollowReferenceMenu(rvaToVa(getInitialSelection()), menu, false, false);
         return true;

src/gui/Src/Gui/CPUMultiDump.cpp

@@ -14,7 +14,7 @@ CPUMultiDump::CPUMultiDump(CPUDisassembly* disas, int nbCpuDumpTabs, QWidget* pa
     {
         CPUDump* cpuDump = new CPUDump(disas, this);
         connect(cpuDump, SIGNAL(displayReferencesWidget()), this, SLOT(displayReferencesWidgetSlot()));
-        this->addTabEx(cpuDump, QIcon(":/images/memory-map.png"), tr("Dump ") + QString::number(i + 1), QString("Dump ") + QString::number(i + 1));
+        this->addTabEx(cpuDump, QIcon(":/icons/images/dump.png"), tr("Dump ") + QString::number(i + 1), QString("Dump ") + QString::number(i + 1));
     }
 
     mCurrentCPUDump = (CPUDump*)currentWidget();

src/gui/Src/Gui/CPUStack.cpp

@@ -248,7 +248,7 @@ void CPUStack::setupContextMenu()
 
     //Follow in Dump
     auto followDumpName = ArchValue(tr("Follow DWORD in &Dump"), tr("Follow QWORD in &Dump"));
-    mFollowDump = new QAction(QIcon(":/icons/images/memory-map.png"), followDumpName, this);
+    mFollowDump = new QAction(QIcon(":/icons/images/dump.png"), followDumpName, this);
     connect(mFollowDump, SIGNAL(triggered()), this, SLOT(followDumpSlot()));
 
     auto followDumpMenuName = ArchValue(tr("&Follow DWORD in Dump"), tr("&Follow QWORD in Dump"));

src/gui/Src/Gui/HandlesView.cpp

@@ -5,6 +5,7 @@
 HandlesView::HandlesView(QWidget* parent) : QWidget(parent)
 {
     mHandlesTable = new StdTable(this);
+    mHandlesTable->setDrawDebugOnly(true);
     int wCharWidth = mHandlesTable->getCharWidth();
     mHandlesTable->setContextMenuPolicy(Qt::CustomContextMenu);
     mHandlesTable->addColumnAt(8 + 16 * wCharWidth, tr("Type"), false);
@@ -14,12 +15,14 @@ HandlesView::HandlesView(QWidget* parent) : QWidget(parent)
     mHandlesTable->addColumnAt(8 + wCharWidth * 20, tr("Name"), false);
 
     mTcpConnectionsTable = new StdTable(this);
+    mTcpConnectionsTable->setDrawDebugOnly(true);
     mTcpConnectionsTable->setContextMenuPolicy(Qt::CustomContextMenu);
     mTcpConnectionsTable->addColumnAt(8 + 64 * wCharWidth, tr("Remote address"), false);
     mTcpConnectionsTable->addColumnAt(8 + 64 * wCharWidth, tr("Local address"), false);
     mTcpConnectionsTable->addColumnAt(8 + 8 * wCharWidth, tr("State", "TcpConnection"), false);
 
     mPrivilegesTable = new StdTable(this);
+    mPrivilegesTable->setDrawDebugOnly(true);
     mPrivilegesTable->setContextMenuPolicy(Qt::CustomContextMenu);
     mPrivilegesTable->addColumnAt(8 + 32 * wCharWidth, tr("Privilege"), false);
     mPrivilegesTable->addColumnAt(8 + 16 * wCharWidth, tr("State", "Privilege"), false);

src/gui/Src/Gui/MainWindow.cpp

@@ -266,6 +266,9 @@ MainWindow::MainWindow(QWidget* parent)
     connect(ui->actionDetach, SIGNAL(triggered()), this, SLOT(detach()));
     connect(ui->actionChangeCommandLine, SIGNAL(triggered()), this, SLOT(changeCommandLine()));
     connect(ui->actionManual, SIGNAL(triggered()), this, SLOT(displayManual()));
+    connect(ui->actionNotes, SIGNAL(triggered()), this, SLOT(displayNotesWidget()));
+    connect(ui->actionSnowman, SIGNAL(triggered()), this, SLOT(displaySnowmanWidget()));
+    connect(ui->actionHandles, SIGNAL(triggered()), this, SLOT(displayHandlesWidget()));
 
     connect(mCpuWidget->getDisasmWidget(), SIGNAL(updateWindowTitle(QString)), this, SLOT(updateWindowTitleSlot(QString)));
     connect(mCpuWidget->getDisasmWidget(), SIGNAL(displayReferencesWidget()), this, SLOT(displayReferencesWidget()));
@@ -420,6 +423,7 @@ void MainWindow::refreshShortcuts()
     setGlobalShortcut(ui->actionBreakpoints, ConfigShortcut("ViewBreakpoints"));
     setGlobalShortcut(ui->actionMemoryMap, ConfigShortcut("ViewMemoryMap"));
     setGlobalShortcut(ui->actionCallStack, ConfigShortcut("ViewCallStack"));
+    setGlobalShortcut(ui->actionSEHChain, ConfigShortcut("ViewSEHChain"));
     setGlobalShortcut(ui->actionScript, ConfigShortcut("ViewScript"));
     setGlobalShortcut(ui->actionSymbolInfo, ConfigShortcut("ViewSymbolInfo"));
     setGlobalShortcut(ui->actionSource, ConfigShortcut("ViewSource"));
@@ -430,6 +434,8 @@ void MainWindow::refreshShortcuts()
     setGlobalShortcut(ui->actionLabels, ConfigShortcut("ViewLabels"));
     setGlobalShortcut(ui->actionBookmarks, ConfigShortcut("ViewBookmarks"));
     setGlobalShortcut(ui->actionFunctions, ConfigShortcut("ViewFunctions"));
+    setGlobalShortcut(ui->actionSnowman, ConfigShortcut("ViewSnowman"));
+    setGlobalShortcut(ui->actionHandles, ConfigShortcut("ViewHandles"));
 
     setGlobalShortcut(ui->actionRun, ConfigShortcut("DebugRun"));
     setGlobalShortcut(ui->actioneRun, ConfigShortcut("DebugeRun"));
@@ -1294,3 +1300,13 @@ void MainWindow::on_actionReloadStylesheet_triggered()
     ensurePolished();
     update();
 }
+
+void MainWindow::displayNotesWidget()
+{
+    showQWidgetTab(mNotesManager);
+}
+
+void MainWindow::displayHandlesWidget()
+{
+    showQWidgetTab(mHandlesView);
+}

src/gui/Src/Gui/MainWindow.h

@@ -126,6 +126,8 @@ public slots:
     void tabMovedSlot(int from, int to);
     void chkSaveloadTabSavedOrderStateChangedSlot(bool state);
     void dbgStateChangedSlot(DBGSTATE state);
+    void displayNotesWidget();
+    void displayHandlesWidget();
 
 private:
     Ui::MainWindow* ui;

src/gui/Src/Gui/MainWindow.ui

@@ -53,6 +53,7 @@
     </property>
     <addaction name="actionCpu"/>
     <addaction name="actionLog"/>
+    <addaction name="actionNotes"/>
     <addaction name="actionBreakpoints"/>
     <addaction name="actionMemoryMap"/>
     <addaction name="actionCallStack"/>
@@ -67,6 +68,8 @@
     <addaction name="actionLabels"/>
     <addaction name="actionBookmarks"/>
     <addaction name="actionFunctions"/>
+    <addaction name="actionSnowman"/>
+    <addaction name="actionHandles"/>
    </widget>
    <widget class="QMenu" name="menuDebug">
     <property name="title">
@@ -735,6 +738,33 @@
     <string>Reload style.css</string>
    </property>
   </action>
+  <action name="actionNotes">
+   <property name="icon">
+    <iconset resource="../../resource.qrc">
+     <normaloff>:/icons/images/notes.png</normaloff>:/icons/images/notes.png</iconset>
+   </property>
+   <property name="text">
+    <string>Notes</string>
+   </property>
+  </action>
+  <action name="actionSnowman">
+   <property name="icon">
+    <iconset resource="../../resource.qrc">
+     <normaloff>:/icons/images/snowman.png</normaloff>:/icons/images/snowman.png</iconset>
+   </property>
+   <property name="text">
+    <string>Snowman</string>
+   </property>
+  </action>
+  <action name="actionHandles">
+   <property name="icon">
+    <iconset resource="../../resource.qrc">
+     <normaloff>:/icons/images/handles.png</normaloff>:/icons/images/handles.png</iconset>
+   </property>
+   <property name="text">
+    <string>Handles</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>

src/gui/Src/Utils/Configuration.cpp

@@ -231,6 +231,8 @@ Configuration::Configuration() : QObject(), noMoreMsgbox(false)
     defaultShortcuts.insert("ViewBreakpoints", Shortcut(tr("View -> Breakpoints"), "Alt+B", true));
     defaultShortcuts.insert("ViewMemoryMap", Shortcut(tr("View -> Memory Map"), "Alt+M", true));
     defaultShortcuts.insert("ViewCallStack", Shortcut(tr("View -> Call Stack"), "Alt+K", true));
+    defaultShortcuts.insert("ViewNotes", Shortcut(tr("View -> Notes"), "", true));
+    defaultShortcuts.insert("ViewSEHChain", Shortcut(tr("View -> SEH"), "", true));
     defaultShortcuts.insert("ViewScript", Shortcut(tr("View -> Script"), "Alt+S", true));
     defaultShortcuts.insert("ViewSymbolInfo", Shortcut(tr("View -> Symbol Info"), "Ctrl+Alt+S", true));
     defaultShortcuts.insert("ViewSource", Shortcut(tr("View -> Source"), "Ctrl+Shift+S", true));
@@ -241,6 +243,8 @@ Configuration::Configuration() : QObject(), noMoreMsgbox(false)
     defaultShortcuts.insert("ViewLabels", Shortcut(tr("View -> Labels"), "Ctrl+Alt+L", true));
     defaultShortcuts.insert("ViewBookmarks", Shortcut(tr("View -> Bookmarks"), "Ctrl+Alt+B", true));
     defaultShortcuts.insert("ViewFunctions", Shortcut(tr("View -> Functions"), "Alt+F", true));
+    defaultShortcuts.insert("ViewSnowman", Shortcut(tr("View -> Snowman"), "", true));
+    defaultShortcuts.insert("ViewHandles", Shortcut(tr("View -> Handles"), "", true));
 
     defaultShortcuts.insert("DebugRun", Shortcut(tr("Debug -> Run"), "F9", true));
     defaultShortcuts.insert("DebugeRun", Shortcut(tr("Debug -> Run (skip exceptions)"), "Shift+F9", true));

src/gui/images/dump.png

@@ -95,5 +95,6 @@
         <file>images/helpbrief.png</file>
         <file>images/helpmnemonic.png</file>
         <file>images/handles.png</file>
+        <file>images/dump.png</file>
     </qresource>
 </RCC>