X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2FMainwindow.hxx;h=a89179598a095c71e16b32d432b40f5bd9d5855d;hp=8cf1fadb25cfb0f707c4d207dd217269e56050a3;hb=9b99fc5856d5fe88bb1d2aad4d2ee7cd86b5be57;hpb=32e87746db981882b95aceddde79ef12034a3405

diff --git a/src/gui/Mainwindow.hxx b/src/gui/Mainwindow.hxx
index 8cf1fad..a891795 100644
--- a/src/gui/Mainwindow.hxx
+++ b/src/gui/Mainwindow.hxx
@@ -3,12 +3,13 @@
 
 #include <memory>
 #include <map>
-#include <set>
+#include <vector>
+#include <string>
 
 #include <QTextEdit>
 #include <QPushButton>
 #include <QMainWindow>
-#include <QListWidget>
+#include <QTreeWidget>
 #include <QStackedWidget>
 
 #include <log4cxx/logger.h>
@@ -16,14 +17,19 @@
 class Disassembler;
 class Function;
 class InformationManager;
+class FunctionWidget;
 class BasicBlockWidget;
-class ScriptingDock;
+class FridaDock;
 
 class Mainwindow : public QMainWindow {
 	Q_OBJECT
 public:
 	Mainwindow(InformationManager* mgr);
 
+public Q_SLOTS:
+	void switchMainPlaneToAddress(uint64_t);
+	void requestNewFunctionByAddress(uint64_t address);
+
 private:
 	void addFunction(Function* fun);
 	void setGlobalHotkeys();
@@ -33,33 +39,36 @@ private:
 	QMenu *fileMenu;
 
 	QTabWidget * tabwidget;
-	QListWidget * listWidget;
+	QTreeWidget * listWidget;
 	QStackedWidget * stackedWidget;
 	QDockWidget * dockWidget;
-	ScriptingDock * scripting;
+	FridaDock * fdock;
 
 	QAction *exitAction;
 	QAction *openAction;
+	QAction *loadAction;
 	QAction *saveAction;
 
 	std::map<uint64_t, BasicBlockWidget*> blocks;
-	std::map<QListWidgetItem*, QWidget*> objects_list;
-	std::map<uint64_t, QListWidgetItem*> objects_list_by_address;
-	std::set<Function*> functions;
-	InformationManager* manager;
+	std::map<uint64_t, Function*> functions;
+	std::map<QTreeWidgetItem*, FunctionWidget*> objects_list;
+	std::map<uint64_t, QTreeWidgetItem*> objects_list_by_address;
+	std::vector<QTreeWidgetItem*> group_list;
 
+	InformationManager* manager;
 	log4cxx::LoggerPtr logger;
-public Q_SLOTS:
-	void switchMainPlaneToAddress(uint64_t);
-	void requestNewFunctionByAddress(uint64_t address);
+
 private Q_SLOTS:
 	void quit();
 	void open();
+	void load();
 	void save();
-	void switchMainPlane(int);
+	void switchMainPlane(QTreeWidgetItem* item);
 	void showListContextMenu(const QPoint&);
 	void requestNewFunction();
-	void renameFunction(QListWidgetItem * item);
+	void requestNewGroup();
+	void renameFunction(Function* function);
+	void renameGroup(QTreeWidgetItem* item);
 };
 
 #endif /* INCLUDE__Mainwindow_hxx_ */