X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2FMainwindow.cxx;h=269f3e7359d7c82b89e613c011d6f614097cee0a;hp=47c78858e46314efbe448a1d185b1f7377e8e3d2;hb=5514e0b76ec9af2fa67abebe77cfe26052f2326f;hpb=ae7b9847b80153121fbc1f87e4fdc1dd0e94f4cc

diff --git a/src/gui/Mainwindow.cxx b/src/gui/Mainwindow.cxx
index 47c7885..269f3e7 100644
--- a/src/gui/Mainwindow.cxx
+++ b/src/gui/Mainwindow.cxx
@@ -6,6 +6,9 @@
 #include "core/BasicBlock.hxx"
 #include "core/InformationManager.hxx"
 #include "core/events/RenameFunctionEvent.hxx"
+
+#include "widgets/FridaDock.hxx"
+#include "widgets/LogDock.hxx"
 #include "widgets/ScriptingDock.hxx"
 #include "widgets/CFGScene.hxx"
 #include "widgets/FunctionWidget.hxx"
@@ -40,10 +43,17 @@ Mainwindow::Mainwindow(InformationManager* mgr)
 
 	QMenu* interpretermenu = menuBar()->addMenu(tr("&Interpreter"));
 
-	interpreter["GUILE"] = new GuileInterpreter;
-	scripting = new ScriptingDock(interpreter["GUILE"], tr("Scripting"), this);
-	scripting->setAllowedAreas(Qt::BottomDockWidgetArea);
-	addDockWidget(Qt::BottomDockWidgetArea, scripting);
+	QPluginLoader* loader = new QPluginLoader("libguilePlugin", this);
+	if (!loader->load())
+		LOG4CXX_ERROR(logger, "Loading plugin failed: " << loader->errorString().toStdString());
+	interpreter["GUILE"] = qobject_cast<Interpreter*>(loader->instance());
+	fdock = new FridaDock(tr("Frida Dock"), this);
+
+	fdock->addTab(new LogDock(fdock), "Log");
+
+	fdock->addTab(new ScriptingDock(interpreter["GUILE"], fdock), "guile");
+	fdock->setAllowedAreas(Qt::BottomDockWidgetArea);
+	addDockWidget(Qt::BottomDockWidgetArea, fdock);
 	QAction* guileLoad = new QAction(tr("&GUILE"), this);
 	interpretermenu->addAction(guileLoad);
 	connect(guileLoad, &QAction::triggered,