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

diff --git a/src/common/main.cpp b/src/common/main.cpp
index f6da8f57..d958e7a0 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  *
@@ -18,11 +18,16 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include "global.h"
-#include "settings.h"
+#include <QDateTime>
 #include <QString>
+#include <QTimer>
 #include <QTranslator>
 
+#include "global.h"
+#include "logger.h"
+#include "network.h"
+#include "settings.h"
+
 #if defined BUILD_CORE
 #include <QCoreApplication>
 #include <QDir>
@@ -58,12 +63,11 @@ 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");
+  // Logger logger;
+
+  Global::registerMetaTypes();
+
+#include "../../version.inc"
 
 #if defined BUILD_CORE
   Global::runMode = Global::CoreOnly;
@@ -76,15 +80,37 @@ int main(int argc, char **argv) {
   QApplication app(argc, argv);
 #endif
 
+  qsrand(QDateTime::currentDateTime().toTime_t());
+
   // Set up i18n support
   QLocale locale = QLocale::system();
-  QTranslator translator;
-  translator.load(QString(":i18n/quassel_%1").arg(locale.name()));
-  app.installTranslator(&translator);
+
+  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);
+
+  Network::setDefaultCodecForServer("ISO-8859-1");
+  Network::setDefaultCodecForEncoding("UTF-8");
+  Network::setDefaultCodecForDecoding("ISO-8859-15");
 
   QCoreApplication::setOrganizationDomain("quassel-irc.org");
   QCoreApplication::setApplicationName("Quassel IRC");
-  QCoreApplication::setOrganizationName("Quassel IRC Development Team");  // FIXME
+  QCoreApplication::setOrganizationName("Quassel Project");
+
+  // Check if a non-standard core port is requested
+  QStringList args = QCoreApplication::arguments();  // TODO Build a CLI parser
+  Global::SPUTDEV = args.contains("--sputdev"); // This enables various debug features for Sput. Do not touch.
+
+  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 +121,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