X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=4b134049fd9b4b3d7358ff0fd75a2e6d08235219;hp=eb7a140c5de956f25c71a259aa88736efd693112;hb=ce250a863bce3198096e65d4c7a68269495302dd;hpb=dce2be6d7f9af7dcc0133ee7f0f42e9ef47be568 diff --git a/src/common/main.cpp b/src/common/main.cpp index eb7a140c..4b134049 100644 --- a/src/common/main.cpp +++ b/src/common/main.cpp @@ -42,26 +42,14 @@ #error "Something is wrong - you need to #define a build mode!" #endif -// We don't want quasselcore to depend on KDE -#if defined HAVE_KDE4 && defined BUILD_CORE -# undef HAVE_KDE4 -#endif // We don't want quasselcore to depend on KDE #if defined HAVE_KF5 && defined BUILD_CORE # undef HAVE_KF5 #endif -#ifdef HAVE_KDE4 -# include -# include "kcmdlinewrapper.h" -#elif defined HAVE_KF5 +#if defined HAVE_KF5 # include # include -# include "qt5cliparser.h" -#elif defined HAVE_QT5 -# include "qt5cliparser.h" -#else -# include "cliparser.h" #endif #if !defined(BUILD_CORE) && defined(STATIC) @@ -70,42 +58,12 @@ Q_IMPORT_PLUGIN(qjpeg) Q_IMPORT_PLUGIN(qgif) #endif +#include "qt5cliparser.h" #include "quassel.h" #include "types.h" 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")); - QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8")); -#endif - - Quassel::setupBuildInfo(); - QCoreApplication::setApplicationName(Quassel::buildInfo().applicationName); - QCoreApplication::setApplicationVersion(Quassel::buildInfo().plainVersionString); - QCoreApplication::setOrganizationName(Quassel::buildInfo().organizationName); - QCoreApplication::setOrganizationDomain(Quassel::buildInfo().organizationDomain); - - // on OSX with Qt4, raster seems to fix performance issues -#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); @@ -122,7 +80,7 @@ int main(int argc, char **argv) Q_INIT_RESOURCE(breeze_icons); Q_INIT_RESOURCE(breeze_dark_icons); # ifdef WITH_OXYGEN_ICONS - Q_INIT_RESOURCE(oxygen_icons); + Q_INIT_RESOURCE(oxygen_icons); # endif # ifdef WITH_BUNDLED_ICONS Q_INIT_RESOURCE(breeze_icon_theme); @@ -134,29 +92,50 @@ int main(int argc, char **argv) # endif #endif - std::shared_ptr cliParser; + // Set umask so files are created with restricted permissions +#ifdef HAVE_UMASK + umask(S_IRWXG | S_IRWXO); +#endif -#ifdef HAVE_KDE4 - // We need to init KCmdLineArgs first - KAboutData aboutData("quassel", "kdelibs4", ki18n("Quassel IRC"), Quassel::buildInfo().plainVersionString.toUtf8(), - ki18n("A modern, distributed IRC client")); - aboutData.addLicense(KAboutData::License_GPL_V2); - aboutData.addLicense(KAboutData::License_GPL_V3); - aboutData.setBugAddress("https://bugs.quassel-irc.org/projects/quassel-irc/issues/new"); - aboutData.setOrganizationDomain(Quassel::buildInfo().organizationDomain.toUtf8()); - KCmdLineArgs::init(argc, argv, &aboutData); + // Instantiate early, so log messages are handled + Quassel quassel; - cliParser = std::make_shared(); -#elif defined HAVE_QT5 - cliParser = std::make_shared(); -#else - cliParser = std::make_shared(); + Quassel::setupBuildInfo(); + QCoreApplication::setApplicationName(Quassel::buildInfo().applicationName); + QCoreApplication::setApplicationVersion(Quassel::buildInfo().plainVersionString); + QCoreApplication::setOrganizationName(Quassel::buildInfo().organizationName); + QCoreApplication::setOrganizationDomain(Quassel::buildInfo().organizationDomain); + + // Migrate settings from KDE4 to KF5 if appropriate +#ifdef HAVE_KF5 + Kdelibs4ConfigMigrator migrator(QCoreApplication::applicationName()); + migrator.setConfigFiles(QStringList() << "quasselrc" << "quassel.notifyrc"); + migrator.migrate(); +#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 + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); + + // Instantiate application +#if defined BUILD_CORE + CoreApplication app(argc, argv); + const auto runMode = Quassel::RunMode::CoreOnly; +#elif defined BUILD_QTUI + QtUiApplication app(argc, argv); + const auto runMode = Quassel::RunMode::ClientOnly; +#elif defined BUILD_MONO + MonolithicApplication app(argc, argv); + const auto runMode = Quassel::RunMode::Monolithic; #endif - Quassel::setCliParser(cliParser); // Initialize CLI arguments - // NOTE: We can't use tr() at this point, since app is not yet created - // TODO: Change this once we get rid of KDE4 and can initialize the parser after creating the app + // TODO: Move CLI option handling into Quassel::init(), after initializing the translation catalogue + + std::shared_ptr cliParser = std::make_shared(); + Quassel::setCliParser(cliParser); // put shared client&core arguments here cliParser->addSwitch("debug", 'd', "Enable debug output"); @@ -211,44 +190,22 @@ int main(int argc, char **argv) cliParser->addSwitch("enable-experimental-dcc", 0, "Enable highly experimental and unfinished support for CTCP DCC (DANGEROUS)"); #endif -#ifdef HAVE_KDE4 - // the KDE version needs this extra call to parse argc/argv before app is instantiated - if (!cliParser->init()) { - cliParser->usage(); - return EXIT_FAILURE; - } -#endif - -#if defined BUILD_CORE - CoreApplication app(argc, argv); -#elif defined BUILD_QTUI - QtUiApplication app(argc, argv); -#elif defined BUILD_MONO - MonolithicApplication app(argc, argv); -#endif - -#ifndef HAVE_KDE4 - // the non-KDE version parses after app has been instantiated if (!cliParser->init(app.arguments())) { cliParser->usage(); 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 + try { + // Note: This method requires CLI options to be available + Quassel::instance()->init(runMode); #ifdef HAVE_KF5 - // FIXME: This should be done after loading the translation catalogue, but still in main() - AboutData aboutData; - AboutData::setQuasselPersons(&aboutData); - KAboutData::setApplicationData(aboutData.kAboutData()); + AboutData aboutData; + AboutData::setQuasselPersons(&aboutData); + KAboutData::setApplicationData(aboutData.kAboutData()); #endif - try { + + // Initialize the application app.init(); } catch (ExitException e) {