X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtuiapplication.cpp;h=b7e8e8c5a97e048704c611eb3ad839100e3989dd;hp=c9475feeeb46c3db1930091a636f8f04e4d0fe3b;hb=HEAD;hpb=37110ceaa070167b4f40ed449ac9ea130503a792 diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp index c9475fee..4ed05838 100644 --- a/src/qtui/qtuiapplication.cpp +++ b/src/qtui/qtuiapplication.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2018 by the Quassel Project * + * Copyright (C) 2005-2022 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -24,119 +24,55 @@ #include #include -#ifdef HAVE_KDE4 -# include -#endif - #include "chatviewsettings.h" -#include "client.h" -#include "cliparser.h" #include "mainwin.h" #include "qtui.h" #include "qtuisettings.h" +#include "types.h" -QtUiApplication::QtUiApplication(int &argc, char **argv) -#ifdef HAVE_KDE4 - : KApplication() // KApplication is deprecated in KF5 -#else +QtUiApplication::QtUiApplication(int& argc, char** argv) : QApplication(argc, argv) -#endif { -#ifdef HAVE_KDE4 - Q_UNUSED(argc); Q_UNUSED(argv); - - // Setup KDE's data dirs - // Because we can't use KDE stuff in (the class) Quassel directly, we need to do this here... - QStringList dataDirs = KGlobal::dirs()->findDirs("data", ""); - - // Just in case, also check our install prefix - dataDirs << QCoreApplication::applicationDirPath() + "/../share/apps/"; - - // Normalize and append our application name - for (int i = 0; i < dataDirs.count(); i++) - dataDirs[i] = QDir::cleanPath(dataDirs.at(i)) + "/quassel/"; - - // Add resource path and just in case. - // Workdir should have precedence - dataDirs.prepend(QCoreApplication::applicationDirPath() + "/data/"); - dataDirs.append(":/data/"); - - // Append trailing '/' and check for existence - auto iter = dataDirs.begin(); - while (iter != dataDirs.end()) { - if (!iter->endsWith(QDir::separator()) && !iter->endsWith('/')) - iter->append(QDir::separator()); - if (!QFile::exists(*iter)) - iter = dataDirs.erase(iter); - else - ++iter; - } - - dataDirs.removeDuplicates(); - Quassel::setDataDirPaths(dataDirs); - -#else /* HAVE_KDE4 */ - - Quassel::setDataDirPaths(Quassel::findDataDirPaths()); - -#endif /* HAVE_KDE4 */ - -#if defined(HAVE_KDE4) || defined(Q_OS_MAC) - Quassel::disableCrashHandler(); -#endif /* HAVE_KDE4 || Q_OS_MAC */ - - Quassel::setRunMode(Quassel::ClientOnly); - -#if QT_VERSION >= 0x050000 - connect(this, &QGuiApplication::commitDataRequest, this, &QtUiApplication::commitData, Qt::DirectConnection); - connect(this, &QGuiApplication::saveStateRequest, this, &QtUiApplication::saveState, Qt::DirectConnection); -#endif - -#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) +#if QT_VERSION >= 0x050600 QGuiApplication::setFallbackSessionManagementEnabled(false); #endif +#if QT_VERSION >= 0x050700 + QGuiApplication::setDesktopFileName(Quassel::buildInfo().clientApplicationName); +#endif } - -bool QtUiApplication::init() +void QtUiApplication::init() { - if (Quassel::init()) { - // Settings upgrade/downgrade handling - if (!migrateSettings()) { - qCritical() << "Could not load or upgrade client settings, terminating!"; - return false; - } - - Client::init(new QtUi()); - - // Init UI only after the event loop has started - // TODO Qt5: Make this a lambda - QTimer::singleShot(0, this, SLOT(initUi())); + // Settings upgrade/downgrade handling + if (!migrateSettings()) { + throw ExitException{EXIT_FAILURE, tr("Could not load or upgrade client settings!")}; + } - Quassel::registerQuitHandler([]() { - QtUi::mainWindow()->quit(); - }); + _client = std::make_unique(std::make_unique()); - return true; - } - return false; -} + // Init UI only after the event loop has started + QTimer::singleShot(0, this, [this]() { + QtUi::instance()->init(); + connect(this, &QGuiApplication::commitDataRequest, this, &QtUiApplication::commitData, Qt::DirectConnection); + connect(this, &QGuiApplication::saveStateRequest, this, &QtUiApplication::saveState, Qt::DirectConnection); + // Needs to happen after UI init, so the MainWin quit handler is registered first + Quassel::registerQuitHandler(quitHandler()); -QtUiApplication::~QtUiApplication() -{ - Client::destroy(); - Quassel::destroy(); + resumeSessionIfPossible(); + }); } - -void QtUiApplication::initUi() +Quassel::QuitHandler QtUiApplication::quitHandler() { - QtUi::instance()->init(); - resumeSessionIfPossible(); + // Wait until the Client instance is destroyed before quitting the event loop + return [this]() { + qInfo() << "Client shutting down..."; + connect(_client.get(), &QObject::destroyed, QCoreApplication::instance(), &QCoreApplication::quit); + _client.release()->deleteLater(); + }; } - bool QtUiApplication::migrateSettings() { // -------- @@ -145,8 +81,7 @@ bool QtUiApplication::migrateSettings() QtUiSettings s; uint versionMajor = s.version(); if (versionMajor != 1) { - qCritical() << qPrintable(QString("Invalid client settings version '%1'") - .arg(versionMajor)); + qCritical() << qPrintable(QString("Invalid client settings version '%1'").arg(versionMajor)); return false; } @@ -163,10 +98,10 @@ bool QtUiApplication::migrateSettings() if (versionMinor == VERSION_MINOR_CURRENT) { // At latest version, no need to migrate defaults or other settings return true; - } else if (versionMinor == 0) { + } + else if (versionMinor == 0) { // New configuration, store as current version - qDebug() << qPrintable(QString("Set up new client settings v%1.%2") - .arg(versionMajor).arg(VERSION_MINOR_CURRENT)); + qDebug() << qPrintable(QString("Set up new client settings v%1.%2").arg(versionMajor).arg(VERSION_MINOR_CURRENT)); s.setVersionMinor(VERSION_MINOR_CURRENT); // Update the settings stylesheet for first setup. We don't know if older content exists, @@ -174,8 +109,9 @@ bool QtUiApplication::migrateSettings() QtUiStyle qtUiStyle; qtUiStyle.generateSettingsQss(); return true; - } else if (versionMinor < VERSION_MINOR_CURRENT) { - // We're upgrading - apply the neccessary upgrades from each interim version + } + else if (versionMinor < VERSION_MINOR_CURRENT) { + // We're upgrading - apply the necessary upgrades from each interim version // curVersion will never equal VERSION_MINOR_CURRENT, as it represents the version before // the most recent applySettingsMigration() call. for (uint curVersion = versionMinor; curVersion < VERSION_MINOR_CURRENT; curVersion++) { @@ -183,7 +119,9 @@ bool QtUiApplication::migrateSettings() // Something went wrong, time to bail out qCritical() << qPrintable(QString("Could not migrate client settings from v%1.%2 " "to v%1.%3") - .arg(versionMajor).arg(curVersion).arg(curVersion + 1)); + .arg(versionMajor) + .arg(curVersion) + .arg(curVersion + 1)); // Keep track of the last successful upgrade to avoid repeating it on next start s.setVersionMinor(curVersion); return false; @@ -192,22 +130,26 @@ bool QtUiApplication::migrateSettings() // Migration successful! qDebug() << qPrintable(QString("Successfully migrated client settings from v%1.%2 to " "v%1.%3") - .arg(versionMajor).arg(versionMinor).arg(VERSION_MINOR_CURRENT)); + .arg(versionMajor) + .arg(versionMinor) + .arg(VERSION_MINOR_CURRENT)); // Store the new minor version s.setVersionMinor(VERSION_MINOR_CURRENT); return true; - } else { + } + else { // versionMinor > VERSION_MINOR_CURRENT // The user downgraded to an older version of Quassel. Let's hope for the best. // Don't change the minorVersion as the newer version's upgrade logic has already run. qWarning() << qPrintable(QString("Client settings v%1.%2 is newer than latest known v%1.%3," " things might not work!") - .arg(versionMajor).arg(versionMinor).arg(VERSION_MINOR_CURRENT)); + .arg(versionMajor) + .arg(versionMinor) + .arg(VERSION_MINOR_CURRENT)); return true; } } - bool QtUiApplication::applySettingsMigration(QtUiSettings settings, const uint newVersion) { switch (newVersion) { @@ -221,8 +163,7 @@ bool QtUiApplication::applySettingsMigration(QtUiSettings settings, const uint n // saved. Exceptions will be noted below. // NOTE: If you add new upgrade logic here, you MUST ALSO increase VERSION_MINOR_CURRENT in // migrateSettings()! Otherwise, your upgrade logic won't ever be called. - case 9: - { + case 9: { // New default changes: show highest sender prefix mode, if available // -------- @@ -231,8 +172,7 @@ bool QtUiApplication::applySettingsMigration(QtUiSettings settings, const uint n const QString senderPrefixModeId = "SenderPrefixMode"; if (!chatViewSettings.valueExists(senderPrefixModeId)) { // New default is HighestMode, preserve previous behavior by setting to NoModes - chatViewSettings.setValue(senderPrefixModeId, - static_cast(UiStyle::SenderPrefixMode::NoModes)); + chatViewSettings.setValue(senderPrefixModeId, static_cast(UiStyle::SenderPrefixMode::NoModes)); } // -------- @@ -240,8 +180,7 @@ bool QtUiApplication::applySettingsMigration(QtUiSettings settings, const uint n return true; } - case 8: - { + case 8: { // New default changes: RegEx checkbox now toggles Channel regular expressions, too // // This only affects local highlights. Core-side highlights weren't released in stable when @@ -255,14 +194,12 @@ bool QtUiApplication::applySettingsMigration(QtUiSettings settings, const uint n // This might be more efficient with std::transform() or such. It /is/ only run once... auto highlightList = notificationSettings.highlightList(); bool changesMade = false; - for (int index = 0; index < highlightList.count(); ++index) - { + for (int index = 0; index < highlightList.count(); ++index) { // Load the highlight rule... auto highlightRule = highlightList[index].toMap(); // Check if "Channel" has anything set and RegEx is disabled - if (!highlightRule["Channel"].toString().isEmpty() - && highlightRule["RegEx"].toBool() == false) { + if (!highlightRule["Channel"].toString().isEmpty() && highlightRule["RegEx"].toBool() == false) { // We have a rule to convert // Mark as a regular expression, allowing the Channel filtering to work the same as @@ -271,8 +208,7 @@ bool QtUiApplication::applySettingsMigration(QtUiSettings settings, const uint n // Convert the main rule to regular expression, mirroring the conversion to wildcard // format from QtUiMessageProcessor::checkForHighlight() - highlightRule["Name"] = - "(^|\\W)" + QRegExp::escape(highlightRule["Name"].toString()) + "(\\W|$)"; + highlightRule["Name"] = "(^|\\W)" + QRegExp::escape(highlightRule["Name"].toString()) + "(\\W|$)"; // Save the rule back highlightList[index] = highlightRule; @@ -289,11 +225,10 @@ bool QtUiApplication::applySettingsMigration(QtUiSettings settings, const uint n // Migration complete! return true; } - case 7: - { + case 7: { // New default changes: UseProxy is no longer used in CoreAccountSettings CoreAccountSettings s; - for (auto &&accountId : s.knownAccounts()) { + for (auto&& accountId : s.knownAccounts()) { auto map = s.retrieveAccountData(accountId); if (!map.value("UseProxy", false).toBool()) { map["ProxyType"] = static_cast(QNetworkProxy::ProxyType::NoProxy); @@ -305,8 +240,7 @@ bool QtUiApplication::applySettingsMigration(QtUiSettings settings, const uint n // Migration complete! return true; } - case 6: - { + case 6: { // New default changes: sender colors switched around to Tango-ish theme // -------- @@ -314,23 +248,23 @@ bool QtUiApplication::applySettingsMigration(QtUiSettings settings, const uint n QtUiStyleSettings settingsUiStyleColors("Colors"); // Preserve the old default values for all variants const QColor oldDefaultSenderColorSelf = QColor(0, 0, 0); - const QList oldDefaultSenderColors = QList { - QColor(204, 13, 127), /// Sender00 - QColor(142, 85, 233), /// Sender01 - QColor(179, 14, 14), /// Sender02 - QColor( 23, 179, 57), /// Sender03 - QColor( 88, 175, 179), /// Sender04 - QColor(157, 84, 179), /// Sender05 + const QList oldDefaultSenderColors = QList{ + QColor(204, 13, 127), /// Sender00 + QColor(142, 85, 233), /// Sender01 + QColor(179, 14, 14), /// Sender02 + QColor(23, 179, 57), /// Sender03 + QColor(88, 175, 179), /// Sender04 + QColor(157, 84, 179), /// Sender05 QColor(179, 151, 117), /// Sender06 - QColor( 49, 118, 179), /// Sender07 - QColor(233, 13, 127), /// Sender08 - QColor(142, 85, 233), /// Sender09 - QColor(179, 14, 14), /// Sender10 - QColor( 23, 179, 57), /// Sender11 - QColor( 88, 175, 179), /// Sender12 - QColor(157, 84, 179), /// Sender13 + QColor(49, 118, 179), /// Sender07 + QColor(233, 13, 127), /// Sender08 + QColor(142, 85, 233), /// Sender09 + QColor(179, 14, 14), /// Sender10 + QColor(23, 179, 57), /// Sender11 + QColor(88, 175, 179), /// Sender12 + QColor(157, 84, 179), /// Sender13 QColor(179, 151, 117), /// Sender14 - QColor( 49, 118, 179), /// Sender15 + QColor(49, 118, 179), /// Sender15 }; if (!settingsUiStyleColors.valueExists("SenderSelf")) { // Preserve the old default sender color if none set @@ -340,7 +274,8 @@ bool QtUiApplication::applySettingsMigration(QtUiSettings settings, const uint n for (int i = 0; i < oldDefaultSenderColors.count(); i++) { // Get the sender color ID for each available color QString dez = QString::number(i); - if (dez.length() == 1) dez.prepend('0'); + if (dez.length() == 1) + dez.prepend('0'); senderColorId = QString("Sender" + dez); if (!settingsUiStyleColors.valueExists(senderColorId)) { // Preserve the old default sender color if none set @@ -356,8 +291,7 @@ bool QtUiApplication::applySettingsMigration(QtUiSettings settings, const uint n // Migration complete! return true; } - case 5: - { + case 5: { // New default changes: sender colors apply to nearly all messages with nicks // -------- @@ -377,8 +311,7 @@ bool QtUiApplication::applySettingsMigration(QtUiSettings settings, const uint n // Migration complete! return true; } - case 4: - { + case 4: { // New default changes: system locale used to generate a timestamp format string, deciding // 24-hour or 12-hour timestamp. @@ -394,8 +327,7 @@ bool QtUiApplication::applySettingsMigration(QtUiSettings settings, const uint n // Migration complete! return true; } - case 3: - { + case 3: { // New default changes: per-chat history and line wrapping enabled by default. // -------- @@ -417,8 +349,7 @@ bool QtUiApplication::applySettingsMigration(QtUiSettings settings, const uint n // Migration complete! return true; } - case 2: - { + case 2: { // New default changes: sender brackets disabled, sender colors and sender CTCP // colors enabled. @@ -466,24 +397,21 @@ bool QtUiApplication::applySettingsMigration(QtUiSettings settings, const uint n } } - -void QtUiApplication::commitData(QSessionManager &manager) +void QtUiApplication::commitData(QSessionManager& manager) { Q_UNUSED(manager) _aboutToQuit = true; } - -void QtUiApplication::saveState(QSessionManager &manager) +void QtUiApplication::saveState(QSessionManager& manager) { - //qDebug() << QString("saving session state to id %1").arg(manager.sessionId()); + // qDebug() << QString("saving session state to id %1").arg(manager.sessionId()); // AccountId activeCore = Client::currentCoreAccount().accountId(); // FIXME store this! SessionSettings s(manager.sessionId()); s.setSessionAge(0); QtUi::mainWindow()->saveStateToSettings(s); } - void QtUiApplication::resumeSessionIfPossible() { // load all sessions