X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtuiapplication.cpp;h=c2157a057a0e36f79922a0bd53022ad32c8d9150;hp=9a99d9bbfac8cd63aea7e8f34cd6098c4e0847a0;hb=e3314686ed9fe6203ed194ab4d73791176c2e051;hpb=16f8531e383eade0a75a3b74ea11b909b8b1e049

diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp
index 9a99d9bb..c2157a05 100644
--- a/src/qtui/qtuiapplication.cpp
+++ b/src/qtui/qtuiapplication.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2010 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -28,8 +28,9 @@
 
 #include "client.h"
 #include "cliparser.h"
+#include "mainwin.h"
 #include "qtui.h"
-#include "sessionsettings.h"
+#include "qtuisettings.h"
 
 QtUiApplication::QtUiApplication(int &argc, char **argv)
 #ifdef HAVE_KDE
@@ -56,6 +57,9 @@ QtUiApplication::QtUiApplication(int &argc, char **argv)
 
 #endif /* HAVE_KDE */
 
+#if defined(HAVE_KDE) || defined(Q_OS_MAC)
+  disableCrashhandler();
+#endif /* HAVE_KDE || Q_OS_MAC */
   setRunMode(Quassel::ClientOnly);
 
   qInstallMsgHandler(Client::logMessage);
@@ -66,17 +70,22 @@ bool QtUiApplication::init() {
 
     // FIXME: MIGRATION 0.3 -> 0.4: Move database and core config to new location
     // Move settings, note this does not delete the old files
-#ifdef Q_WS_WIN
-    QSettings::Format format = QSettings::IniFormat;
+#ifdef Q_WS_MAC
+    QSettings newSettings("quassel-irc.org", "quasselclient");
 #else
+
+# ifdef Q_WS_WIN
+    QSettings::Format format = QSettings::IniFormat;
+# else
     QSettings::Format format = QSettings::NativeFormat;
-#endif
+# endif
+
     QString newFilePath = Quassel::configDirPath() + "quasselclient"
     + ((format == QSettings::NativeFormat) ? QLatin1String(".conf") : QLatin1String(".ini"));
     QSettings newSettings(newFilePath, format);
+#endif /* Q_WS_MAC */
 
-    if(newSettings.value("Config/Version").toUInt() != 1) {
-      qWarning() << "\n\n*** IMPORTANT: Config and data file locations have changed. Attempting to auto-migrate your client settings...";
+    if(newSettings.value("Config/Version").toUInt() == 0) {
 #     ifdef Q_WS_MAC
         QString org = "quassel-irc.org";
 #     else
@@ -84,16 +93,25 @@ bool QtUiApplication::init() {
 #     endif
       QSettings oldSettings(org, "Quassel Client");
       if(oldSettings.allKeys().count()) {
+        qWarning() << "\n\n*** IMPORTANT: Config and data file locations have changed. Attempting to auto-migrate your client settings...";
         foreach(QString key, oldSettings.allKeys())
           newSettings.setValue(key, oldSettings.value(key));
         newSettings.setValue("Config/Version", 1);
-        qWarning() << "*   Your client settings have been migrated to" << newFilePath;
+        qWarning() << "*   Your client settings have been migrated to" << newSettings.fileName();
+        qWarning() << "*** Migration completed.\n\n";
       }
-      qWarning() << "*** Migration completed.\n\n";
     }
 
     // MIGRATION end
 
+    // check settings version
+    // so far, we only have 1
+    QtUiSettings s;
+    if(s.version() != 1) {
+      qCritical() << "Invalid client settings version, terminating!";
+      return false;
+    }
+
     // session resume
     QtUi *gui = new QtUi();
     Client::init(gui);
@@ -110,17 +128,21 @@ QtUiApplication::~QtUiApplication() {
   Client::destroy();
 }
 
+void QtUiApplication::quit() {
+  QtUi::mainWindow()->quit();
+}
+
 void QtUiApplication::commitData(QSessionManager &manager) {
+  Q_UNUSED(manager)
   _aboutToQuit = true;
 }
 
 void QtUiApplication::saveState(QSessionManager & manager) {
   //qDebug() << QString("saving session state to id %1").arg(manager.sessionId());
-  AccountId activeCore = Client::currentCoreAccount();
+  AccountId activeCore = Client::currentCoreAccount().accountId(); // FIXME store this!
   SessionSettings s(manager.sessionId());
   s.setSessionAge(0);
-  emit saveStateToSession(manager.sessionId());
-  emit saveStateToSessionSettings(s);
+  QtUi::mainWindow()->saveStateToSettings(s);
 }
 
 void QtUiApplication::resumeSessionIfPossible() {
@@ -130,8 +152,7 @@ void QtUiApplication::resumeSessionIfPossible() {
     SessionSettings s(sessionId());
     s.sessionAging();
     s.setSessionAge(0);
-    emit resumeFromSession(sessionId());
-    emit resumeFromSessionSettings(s);
+    QtUi::mainWindow()->restoreStateFromSettings(s);
     s.cleanup();
   } else {
     SessionSettings s(QString("1"));