scripting->setAllowedAreas(Qt::BottomDockWidgetArea);
addDockWidget(Qt::BottomDockWidgetArea, scripting);
- listWidget = new QListWidget();
+ listWidget = new QTreeWidget();
+ listWidget->setColumnCount(1);
listWidget->setContextMenuPolicy(Qt::CustomContextMenu);
connect(listWidget, SIGNAL(customContextMenuRequested(const QPoint&)),
this, SLOT(showListContextMenu(const QPoint&)));
addDockWidget(Qt::LeftDockWidgetArea, dockWidget);
setCentralWidget(stackedWidget);
- connect(listWidget, SIGNAL(currentRowChanged(int)),
- this, SLOT(switchMainPlane(int)));
+ connect(listWidget, &QTreeWidget::currentItemChanged,
+ [=] (QTreeWidgetItem* current, QTreeWidgetItem*) {
+ switchMainPlane(current);
+ });
setWindowTitle(tr("FRIDA"));
+ 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 QListWidgetItem(name.c_str(), listWidget);
- item->setBackground(QBrush(QColor(0xff, 0xdd, 0xdd)));
+ 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)));
});
setGlobalHotkeys();
}
shortcut = new QShortcut(QKeySequence("r"), listWidget);
connect(shortcut, &QShortcut::activated, [=]() {
- QListWidgetItem * item = listWidget->currentItem();
+ QTreeWidgetItem * item = listWidget->currentItem();
if (item) renameFunction(objects_list[item]->getFunction());
});
}
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);
- QListWidgetItem * item = objects_list_by_address[address];
+ QTreeWidgetItem * item = objects_list_by_address[address];
listWidget->setCurrentItem(item);
stackedWidget->setCurrentWidget(objects_list[item]);
} else {
}
}
-void Mainwindow::switchMainPlane(int) {
- stackedWidget->setCurrentWidget(objects_list[listWidget->currentItem()]);
+void Mainwindow::switchMainPlane(QTreeWidgetItem* to) {
+ if (objects_list.end() != objects_list.find(to))
+ stackedWidget->setCurrentWidget(objects_list[to]);
}
void Mainwindow::showListContextMenu(const QPoint& point) {
- QListWidgetItem * item = listWidget->itemAt(point);
+ QAction * act;
+ QTreeWidgetItem * item = listWidget->itemAt(point);
QMenu menu(this);
+
+ act = menu.addAction("Add Function");
+ connect(act, &QAction::triggered, this, &Mainwindow::requestNewFunction);
+
+ act = menu.addAction("Add Group");
+ connect(act, &QAction::triggered, this, &Mainwindow::requestNewGroup);
+
if (item) {
- QAction * act = menu.addAction("Rename Function");
- connect(act, &QAction::triggered, [=]() {this->renameFunction(objects_list[item]->getFunction());});
- } else {
- QAction * act = menu.addAction("AddFunction");
- connect(act, SIGNAL(triggered()), this, SLOT(requestNewFunction()));
+ if (objects_list.find(item) != objects_list.end()) {
+ act = menu.addAction("Rename Function");
+ connect(act, &QAction::triggered, [=]() {this->renameFunction(objects_list[item]->getFunction());});
+ } else {
+ act = menu.addAction("Rename Group");
+ connect(act, &QAction::triggered, [=]() {renameGroup(item);});
+ }
+
+
+ QMenu* submenu = menu.addMenu("Move to group");
+
+ for (QTreeWidgetItem* groupitem : group_list) {
+ act = submenu->addAction(groupitem->text(0));
+ connect(act, &QAction::triggered,
+ [=] () {
+ listWidget->invisibleRootItem()->removeChild(item);
+ groupitem->addChild(item);
+ });
+ }
}
+
menu.exec(listWidget->mapToGlobal(point));
}
}
}
+void Mainwindow::requestNewGroup() {
+ SimpleStringDialog dialog("New Group");
+ int result = dialog.exec();
+ if (QDialog::Accepted == result) {
+ QTreeWidgetItem * external = new QTreeWidgetItem(listWidget, QStringList(dialog.result()));
+ external->setChildIndicatorPolicy(QTreeWidgetItem::ShowIndicator);
+ group_list.push_back(external);
+ } else {
+ LOG4CXX_DEBUG(logger, "requestNewGroup aborted");
+ }
+}
+
void Mainwindow::requestNewFunctionByAddress(uint64_t address) {
LOG4CXX_DEBUG(logger, "requesting Function at " << std::hex << address);
manager->getDisassembler()->disassembleFunctionAt(address);
LOG4CXX_DEBUG(logger, "renaming Function " << function->getName()
<< " to " << dialog.result().toStdString());
function->setName(dialog.result().toStdString());
- objects_list_by_address[function->getStartAddress()]->setText(dialog.result());
+ objects_list_by_address[function->getStartAddress()]->setText(0, dialog.result());
+ } else {
+ LOG4CXX_DEBUG(logger, "renameFunction aborted");
+ }
+}
+
+void Mainwindow::renameGroup(QTreeWidgetItem* item) {
+ SimpleStringDialog dialog("New name");
+ int result = dialog.exec();
+ if (QDialog::Accepted == result) {
+ LOG4CXX_DEBUG(logger, "renaming group " << item->text(0).toStdString()
+ << " to " << dialog.result().toStdString());
+ item->setText(0, dialog.result());
} else {
LOG4CXX_DEBUG(logger, "renameFunction aborted");
}
w->addTab(t, "Listing");
- QListWidgetItem * item = new QListWidgetItem(fun->getName().c_str(), listWidget);
+ QTreeWidgetItem * item = new QTreeWidgetItem(listWidget, QStringList(fun->getName().c_str()));
stackedWidget->addWidget(w);
objects_list.insert(std::make_pair(item, w));
LOG4CXX_DEBUG(logger, "Adding function widget at " << std::hex