Big update this time - Core has been redesigned to be multi-user capable. At least...

[quassel.git] / main / main_mono.cpp

diff --git a/main/main_mono.cpp b/main/main_mono.cpp
index 49078c1..fdfb22f 100644 (file)
--- a/main/main_mono.cpp
+++ b/main/main_mono.cpp
@@ -23,38 +23,76 @@
 #include <QApplication>
 
 #include "core.h"
-#include "quassel.h"
+#include "style.h"
+#include "global.h"
 #include "guiproxy.h"
+#include "coreproxy.h"
+#include "settings.h"
+#include "chatwidget.h"
 
 #include "mainwin.h"
 
 int main(int argc, char **argv) {
   QApplication app(argc, argv);
-  QApplication::setOrganizationDomain("quassel-irc.org");
-  QApplication::setApplicationName("Quassel IRC");
-  QApplication::setOrganizationName("The Quassel Team");
-
-  Quassel::runMode = Quassel::Monolithic;
-  quassel = Quassel::init();
-  core = Core::init();
-  guiProxy = GUIProxy::init();
-  // coreProxy = CoreProxy::init();
-
-  MainWin mainWin;
-  mainWin.show();
-  int exitCode = app.exec();
-  delete guiProxy;
-  delete quassel;
-}
+  QCoreApplication::setOrganizationDomain("quassel-irc.org");
+  QCoreApplication::setApplicationName("Quassel IRC");
+  QCoreApplication::setOrganizationName("Quassel IRC Development Team");
 
-void GUIProxy::send(GUISignal sig, QVariant arg1, QVariant arg2, QVariant arg3) {
+  Global::runMode = Global::Monolithic;
+  Global::quasselDir = QDir::homePath() + "/.quassel";
 
+  //settings = new Settings();
+  //global = new Global();
+  guiProxy = new GUIProxy();
+  //coreProxy = new CoreProxy();
+  QObject::connect(Core::guiSession(), SIGNAL(proxySignal(CoreSignal, QVariant, QVariant, QVariant)), guiProxy, SLOT(recv(CoreSignal, QVariant, QVariant, QVariant)));
+  QObject::connect(guiProxy, SIGNAL(send(GUISignal, QVariant, QVariant, QVariant)), Core::guiSession(), SLOT(processSignal(GUISignal, QVariant, QVariant, QVariant)));
 
+  Settings::init();
+  Style::init();
 
+  MainWin *mainWin = new MainWin();
+  mainWin->show();
+  mainWin->init();
+  int exitCode = app.exec();
+  //delete core;
+  Core::destroy();
+  delete guiProxy;
+  //delete coreProxy;
+  //delete global;
+  delete mainWin;
+  //delete settings;
+  return exitCode;
 }
 
-void GUIProxy::recv(CoreSignal sig, QVariant arg1, QVariant arg2, QVariant arg3) {
+void MainWin::syncToCore() {
+  //Q_ASSERT(Global::data("CoreReady").toBool());
+  coreBuffers = Core::guiSession()->buffers();
+  // NOTE: We don't need to request server states, because in the monolithic version there can't be
+  //       any servers connected at this stage...
+}
 
+/*
+void CoreProxy::sendToGUI(CoreSignal sig, QVariant arg1, QVariant arg2, QVariant arg3) {
+  guiProxy->recv(sig, arg1, arg2, arg3);
+}
+*/
 
+GUIProxy::GUIProxy() {
+  if(guiProxy) qFatal("Trying to instantiate more than one GUIProxy object!");
+}
 
+/*
+void GUIProxy::send(GUISignal sig, QVariant arg1, QVariant arg2, QVariant arg3) {
+  coreProxy->recv(sig, arg1, arg2, arg3);
 }
+*/
+
+// Dummy function definitions
+// These are not needed, since we don't have a network connection to the core.
+void GUIProxy::serverHasData() {}
+void GUIProxy::connectToCore(QString, quint16) {}
+void GUIProxy::disconnectFromCore() {}
+void GUIProxy::updateCoreData(QString) {}
+void GUIProxy::serverError(QAbstractSocket::SocketError) {}
+