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

diff --git a/src/common/main.cpp b/src/common/main.cpp
index fc5c0f7f..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,6 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include "global.h"
 #include "settings.h"
 #include <QString>
 #include <QTranslator>
@@ -75,17 +76,16 @@ int main(int argc, char **argv) {
   QApplication app(argc, argv);
 #endif
 
-  //Just for testing
-  //QTranslator translator;
-  //translator.load(":i18n/quassel_de");
-  //app.installTranslator(&translator);
+  // 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";
 #ifndef BUILD_QTUI
   Core::instance();  // create and init the core
 #endif
@@ -98,8 +98,18 @@ int main(int argc, char **argv) {
   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