X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fmain.cpp;h=7fa59aaaa4015d9194d3ef8f6c0df18d2967c091;hb=21d8d7f0a79eeeb541664aa80ce481fdbfc41f09;hp=cb935e72cb3b150b3cdae93b7a031ae06f0e07ce;hpb=9ac6ae4ee26819874d8843ba09f38a24088d663d;p=quassel.git

diff --git a/src/common/main.cpp b/src/common/main.cpp
index cb935e72..7fa59aaa 100644
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -19,8 +19,10 @@
  ***************************************************************************/
 
 #include "global.h"
+#include "identity.h"
 #include "settings.h"
 #include <QString>
+#include <QTimer>
 #include <QTranslator>
 
 #if defined BUILD_CORE
@@ -58,12 +60,7 @@ int main(int argc, char **argv) {
   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");
+  Global::registerMetaTypes();
 
 #if defined BUILD_CORE
   Global::runMode = Global::CoreOnly;
@@ -76,15 +73,30 @@ 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 qtTranslator;
+  qtTranslator.load(QString(":i18n/qt_%1").arg(locale.name()));
+  app.installTranslator(&qtTranslator);
+
+  QTranslator quasselTranslator;
+  quasselTranslator.load(QString(":i18n/quassel_%1").arg(locale.name()));
+  app.installTranslator(&quasselTranslator);
 
-            
   QCoreApplication::setOrganizationDomain("quassel-irc.org");
   QCoreApplication::setApplicationName("Quassel IRC");
-  QCoreApplication::setOrganizationName("Quassel IRC Development Team");
+  QCoreApplication::setOrganizationName("Quassel Project");
+
+  // Check if a non-standard core port is requested
+  QStringList args = QCoreApplication::arguments();  // TODO Build a CLI parser
+
+  Global::defaultPort = 4242;
+  int idx;
+  if((idx = args.indexOf("-p")) > 0 && idx < args.count() - 1) {
+    int port = args[idx+1].toInt();
+    if(port >= 1024 && port < 65536) Global::defaultPort = port;
+  }
 
 #ifndef BUILD_QTUI
   Core::instance();  // create and init the core
@@ -95,11 +107,13 @@ int main(int argc, char **argv) {
 #ifndef BUILD_CORE
   QtUi *gui = new QtUi();
   Client::init(gui);
-  gui->init();
+  // init gui only after the event loop has started
+  QTimer::singleShot(0, gui, SLOT(init()));
+  //gui->init();
 #endif
 
 #ifndef BUILD_QTUI
-  if(!QCoreApplication::arguments().contains("--norestore")) {
+  if(args.contains("--norestore")) {
     Core::restoreState();
   }
 #endif