X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtuiapplication.cpp;h=0049bff2cdb2bbd0bc391930a370fc1493acff97;hp=5060c2a8ca1134af1fccabe19d469df832d79496;hb=168309311415f27f1c7015805637b50a01b43c1e;hpb=130fde74cee428ec2e3285db89c4348c3091b2aa

diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp
index 5060c2a8..0049bff2 100644
--- a/src/qtui/qtuiapplication.cpp
+++ b/src/qtui/qtuiapplication.cpp
@@ -18,14 +18,49 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include "qtuiapplication.h"
+
 #include <QStringList>
 
-#include "qtuiapplication.h"
-#include "sessionsettings.h"
 #include "client.h"
+#include "cliparser.h"
+#include "qtui.h"
+#include "sessionsettings.h"
+
+QtUiApplication::QtUiApplication(int &argc, char **argv) : QApplication(argc, argv), Quassel() {
+  Q_INIT_RESOURCE(pics);
+# ifdef QUASSEL_ICONS_BUILTIN
+  Q_INIT_RESOURCE(hicolor);
+# endif
+# ifdef OXYGEN_ICONS_BUILTIN
+  Q_INIT_RESOURCE(oxygen);
+# endif
 
-QtUiApplication::QtUiApplication(int &argc, char **argv) : QApplication(argc, argv) {
+  setRunMode(Quassel::ClientOnly);
 
+  // put client-only arguments here
+  CliParser *parser = Quassel::cliParser();
+  parser->addSwitch("debugbufferswitches",0,"Enables debugging for bufferswitches");
+  parser->addSwitch("debugmodel",0,"Enables debugging for models");
+}
+
+bool QtUiApplication::init() {
+  if(Quassel::init()) {
+    // session resume
+    QtUi *gui = new QtUi();
+    Client::init(gui);
+    // init gui only after the event loop has started
+    // QTimer::singleShot(0, gui, SLOT(init()));
+    gui->init();
+    resumeSessionIfPossible();
+
+    return true;
+  }
+  return false;
+}
+
+QtUiApplication::~QtUiApplication() {
+  Client::destroy();
 }
 
 void QtUiApplication::saveState(QSessionManager & manager) {
@@ -37,9 +72,6 @@ void QtUiApplication::saveState(QSessionManager & manager) {
   emit saveStateToSessionSettings(s);
 }
 
-QtUiApplication::~ QtUiApplication() {
-}
-
 void QtUiApplication::resumeSessionIfPossible() {
   // load all sessions
   if(isSessionRestored()) {
@@ -56,4 +88,3 @@ void QtUiApplication::resumeSessionIfPossible() {
     s.cleanup();
   }
 }
-