X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=3076eea57d3b84d98b48d8741f8809e6fc7c3540;hb=e9c0076ab1da4d613cf0ef97adbb1f45fed13d47;hp=79a8cfec3d019c8441461ac9759765ac09e4c390;hpb=79aa3994d78860c0b7a623a46ce44dffff988fd9;p=quassel.git diff --git a/src/common/main.cpp b/src/common/main.cpp index 79a8cfec..3076eea5 100644 --- a/src/common/main.cpp +++ b/src/common/main.cpp @@ -21,6 +21,12 @@ #include #include +#ifdef HAVE_UMASK +# include +# include +#endif /* HAVE_UMASK */ + +#include #include #ifdef BUILD_CORE @@ -68,6 +74,13 @@ Q_IMPORT_PLUGIN(qgif) int main(int argc, char **argv) { +#ifdef HAVE_UMASK + 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")); @@ -84,29 +97,39 @@ 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); + Q_INIT_RESOURCE(hicolor_icons); #endif #ifdef EMBED_DATA Q_INIT_RESOURCE(i18n); # ifndef BUILD_CORE Q_INIT_RESOURCE(data); -# ifdef WITH_OXYGEN - Q_INIT_RESOURCE(oxygen); -# endif -# ifdef WITH_BREEZE - Q_INIT_RESOURCE(breeze); -# endif -# ifdef WITH_BREEZE_DARK - Q_INIT_RESOURCE(breezedark); + Q_INIT_RESOURCE(breeze_icons); + Q_INIT_RESOURCE(breeze_dark_icons); +# ifdef WITH_OXYGEN_ICONS + Q_INIT_RESOURCE(oxygen_icons); +# endif +# ifdef WITH_BUNDLED_ICONS + Q_INIT_RESOURCE(breeze_icon_theme); + Q_INIT_RESOURCE(breeze_dark_icon_theme); +# ifdef WITH_OXYGEN_ICONS + Q_INIT_RESOURCE(oxygen_icon_theme); # endif +# endif # endif #endif @@ -144,6 +167,11 @@ int main(int argc, char **argv) cliParser->addOption("configdir", 'c', "Specify the directory holding configuration files, the SQlite database and the SSL certificate", "path"); #endif cliParser->addOption("datadir", 0, "DEPRECATED - Use --configdir instead", "path"); + cliParser->addOption("loglevel", 'L', "Loglevel Debug|Info|Warning|Error", "level", "Info"); +#ifdef HAVE_SYSLOG + cliParser->addSwitch("syslog", 0, "Log to syslog"); +#endif + cliParser->addOption("logfile", 'l', "Log to a file", "path"); #ifndef BUILD_CORE // put client-only arguments here @@ -158,19 +186,16 @@ int main(int argc, char **argv) cliParser->addOption("listen", 0, "The address(es) quasselcore will listen on", "
[,
[,...]]", "::,0.0.0.0"); cliParser->addOption("port", 'p', "The port quasselcore will listen at", "port", "4242"); cliParser->addSwitch("norestore", 'n', "Don't restore last core's state"); - cliParser->addOption("loglevel", 'L', "Loglevel Debug|Info|Warning|Error", "level", "Info"); -#ifdef HAVE_SYSLOG - cliParser->addSwitch("syslog", 0, "Log to syslog"); -#endif - cliParser->addOption("logfile", 'l', "Log to a file", "path"); cliParser->addSwitch("config-from-environment", 0, "Load configuration from environment variables"); cliParser->addOption("select-backend", 0, "Switch storage backend (migrating data if possible)", "backendidentifier"); cliParser->addOption("select-authenticator", 0, "Select authentication backend", "authidentifier"); cliParser->addSwitch("add-user", 0, "Starts an interactive session to add a new core user"); cliParser->addOption("change-userpass", 0, "Starts an interactive session to change the password of the user identified by ", "username"); - cliParser->addSwitch("oidentd", 0, "Enable oidentd integration"); + 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("oidentd-strict", 0, "Use users' quasselcore username as ident reply. Ignores each user's configured ident setting. Only meaningful with --oidentd."); + 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"); @@ -190,20 +215,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 @@ -228,7 +241,6 @@ int main(int argc, char **argv) AboutData::setQuasselPersons(&aboutData); KAboutData::setApplicationData(aboutData.kAboutData()); #endif - if (!app.init()) return EXIT_FAILURE;