X-Git-Url: https://git.siccegge.de//index.cgi?a=blobdiff_plain;f=src%2Fgui%2FMainwindow.cxx;h=850c0364b61ba1c4d5fc845586ba8913fe48f9d9;hb=4979a0a839390713671f3f9756dc6820501d4ad4;hp=544d5fd7dc65efee0af1d8d5f7ab194b1a93b291;hpb=85d67be4869bd6a274e009af63fc6955c5e6d37a;p=frida%2Ffrida.git

diff --git a/src/gui/Mainwindow.cxx b/src/gui/Mainwindow.cxx
index 544d5fd..850c036 100644
--- a/src/gui/Mainwindow.cxx
+++ b/src/gui/Mainwindow.cxx
@@ -56,7 +56,7 @@ Mainwindow::Mainwindow(InformationManager* mgr)
 	connect(guileLoad, &QAction::triggered,
 	        [&]() {
 		        QString fileName = QFileDialog::getOpenFileName(this, tr("Open Script"), "",
-		                                                        tr("Binaries") + " (*." +
+		                                                        tr("Scripts") + " (*." +
 		                                                        manager->getInterpreter("GUILE")->fileExtension().c_str() + ")");
 		        if(! fileName.isNull()) {
 			        std::stringstream a, b;
@@ -90,21 +90,28 @@ Mainwindow::Mainwindow(InformationManager* mgr)
 	QTreeWidgetItem * external = new QTreeWidgetItem(listWidget, QStringList("External Functions"));
 	external->setChildIndicatorPolicy(QTreeWidgetItem::ShowIndicator);
 	external->setBackground(0, QBrush(QColor(0xff, 0xdd, 0xdd)));
-	mgr->registerNewFunctionEvent([=] (NewFunctionEvent* event) {
-			std::string name = event->function->getName();
-			if (event->function->isDynamic()) {
-				auto item = new QTreeWidgetItem(external, QStringList(name.c_str()));
-				item->setBackground(0, QBrush(QColor(0xff, 0xdd, 0xdd)));
-			} else {
-				addFunction(event->function);
-			}
-		});
-	mgr->registerRenameFunctionEvent([&](RenameFunctionEvent* event) {
-			if (objects_list_by_address.find(event->address) == objects_list_by_address.end())
-				return;
-			auto item = objects_list_by_address[event->address];
-			if (item) item->setText(0, event->new_name.c_str());
-		});
+	connect(mgr, &InformationManager::resetEvent,
+	        [this,mgr]() {
+		        connect(this, SIGNAL(requestNewFunctionByAddress(uint64_t)),
+		                mgr->getDisassembler(), SLOT(disassembleFunctionAt(uint64_t)));
+	        });
+	connect(mgr, &InformationManager::newFunctionEvent,
+	        [=] (NewFunctionEvent* event) {
+		        std::string name = event->function->getName();
+		        if (event->function->isDynamic()) {
+			        auto item = new QTreeWidgetItem(external, QStringList(name.c_str()));
+			        item->setBackground(0, QBrush(QColor(0xff, 0xdd, 0xdd)));
+		        } else {
+			        addFunction(event->function);
+		        }
+	        });
+	connect(mgr, &InformationManager::renameFunctionEvent,
+	        [&](RenameFunctionEvent* event) {
+		        if (objects_list_by_address.find(event->address) == objects_list_by_address.end())
+			        return;
+		        auto item = objects_list_by_address[event->address];
+		        if (item) item->setText(0, event->new_name.c_str());
+	        });
 	setGlobalHotkeys();
 }
 
@@ -218,7 +225,7 @@ void Mainwindow::requestNewFunction() {
 	NewFunctionDialog dialog;
 	int result = dialog.exec();
 	if (QDialog::Accepted == result) {
-		requestNewFunctionByAddress(dialog.result());
+		emit requestNewFunctionByAddress(dialog.result());
 	} else {
 		LOG4CXX_DEBUG(logger, "requestNewFunction aborted");
 	}
@@ -236,12 +243,6 @@ void Mainwindow::requestNewGroup() {
 	}
 }
 
-void Mainwindow::requestNewFunctionByAddress(uint64_t address) {
-	LOG4CXX_DEBUG(logger, "requesting Function at " << std::hex << address);
-	manager->getDisassembler()->disassembleFunctionAt(address);
-	switchMainPlaneToAddress(address);
-}
-
 void Mainwindow::renameFunction(Function* function) {
 	SimpleStringDialog dialog("New name");
 	int result = dialog.exec();