Introduce QtUiStyleSettings and make highlight color configurable again

[quassel.git] / src / common / main.cpp

diff --git a/src/common/main.cpp b/src/common/main.cpp
index f51f6b2..50221a2 100644 (file)
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -22,6 +22,7 @@
 #include <QString>
 #include <QTimer>
 #include <QTranslator>
+#include <QFile>
 
 #include "global.h"
 #include "logger.h"
@@ -64,8 +65,6 @@ int main(int argc, char **argv) {
   signal(SIGTERM, handle_signal);
   signal(SIGINT, handle_signal);
 
-  // Logger logger;
-
   Global::registerMetaTypes();
   Global::setupVersion();
 
@@ -86,9 +85,14 @@ int main(int argc, char **argv) {
 // put core-only arguments here
   Global::parser.addOption("port",'p',"The port quasselcore will listen at",QString("4242"));
   Global::parser.addSwitch("norestore", 'n', "Don't restore last core's state");
+  Global::parser.addOption("logfile",'l',"Path to logfile");
+  Global::parser.addOption("loglevel",'L',"Loglevel Debug|Info|Warning|Error","Info");
+  Global::parser.addOption("datadir", 0, "Specify the directory holding datafiles like the Sqlite DB and the SSL Cert");
 #endif // BUILD_QTUI
 #ifndef BUILD_CORE
 // put client-only arguments here
+  Global::parser.addSwitch("debugbufferswitches",0,"Enables debugging for bufferswitches");
+  Global::parser.addSwitch("debugmodel",0,"Enables debugging for models");
 #endif // BUILD_QTCORE
 // put shared client&core arguments here
   Global::parser.addSwitch("debug",'d',"Enable debug output");
@@ -99,16 +103,32 @@ int main(int argc, char **argv) {
     return 1;
   }
 
+  /*
+   This is an initial check if logfile is writable since the warning would spam stdout if done
+   in current Logger implementation. Can be dropped whenever the logfile is only opened once.
+  */
+  if(Global::runMode != Global::ClientOnly) {
+    QFile logFile;
+    if(!Global::parser.value("logfile").isEmpty()) {
+      logFile.setFileName(Global::parser.value("logfile"));
+      if(!logFile.open(QIODevice::Append | QIODevice::Text))
+        qWarning("Warning: Couldn't open logfile '%s' - will log to stdout instead",qPrintable(logFile.fileName()));
+      else logFile.close();
+    }
+  }
+
   qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
 
   // Set up i18n support
   QLocale locale = QLocale::system();
 
-  QTranslator qtTranslator;
+  QTranslator qtTranslator(&app);
+  qtTranslator.setObjectName("QtTr");
   qtTranslator.load(QString(":i18n/qt_%1").arg(locale.name()));
   app.installTranslator(&qtTranslator);
 
-  QTranslator quasselTranslator;
+  QTranslator quasselTranslator(&app);
+  quasselTranslator.setObjectName("QuasselTr");
   quasselTranslator.load(QString(":i18n/quassel_%1").arg(locale.name()));
   app.installTranslator(&quasselTranslator);