/***************************************************************************
- * Copyright (C) 2005-09 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 *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include <cstdlib>
+#include <memory>
+
+#ifdef HAVE_UMASK
+# include <sys/types.h>
+# include <sys/stat.h>
+#endif /* HAVE_UMASK */
+
+#include <QCoreApplication>
+#include <QTextCodec>
#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
#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 <KAboutData>
-# include "kcmdlinewrapper.h"
+#if defined HAVE_KF5
+# include <KCoreAddons/KAboutData>
+# include <KCoreAddons/Kdelibs4ConfigMigrator>
#endif
-#if !defined(BUILD_CORE) && defined(STATIC)
-#include <QtPlugin>
-Q_IMPORT_PLUGIN(qjpeg)
-Q_IMPORT_PLUGIN(qgif)
+#include "quassel.h"
+#include "types.h"
+
+int main(int argc, char **argv)
+{
+ // 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
-#include "cliparser.h"
-#include "quassel.h"
+#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
-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;
-
-#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.setOrganizationDomain(Quassel::buildInfo().organizationDomain.toUtf8());
- KCmdLineArgs::init(argc, argv, &aboutData);
-
- 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->addOption("configdir <path>", 'c', "Specify the directory holding configuration files, the SQlite database and the SSL Cert");
- cliParser->addOption("datadir <path>", 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->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 <address>[,<address[,...]]>", 0, "The address(es) quasselcore will listen on", "0.0.0.0,::");
- cliParser->addOption("port <port>",'p', "The port quasselcore will listen at", QString("4242"));
- cliParser->addSwitch("norestore", 'n', "Don't restore last core's state");
- cliParser->addOption("logfile <path>", 'l', "Path to logfile");
- cliParser->addOption("loglevel <level>", 'L', "Loglevel Debug|Info|Warning|Error", "Info");
- cliParser->addOption("select-backend <backendidentifier>", 0, "Starts an interactive session and switches your current storage backend to the new one. Attempts a merge if the new backend is uninitialized and the old backend supports migration. Otherwise prompts for new user credentials!");
- cliParser->addSwitch("add-user", 0, "Starts an interactive session to add a new core user");
- cliParser->addOption("change-userpass <username>", 0, "Starts an interactive session to change the password of the user identified by username");
+ // 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
+
+ try {
+ Quassel::instance()->init(runMode);
-#ifndef HAVE_KDE
- // the non-KDE version parses after app has been instantiated
- if(!cliParser->init(app.arguments())) {
- cliParser->usage();
- return false;
- }
+#ifdef HAVE_KF5
+ AboutData aboutData;
+ AboutData::setQuasselPersons(&aboutData);
+ KAboutData::setApplicationData(aboutData.kAboutData());
#endif
- if(!app.init()) return EXIT_FAILURE;
- return app.exec();
+ // Initialize the application
+ app.init();
+ }
+ catch (ExitException e) {
+ if (!e.errorString.isEmpty()) {
+ qCritical() << e.errorString;
+ }
+ return e.exitCode;
+ }
+
+ return app.exec();
}