Add option to comment on instructions (in GUI)

[frida/frida.git] / src / gui / Mainwindow.cxx

diff --git a/src/gui/Mainwindow.cxx b/src/gui/Mainwindow.cxx
index 611f3da62822307dc1043944f944f6a079a60ed0..18dcc8bef99f180c7a193962a2ac674709b9de75 100644 (file)
--- a/src/gui/Mainwindow.cxx
+++ b/src/gui/Mainwindow.cxx
@@ -4,7 +4,7 @@
 
 #include "widgets/CFGScene.hxx"
 #include "dialogs/NewFunctionDialog.hxx"
-#include "dialogs/RenameFunctionDialog.hxx"
+#include "dialogs/SimpleStringDialog.hxx"
 
 #include <sstream>
 
@@ -62,6 +62,18 @@ Mainwindow::Mainwindow(InformationManager* mgr)
                        auto item = new QListWidgetItem(name.c_str(), listWidget);
                        item->setBackground(QBrush(QColor(0xff, 0xdd, 0xdd)));
                });
+       setGlobalHotkeys();
+}
+
+void Mainwindow::setGlobalHotkeys() {
+       QShortcut *shortcut = new QShortcut(QKeySequence("f"), this);
+       connect(shortcut, &QShortcut::activated, this, &Mainwindow::requestNewFunction);
+
+       shortcut = new QShortcut(QKeySequence("r"), listWidget);
+       connect(shortcut, &QShortcut::activated, [=]() {
+                       QListWidgetItem * item = listWidget->currentItem();
+                       if (item) renameFunction(item);
+               });
 }
 
 void Mainwindow::quit()
@@ -115,18 +127,23 @@ void Mainwindow::requestNewFunction() {
        NewFunctionDialog dialog;
        int result = dialog.exec();
        if (QDialog::Accepted == result) {
-               LOG4CXX_DEBUG(logger, "requesting Function at " << std::hex << dialog.result());
-               manager->getDisassembler()->disassembleFunctionAt(dialog.result());
+               requestNewFunctionByAddress(dialog.result());
        } else {
                LOG4CXX_DEBUG(logger, "requestNewFunction aborted");
        }
 }
 
+void Mainwindow::requestNewFunctionByAddress(uint64_t address) {
+       LOG4CXX_DEBUG(logger, "requesting Function at " << std::hex << address);
+       manager->getDisassembler()->disassembleFunctionAt(address);
+       switchMainPlaneToAddress(address);
+}
+
 void Mainwindow::renameFunction(QListWidgetItem * item) {
-       RenameFunctionDialog dialog;
+       SimpleStringDialog dialog("New name");
        int result = dialog.exec();
        if (QDialog::Accepted == result) {
-               LOG4CXX_DEBUG(logger, "renaming Function" << item->text().toStdString()
+               LOG4CXX_DEBUG(logger, "renaming Function " << item->text().toStdString()
                              << " to " << dialog.result().toStdString());
                item->setText(dialog.result());
        } else {