X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2FMainwindow.cxx;h=03910a1be4801334ade968cbb237f6cd8cfe4d46;hp=611f3da62822307dc1043944f944f6a079a60ed0;hb=64cdefa8eebaedef3a852b061d4df431b7e6c654;hpb=954fbc0a236ead64f568e9f591a5248c742084a0

diff --git a/src/gui/Mainwindow.cxx b/src/gui/Mainwindow.cxx
index 611f3da..03910a1 100644
--- 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>
 
@@ -20,18 +20,19 @@ Mainwindow::Mainwindow(InformationManager* mgr)
 	: manager(mgr)
 	, logger(log4cxx::Logger::getLogger("Mainwindow")) {
 	openAction = new QAction(tr("&Open"), this);
-	// saveAction = new QAction(tr("&Save"), this);
+	saveAction = new QAction(tr("&Save"), this);
 	exitAction = new QAction(tr("E&xit"), this);
 
 	connect(openAction, SIGNAL(triggered()),
 	        this, SLOT(open()));
-	// connect(saveAction, SIGNAL(triggered()), this, SLOT(save()));
+	connect(saveAction, SIGNAL(triggered()),
+	        this, SLOT(save()));
 	connect(exitAction, SIGNAL(triggered()),
 	        qApp, SLOT(quit()));
 
 	fileMenu = menuBar()->addMenu(tr("&File"));
 	fileMenu->addAction(openAction);
-	// fileMenu->addAction(saveAction);
+	fileMenu->addAction(saveAction);
 	fileMenu->addSeparator();
 	fileMenu->addAction(exitAction);
 
@@ -62,6 +63,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()
@@ -82,6 +95,11 @@ void Mainwindow::open() {
 	manager->reset(fileName.toStdString());
 }
 
+void Mainwindow::save() {
+	QString filename = QFileDialog::getSaveFileName(this, tr("Save File"), "", tr("Frida Archives (*.frida)"));
+	manager->save(filename);
+}
+
 void Mainwindow::switchMainPlaneToAddress(uint64_t address) {
 	if (objects_list_by_address.find(address) != objects_list_by_address.end()) {
 		LOG4CXX_DEBUG(logger, "Switching to function " << std::hex << address);
@@ -115,18 +133,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 {