X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fquassel.cpp;h=bd31929afd550ef6027e887a76b2c1ed583e5f18;hp=29b6e55ec87ee428708134ad65b1921d13dbeb7e;hb=cd37744f0a2cd8ffe027892ddce5c7d6f4848ab0;hpb=f5d08a1e466b69f8c35e3b30e4cf898a71bc8b83

diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index 29b6e55e..bd31929a 100644
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -35,15 +35,15 @@
 #include "syncableobject.h"
 
 Quassel::BuildInfo Quassel::_buildInfo;
-CliParser *Quassel::_cliParser = 0;
+AbstractCliParser *Quassel::_cliParser = 0;
 Quassel::RunMode Quassel::_runMode;
+QString Quassel::_configDirPath;
+QStringList Quassel::_dataDirPaths;
 bool Quassel::_initialized = false;
 bool Quassel::DEBUG = false;
 QString Quassel::_coreDumpFileName;
 
 Quassel::Quassel() {
-  Q_INIT_RESOURCE(i18n);
-
   // We catch SIGTERM and SIGINT (caused by Ctrl+C) to graceful shutdown Quassel.
   signal(SIGTERM, handleSignal);
   signal(SIGINT, handleSignal);
@@ -58,11 +58,6 @@ Quassel::Quassel() {
 #  endif
 #endif
 
-  _cliParser = new CliParser();
-
-  // put shared client&core arguments here
-  cliParser()->addSwitch("debug",'d', tr("Enable debug output"));
-  cliParser()->addSwitch("help",'h', tr("Display this help and exit"));
 }
 
 Quassel::~Quassel() {
@@ -77,20 +72,16 @@ bool Quassel::init() {
   qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
 
   registerMetaTypes();
-  setupTranslations();
-
-  QCoreApplication::setApplicationName(buildInfo().applicationName);
-  QCoreApplication::setOrganizationName(buildInfo().organizationName);
-  QCoreApplication::setOrganizationDomain(buildInfo().organizationDomain);
 
   Network::setDefaultCodecForServer("ISO-8859-1");
   Network::setDefaultCodecForEncoding("UTF-8");
   Network::setDefaultCodecForDecoding("ISO-8859-15");
 
-  if(!cliParser()->parse(QCoreApplication::arguments()) || isOptionSet("help")) {
+  if(isOptionSet("help")) {
     cliParser()->usage();
     return false;
   }
+
   DEBUG = isOptionSet("debug");
   return true;
 }
@@ -105,6 +96,7 @@ void Quassel::registerMetaTypes() {
   qRegisterMetaType<Message>("Message");
   qRegisterMetaType<BufferInfo>("BufferInfo");
   qRegisterMetaType<NetworkInfo>("NetworkInfo");
+  qRegisterMetaType<Network::Server>("Network::Server");
   qRegisterMetaType<Identity>("Identity");
   qRegisterMetaType<Network::ConnectionState>("Network::ConnectionState");
 
@@ -112,6 +104,7 @@ void Quassel::registerMetaTypes() {
   qRegisterMetaTypeStreamOperators<Message>("Message");
   qRegisterMetaTypeStreamOperators<BufferInfo>("BufferInfo");
   qRegisterMetaTypeStreamOperators<NetworkInfo>("NetworkInfo");
+  qRegisterMetaTypeStreamOperators<Network::Server>("Network::Server");
   qRegisterMetaTypeStreamOperators<Identity>("Identity");
   qRegisterMetaTypeStreamOperators<qint8>("Network::ConnectionState");
 
@@ -130,21 +123,6 @@ void Quassel::registerMetaTypes() {
   qRegisterMetaTypeStreamOperators<MsgId>("MsgId");
 }
 
-void Quassel::setupTranslations() {
-  // Set up i18n support
-  QLocale locale = QLocale::system();
-
-  QTranslator *qtTranslator = new QTranslator(qApp);
-  qtTranslator->setObjectName("QtTr");
-  qtTranslator->load(QString(":i18n/qt_%1").arg(locale.name()));
-  qApp->installTranslator(qtTranslator);
-
-  QTranslator *quasselTranslator = new QTranslator(qApp);
-  quasselTranslator->setObjectName("QuasselTr");
-  quasselTranslator->load(QString(":i18n/quassel_%1").arg(locale.name()));
-  qApp->installTranslator(quasselTranslator);
-}
-
 void Quassel::setupBuildInfo(const QString &generated) {
   _buildInfo.applicationName = "Quassel IRC";
   _buildInfo.coreApplicationName = "Quassel Core";
@@ -215,6 +193,7 @@ void Quassel::handleSignal(int sig) {
   case SIGBUS:
 #endif
     logBacktrace(coreDumpFileName());
+    exit(EXIT_FAILURE);
     break;
   default:
     break;
@@ -228,7 +207,7 @@ void Quassel::logFatalMessage(const char *msg) {
   QFile dumpFile(coreDumpFileName());
   dumpFile.open(QIODevice::Append);
   QTextStream dumpStream(&dumpFile);
-  
+
   dumpStream << "Fatal: " << msg << '\n';
   dumpStream.flush();
   dumpFile.close();
@@ -248,3 +227,87 @@ const QString &Quassel::coreDumpFileName() {
   }
   return _coreDumpFileName;
 }
+
+QString Quassel::configDirPath() {
+  if(!_configDirPath.isEmpty())
+    return _configDirPath;
+
+  if(Quassel::isOptionSet("datadir")) {
+    qWarning() << "Obsolete option --datadir used!";
+    _configDirPath = Quassel::optionValue("datadir");
+  } else if(Quassel::isOptionSet("configdir")) {
+    _configDirPath = Quassel::optionValue("configdir");
+  } else {
+
+    // FIXME use QDesktopServices?
+#ifdef Q_OS_WIN32
+  _configDirPath = qgetenv("APPDATA") + "/quassel/";
+#elif defined Q_WS_MAC
+  _configDirPath = QDir::homePath() + "/Library/Application Support/Quassel/";
+#else
+  _configDirPath = QDir::homePath() + "/.quassel/";
+#endif
+  }
+
+  if(!_configDirPath.endsWith('/'))
+    _configDirPath += '/';
+
+  QDir qDir(_configDirPath);
+  if(!qDir.exists(_configDirPath)) {
+    if(!qDir.mkpath(_configDirPath)) {
+      qCritical() << "Unable to create Quassel config directory:" << qPrintable(qDir.absolutePath());
+      return QString();
+    }
+  }
+
+  return _configDirPath;
+}
+
+QStringList Quassel::dataDirPaths() {
+  return _dataDirPaths;
+}
+
+QStringList Quassel::findDataDirPaths() const {
+  QStringList dataDirNames = QString(qgetenv("XDG_DATA_DIRS")).split(':', QString::SkipEmptyParts);
+
+  if(!dataDirNames.isEmpty()) {
+    for(int i = 0; i < dataDirNames.count(); i++)
+      dataDirNames[i].append("/apps/quassel/");
+  } else {
+  // Provide a fallback
+  // FIXME fix this for win and mac!
+#ifdef Q_OS_WIN32
+    dataDirNames << qgetenv("APPDATA") + "/quassel/"
+                 << QCoreApplication::applicationDirPath();
+#elif defined Q_WS_MAC
+    dataDirNames << QDir::homePath() + "/Library/Application Support/Quassel/"
+                 << QCoreApplication::applicationDirPath();
+#else
+    if(dataDirNames.isEmpty())
+      dataDirNames.append("/usr/share/apps/quassel/");
+    // on UNIX, we always check our install prefix
+    QString appDir = QCoreApplication::applicationDirPath();
+    int binpos = appDir.lastIndexOf("/bin");
+    if(binpos >= 0) {
+      appDir.replace(binpos, 4, "/share");
+      appDir.append("/apps/quassel/");
+      if(!dataDirNames.contains(appDir))
+        dataDirNames.append(appDir);
+    }
+#endif
+  }
+
+  // add resource path just in case
+  dataDirNames << ":/data/";
+  return dataDirNames;
+}
+
+QString Quassel::findDataFilePath(const QString &fileName) {
+  QStringList dataDirs = dataDirPaths();
+  foreach(QString dataDir, dataDirs) {
+    QString path = dataDir + fileName;
+    if(QFile::exists(path))
+      return path;
+  }
+  return QString();
+}