X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=f6da8f577edefb8f74eca9a57cbb09b65dffa949;hp=48760d2dcd40157149c8c8839ed13ae9429c0f2b;hb=0b881e26eb5d741effae4a8096b319c9f5bcd462;hpb=6869909402a4dc807ee5261cc2a0999ac33053ee

diff --git a/src/common/main.cpp b/src/common/main.cpp
index 48760d2d..f6da8f57 100644
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel IRC Development Team             *
+ *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -18,40 +18,57 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <iostream>
-
 #include "global.h"
 #include "settings.h"
+#include <QString>
+#include <QTranslator>
 
 #if defined BUILD_CORE
 #include <QCoreApplication>
+#include <QDir>
 #include "core.h"
+#include "message.h"
 
-#elif defined BUILD_QTGUI
+#elif defined BUILD_QTUI
 #include <QApplication>
-#include "style.h"
 #include "client.h"
-#include "clientproxy.h"
-#include "mainwin.h"
+#include "qtui.h"
 
 #elif defined BUILD_MONO
 #include <QApplication>
-#include "core.h"
-#include "coreproxy.h"
-#include "style.h"
 #include "client.h"
-#include "clientproxy.h"
-#include "mainwin.h"
+#include "core.h"
+#include "coresession.h"
+#include "qtui.h"
 
 #else
 #error "Something is wrong - you need to #define a build mode!"
 #endif
 
+#include <signal.h>
+
+//! Signal handler for graceful shutdown.
+void handle_signal(int sig) {
+  qWarning(QString("Caught signal %1 - exiting.").arg(sig).toAscii());
+  QCoreApplication::quit();
+}
+
 int main(int argc, char **argv) {
+  // We catch SIGTERM and SIGINT (caused by Ctrl+C) to graceful shutdown Quassel.
+  signal(SIGTERM, handle_signal);
+  signal(SIGINT, handle_signal);
+
+  qRegisterMetaType<QVariant>("QVariant");
+  qRegisterMetaType<Message>("Message");
+  qRegisterMetaType<BufferInfo>("BufferInfo");
+  qRegisterMetaTypeStreamOperators<QVariant>("QVariant");
+  qRegisterMetaTypeStreamOperators<Message>("Message");
+  qRegisterMetaTypeStreamOperators<BufferInfo>("BufferInfo");
+
 #if defined BUILD_CORE
   Global::runMode = Global::CoreOnly;
   QCoreApplication app(argc, argv);
-#elif defined BUILD_QTGUI
+#elif defined BUILD_QTUI
   Global::runMode = Global::ClientOnly;
   QApplication app(argc, argv);
 #else
@@ -59,49 +76,50 @@ int main(int argc, char **argv) {
   QApplication app(argc, argv);
 #endif
 
+  // Set up i18n support
+  QLocale locale = QLocale::system();
+  QTranslator translator;
+  translator.load(QString(":i18n/quassel_%1").arg(locale.name()));
+  app.installTranslator(&translator);
+
   QCoreApplication::setOrganizationDomain("quassel-irc.org");
   QCoreApplication::setApplicationName("Quassel IRC");
-  QCoreApplication::setOrganizationName("Quassel IRC Development Team");
+  QCoreApplication::setOrganizationName("Quassel IRC Development Team");  // FIXME
 
-  Global::quasselDir = QDir::homePath() + "/.quassel";
-  Core::instance();
-#ifdef BUILD_MONO
-  QObject::connect(Core::localSession(), SIGNAL(proxySignal(CoreSignal, QVariant, QVariant, QVariant)), ClientProxy::instance(), SLOT(recv(CoreSignal, QVariant, QVariant, QVariant)));
-  QObject::connect(ClientProxy::instance(), SIGNAL(send(ClientSignal, QVariant, QVariant, QVariant)), Core::localSession(), SLOT(processSignal(ClientSignal, QVariant, QVariant, QVariant)));
+#ifndef BUILD_QTUI
+  Core::instance();  // create and init the core
 #endif
 
-  Settings::init();
+  //Settings::init();
 
 #ifndef BUILD_CORE
-  Style::init();
-  MainWin *mainWin = new MainWin();
-  Client::init(mainWin);
-  mainWin->init();
-#else
-  Core::instance(); // create and init the core object
+  QtUi *gui = new QtUi();
+  Client::init(gui);
+  gui->init();
+#endif
+
+#ifndef BUILD_QTUI
+  if(!QCoreApplication::arguments().contains("--norestore")) {
+    Core::restoreState();
+  }
 #endif
 
   int exitCode = app.exec();
 
+#ifndef BUILD_QTUI
+  Core::saveState();
+#endif
+
 #ifndef BUILD_CORE
   // the mainWin has to be deleted before the Core
   // if not Quassel will crash on exit under certain conditions since the gui
   // still wants to access clientdata
-  delete mainWin;
+  delete gui;
   Client::destroy();
 #endif
-#ifndef BUILD_QTGUI
+#ifndef BUILD_QTUI
   Core::destroy();
 #endif
 
   return exitCode;
 }
-
-#ifndef BUILD_CORE
-void Client::syncToCore() {
-  //Q_ASSERT(Global::data("CoreReady").toBool());
-  coreBuffers = Core::localSession()->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...
-}
-#endif