X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=20ea4d30dd9bfaad1d99e2650e6fa992dd4815f5;hp=eafb15971b3bf047ffe7613d9010a8c2654dad24;hb=6718d7a1ccd42d7aae75e57d6974e0b1e0384044;hpb=5b686746c880e5cda6d5de3e08180ea4332ff222 diff --git a/src/common/main.cpp b/src/common/main.cpp index eafb1597..20ea4d30 100644 --- a/src/common/main.cpp +++ b/src/common/main.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2012 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,12 +19,23 @@ ***************************************************************************/ #include +#include + +#ifdef HAVE_UMASK +# include +# include +#endif /* HAVE_UMASK */ + +#include +#include #ifdef BUILD_CORE # include "coreapplication.h" #elif defined BUILD_QTUI +# include "aboutdata.h" # include "qtuiapplication.h" #elif defined BUILD_MONO +# include "aboutdata.h" # include "monoapplication.h" #else @@ -32,13 +43,13 @@ #endif // We don't want quasselcore to depend on KDE -#if defined HAVE_KDE && defined BUILD_CORE -# undef HAVE_KDE +#if defined HAVE_KF5 && defined BUILD_CORE +# undef HAVE_KF5 #endif -#ifdef HAVE_KDE -# include -# include "kcmdlinewrapper.h" +#if defined HAVE_KF5 +# include +# include #endif #if !defined(BUILD_CORE) && defined(STATIC) @@ -47,99 +58,96 @@ Q_IMPORT_PLUGIN(qjpeg) Q_IMPORT_PLUGIN(qgif) #endif -#include "cliparser.h" #include "quassel.h" +#include "types.h" int main(int argc, char **argv) { - // Setup build information and version string - # include "version.gen" - buildinfo.append(QString(",%1,%2").arg(__DATE__, __TIME__)); - Quassel::setupBuildInfo(buildinfo); - QCoreApplication::setApplicationName(Quassel::buildInfo().applicationName); - QCoreApplication::setOrganizationName(Quassel::buildInfo().organizationName); - QCoreApplication::setOrganizationDomain(Quassel::buildInfo().organizationDomain); - - AbstractCliParser *cliParser; + // 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 HAVE_KDE - // We need to init KCmdLineArgs first - // TODO: build an AboutData compat class to replace our aboutDlg strings - 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("http://bugs.quassel-irc.org/projects/quassel-irc/issues/new"); - aboutData.setOrganizationDomain(Quassel::buildInfo().organizationDomain.toUtf8()); - KCmdLineArgs::init(argc, argv, &aboutData); +#ifdef EMBED_DATA + Q_INIT_RESOURCE(i18n); +# ifndef BUILD_CORE + Q_INIT_RESOURCE(data); + 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 - cliParser = new KCmdLineWrapper(); -#else - cliParser = new CliParser(); + // Set umask so files are created with restricted permissions +#ifdef HAVE_UMASK + umask(S_IRWXG | S_IRWXO); #endif - Quassel::setCliParser(cliParser); - // Initialize CLI arguments - // NOTE: We can't use tr() at this point, since app is not yet created + // Instantiate early, so log messages are handled + Quassel quassel; - // put shared client&core arguments here - cliParser->addSwitch("debug", 'd', "Enable debug output"); - cliParser->addSwitch("help", 'h', "Display this help and exit"); - cliParser->addSwitch("version", 'v', "Display version information"); -#ifdef BUILD_QTUI - cliParser->addOption("configdir ", 'c', "Specify the directory holding the client configuration"); -#else - cliParser->addOption("configdir ", 'c', "Specify the directory holding configuration files, the SQlite database and the SSL certificate"); -#endif - cliParser->addOption("datadir ", 0, "DEPRECATED - Use --configdir instead"); + Quassel::setupBuildInfo(); + QCoreApplication::setApplicationName(Quassel::buildInfo().applicationName); + QCoreApplication::setApplicationVersion(Quassel::buildInfo().plainVersionString); + QCoreApplication::setOrganizationName(Quassel::buildInfo().organizationName); + QCoreApplication::setOrganizationDomain(Quassel::buildInfo().organizationDomain); -#ifndef BUILD_CORE - // put client-only arguments here - cliParser->addOption("qss ", 0, "Load a custom application stylesheet"); - cliParser->addSwitch("debugbufferswitches", 0, "Enables debugging for bufferswitches"); - cliParser->addSwitch("debugmodel", 0, "Enables debugging for models"); -#endif -#ifndef BUILD_QTUI - // put core-only arguments here - 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", QString("4242")); - cliParser->addSwitch("norestore", 'n', "Don't restore last core's state"); - cliParser->addOption("loglevel ", 'L', "Loglevel Debug|Info|Warning|Error", "Info"); -#ifdef HAVE_SYSLOG - cliParser->addSwitch("syslog", 0, "Log to syslog"); -#endif - cliParser->addOption("logfile ", 'l', "Log to a file"); - cliParser->addOption("select-backend ", 0, "Switch storage backend (migrating data if possible)"); - 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->addOption("oidentd-conffile ", 0, "Set path to oidentd configuration file"); + // 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_KDE - // the KDE version needs this extra call to parse argc/argv before app is instantiated - if (!cliParser->init()) { - cliParser->usage(); - return EXIT_FAILURE; - } + //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); -# if defined BUILD_CORE + // Instantiate application +#if defined BUILD_CORE CoreApplication app(argc, argv); -# elif defined BUILD_QTUI + const auto runMode = Quassel::RunMode::CoreOnly; +#elif defined BUILD_QTUI QtUiApplication app(argc, argv); -# elif defined BUILD_MONO + const auto runMode = Quassel::RunMode::ClientOnly; +#elif defined BUILD_MONO MonolithicApplication app(argc, argv); -# endif + const auto runMode = Quassel::RunMode::Monolithic; +#endif -#ifndef HAVE_KDE - // the non-KDE version parses after app has been instantiated - if (!cliParser->init(app.arguments())) { - cliParser->usage(); - return false; - } + try { + Quassel::instance()->init(runMode); + +#ifdef HAVE_KF5 + AboutData aboutData; + AboutData::setQuasselPersons(&aboutData); + KAboutData::setApplicationData(aboutData.kAboutData()); #endif - if (!app.init()) return EXIT_FAILURE; + // Initialize the application + app.init(); + } + catch (ExitException e) { + if (!e.errorString.isEmpty()) { + qCritical() << e.errorString; + } + return e.exitCode; + } + return app.exec(); }