X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2FMainwindow.cxx;h=adadc0686a9a600d70f99b2e85dc9aae523a2499;hp=859311032c79c45a49e1721d97ab32b1c67e61a6;hb=1b43b26ba9b23cb5f3004db7b9b00f6b08227563;hpb=9b99fc5856d5fe88bb1d2aad4d2ee7cd86b5be57 diff --git a/src/gui/Mainwindow.cxx b/src/gui/Mainwindow.cxx index 8593110..adadc06 100644 --- a/src/gui/Mainwindow.cxx +++ b/src/gui/Mainwindow.cxx @@ -6,6 +6,7 @@ #include "core/BasicBlock.hxx" #include "core/InformationManager.hxx" #include "core/events/RenameFunctionEvent.hxx" +#include "core/events/NewFunctionEvent.hxx" #include "widgets/FridaDock.hxx" #include "widgets/LogDock.hxx" @@ -55,11 +56,13 @@ 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() + ")"); - std::stringstream a, b; - std::string c; - manager->getInterpreter("GUILE")->loadFile(fileName.toStdString(), a, b, c); + if(! fileName.isNull()) { + std::stringstream a, b; + std::string c; + manager->getInterpreter("GUILE")->loadFile(fileName.toStdString(), a, b, c); + } }); listWidget = new QTreeWidget(); @@ -87,17 +90,23 @@ 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->connect_new_function_signal([&] (Function* fun) {addFunction(fun);}); - mgr->connect_new_dyn_symbol_signal([=] (const std::string& name) { - auto item = new QTreeWidgetItem(external, QStringList(name.c_str())); - item->setBackground(0, QBrush(QColor(0xff, 0xdd, 0xdd))); - }); - mgr->connect_rename_function_signal([&](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::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(); } @@ -124,15 +133,29 @@ void Mainwindow::quit() } void Mainwindow::open() { - QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"), "", - tr("Binaries (*)")); - manager->reset(fileName.toStdString()); + QFileDialog dialog(this, tr("Open bianry"), "", tr("Binaries (*)")); + + if (dialog.exec()) { + QStringList files = dialog.selectedFiles(); + if(1 != files.size()) { + LOG4CXX_ERROR(logger, "Needs exactly one file name") + } else { + manager->reset(files[0].toStdString()); + } + } } void Mainwindow::load() { - QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"), "", - tr("Frida Archives (*.frida)")); - manager->load(fileName.toStdString()); + QFileDialog dialog(this, tr("Open saved FrIDa file"), "", tr("Frida Archives (*.frida)")); + + if (dialog.exec()) { + QStringList files = dialog.selectedFiles(); + if(1 != files.size()) { + LOG4CXX_ERROR(logger, "Needs exactly one file name") + } else { + manager->load(files[0].toStdString()); + } + } } void Mainwindow::save() {