X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=6c4b5a42e0d2c7974b7e578e7f98f5baab9af4ad;hp=6a36e5473251b7c3268b40785537ba144d2cf3c4;hb=c27d5bfbe80bfeb583a25404f4ccee4b70b010e0;hpb=7d4dbdf00ab92e8c322656bd2d4d7034ef547001

diff --git a/src/common/main.cpp b/src/common/main.cpp
index 6a36e547..6c4b5a42 100644
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -26,6 +26,7 @@
 #  include <sys/stat.h>
 #endif /* HAVE_UMASK */
 
+#include <QCoreApplication>
 #include <QTextCodec>
 
 #ifdef BUILD_CORE
@@ -70,6 +71,7 @@ Q_IMPORT_PLUGIN(qgif)
 #endif
 
 #include "quassel.h"
+#include "types.h"
 
 int main(int argc, char **argv)
 {
@@ -77,6 +79,9 @@ int main(int argc, char **argv)
     umask(S_IRWXG | S_IRWXO);
 #endif
 
+    // Instantiate early, so log messages are handled
+    Quassel::instance();
+
 #if QT_VERSION < 0x050000
     // All our source files are in UTF-8, and Qt5 even requires that
     QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
@@ -93,13 +98,21 @@ int main(int argc, char **argv)
 #if QT_VERSION < 0x050000 && defined Q_OS_MAC && !defined BUILD_CORE
     QApplication::setGraphicsSystem("raster");
 #endif
-
+//Setup the High-DPI settings
+# if QT_VERSION >= 0x050600 && defined(Q_OS_WIN)
+    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); //Added in Qt 5.6
+#endif
+# if QT_VERSION >= 0x050400
+   //Added in the early Qt5 versions (5.0?)- use 5.4 as the cutoff since lots of high-DPI work was added then
+    QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+# endif
     // We need to explicitly initialize the required resources when linking statically
 #ifndef BUILD_QTUI
     Q_INIT_RESOURCE(sql);
 #endif
 #ifndef BUILD_CORE
     Q_INIT_RESOURCE(pics);
+    Q_INIT_RESOURCE(hicolor_icons);
 #endif
 
 #ifdef EMBED_DATA
@@ -182,6 +195,8 @@ int main(int argc, char **argv)
     cliParser->addSwitch("oidentd", 0, "Enable oidentd integration.  In most cases you should also enable --strict-ident");
     cliParser->addOption("oidentd-conffile", 0, "Set path to oidentd configuration file", "file");
     cliParser->addSwitch("strict-ident", 0, "Use users' quasselcore username as ident reply. Ignores each user's configured ident setting.");
+    cliParser->addSwitch("ident-daemon", 0, "Enable internal ident daemon");
+    cliParser->addOption("ident-port", 0, "The port quasselcore will listen at for ident requests. Only meaningful with --ident-daemon", "port", "10113");
 #ifdef HAVE_SSL
     cliParser->addSwitch("require-ssl", 0, "Require SSL for remote (non-loopback) client connections");
     cliParser->addOption("ssl-cert", 0, "Specify the path to the SSL Certificate", "path", "configdir/quasselCert.pem");
@@ -201,20 +216,8 @@ int main(int argc, char **argv)
 #if defined BUILD_CORE
     CoreApplication app(argc, argv);
 #elif defined BUILD_QTUI
-# if QT_VERSION >= 0x050600 && defined(Q_OS_WIN)
-    QtUiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif
-# if QT_VERSION >= 0x050700
-    QtUiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-# endif
     QtUiApplication app(argc, argv);
 #elif defined BUILD_MONO
-# if QT_VERSION >= 0x050600 && defined(Q_OS_WIN)
-    MonolithicApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif
-# if QT_VERSION >= 0x050700
-    MonolithicApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-# endif
     MonolithicApplication app(argc, argv);
 #endif
 
@@ -239,9 +242,15 @@ int main(int argc, char **argv)
     AboutData::setQuasselPersons(&aboutData);
     KAboutData::setApplicationData(aboutData.kAboutData());
 #endif
-
-    if (!app.init())
-        return EXIT_FAILURE;
+    try {
+        app.init();
+    }
+    catch (ExitException e) {
+        if (!e.errorString.isEmpty()) {
+            qCritical() << e.errorString;
+        }
+        return e.exitCode;
+    }
 
     return app.exec();
 }