X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=6a36e5473251b7c3268b40785537ba144d2cf3c4;hp=b13d3eef4e0033fec11e0c1b20a891ce8b36ba96;hb=7d4dbdf00ab92e8c322656bd2d4d7034ef547001;hpb=5e6f3661d30bc760f912dfe0627e5c62c6f2c144 diff --git a/src/common/main.cpp b/src/common/main.cpp index b13d3eef..6a36e547 100644 --- a/src/common/main.cpp +++ b/src/common/main.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2015 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -19,6 +19,12 @@ ***************************************************************************/ #include +#include + +#ifdef HAVE_UMASK +# include +# include +#endif /* HAVE_UMASK */ #include @@ -67,6 +73,10 @@ Q_IMPORT_PLUGIN(qgif) int main(int argc, char **argv) { +#ifdef HAVE_UMASK + umask(S_IRWXG | S_IRWXO); +#endif + #if QT_VERSION < 0x050000 // All our source files are in UTF-8, and Qt5 even requires that QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); @@ -90,27 +100,28 @@ int main(int argc, char **argv) #endif #ifndef BUILD_CORE Q_INIT_RESOURCE(pics); - Q_INIT_RESOURCE(hicolor); #endif #ifdef EMBED_DATA Q_INIT_RESOURCE(i18n); # ifndef BUILD_CORE Q_INIT_RESOURCE(data); -# ifdef WITH_OXYGEN - Q_INIT_RESOURCE(oxygen); + 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 - // Migrate settings from KDE4 to KF5 if appropriate -#ifdef HAVE_KF5 - Kdelibs4ConfigMigrator migrator(QCoreApplication::applicationName()); - migrator.setConfigFiles(QStringList() << "quasselrc" << "quassel.notifyrc"); - migrator.migrate(); -#endif - - AbstractCliParser *cliParser; + std::shared_ptr cliParser; #ifdef HAVE_KDE4 // We need to init KCmdLineArgs first @@ -118,15 +129,15 @@ int main(int argc, char **argv) ki18n("A modern, distributed IRC client")); aboutData.addLicense(KAboutData::License_GPL_V2); aboutData.addLicense(KAboutData::License_GPL_V3); - aboutData.setBugAddress("http://bugs.quassel-irc.org/projects/quassel-irc/issues/new"); + aboutData.setBugAddress("https://bugs.quassel-irc.org/projects/quassel-irc/issues/new"); aboutData.setOrganizationDomain(Quassel::buildInfo().organizationDomain.toUtf8()); KCmdLineArgs::init(argc, argv, &aboutData); - cliParser = new KCmdLineWrapper(); + cliParser = std::make_shared(); #elif defined HAVE_QT5 - cliParser = new Qt5CliParser(); + cliParser = std::make_shared(); #else - cliParser = new CliParser(); + cliParser = std::make_shared(); #endif Quassel::setCliParser(cliParser); @@ -144,10 +155,15 @@ 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 - cliParser->addOption("icontheme", 0, "Override the system icon theme ('oxygen' is recommended)", "theme"); + cliParser->addOption("icontheme", 0, "Override the system icon theme ('breeze' is recommended)", "theme"); cliParser->addOption("qss", 0, "Load a custom application stylesheet", "file.qss"); cliParser->addSwitch("debugbufferswitches", 0, "Enables debugging for bufferswitches"); cliParser->addSwitch("debugmodel", 0, "Enables debugging for models"); @@ -158,18 +174,18 @@ 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("strict-ident", 0, "Use users' quasselcore username as ident reply. Ignores each user's configured ident setting."); #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"); + cliParser->addOption("ssl-key", 0, "Specify the path to the SSL key", "path", "ssl-cert-path"); #endif cliParser->addSwitch("enable-experimental-dcc", 0, "Enable highly experimental and unfinished support for CTCP DCC (DANGEROUS)"); #endif @@ -182,22 +198,41 @@ int main(int argc, char **argv) } #endif -# if defined BUILD_CORE +#if defined BUILD_CORE CoreApplication app(argc, argv); -# elif defined BUILD_QTUI +#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 +#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 +#endif #ifndef HAVE_KDE4 // the non-KDE version parses after app has been instantiated if (!cliParser->init(app.arguments())) { cliParser->usage(); - return false; + return EXIT_FAILURE; } #endif +// Migrate settings from KDE4 to KF5 if appropriate +#ifdef HAVE_KF5 + Kdelibs4ConfigMigrator migrator(QCoreApplication::applicationName()); + migrator.setConfigFiles(QStringList() << "quasselrc" << "quassel.notifyrc"); + migrator.migrate(); +#endif + #ifdef HAVE_KF5 // FIXME: This should be done after loading the translation catalogue, but still in main() AboutData aboutData;