X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtuiapplication.cpp;h=7ae97df551967c7d127ab0b4d4461b074d382641;hp=05ffeed9a08bbf8525e45482b8525b5416d37adb;hb=158443f71d48215eea8b47b836b61afd77654b78;hpb=47b17acc38f3f650098b8bfbad1e13798a73e8d9 diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp index 05ffeed9..7ae97df5 100644 --- a/src/qtui/qtuiapplication.cpp +++ b/src/qtui/qtuiapplication.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2016 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 * @@ -20,178 +20,63 @@ #include "qtuiapplication.h" -#include #include +#include #include -#ifdef HAVE_KDE4 -# include -#endif - -#include "client.h" -#include "cliparser.h" +#include "chatviewsettings.h" +#include "logmessage.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 - : QApplication(argc, argv), -#endif - Quassel(), - _aboutToQuit(false) + : QApplication(argc, argv) { -#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(); - setDataDirPaths(dataDirs); - -#else /* HAVE_KDE4 */ - - setDataDirPaths(findDataDirPaths()); - -#endif /* HAVE_KDE4 */ - -#if defined(HAVE_KDE4) || defined(Q_OS_MAC) - disableCrashhandler(); -#endif /* HAVE_KDE4 || Q_OS_MAC */ - setRunMode(Quassel::ClientOnly); - -#if QT_VERSION < 0x050000 - qInstallMsgHandler(Client::logMessage); -#else - qInstallMessageHandler(Client::logMessage); 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 } -bool QtUiApplication::init() +void QtUiApplication::init() { - if (Quassel::init()) { - // FIXME: MIGRATION 0.3 -> 0.4: Move database and core config to new location - // Move settings, note this does not delete the old files -#ifdef Q_OS_MAC - QSettings newSettings("quassel-irc.org", "quasselclient"); -#else - -# ifdef Q_OS_WIN - QSettings::Format format = QSettings::IniFormat; -# else - QSettings::Format format = QSettings::NativeFormat; -# endif - - QString newFilePath = Quassel::configDirPath() + "quasselclient" - + ((format == QSettings::NativeFormat) ? QLatin1String(".conf") : QLatin1String(".ini")); - QSettings newSettings(newFilePath, format); -#endif /* Q_OS_MAC */ - - if (newSettings.value("Config/Version").toUInt() == 0) { -# ifdef Q_OS_MAC - QString org = "quassel-irc.org"; -# else - QString org = "Quassel Project"; -# endif - QSettings oldSettings(org, "Quassel Client"); - if (oldSettings.allKeys().count()) { - qWarning() << "\n\n*** IMPORTANT: Config and data file locations have changed. Attempting to auto-migrate your client settings..."; - foreach(QString key, oldSettings.allKeys()) - newSettings.setValue(key, oldSettings.value(key)); - newSettings.setValue("Config/Version", 1); - qWarning() << "* Your client settings have been migrated to" << newSettings.fileName(); - qWarning() << "*** Migration completed.\n\n"; - } - } - - // MIGRATION end - - // Settings upgrade/downgrade handling - if (!migrateSettings()) { - qCritical() << "Could not load or upgrade client settings, terminating!"; - return false; - } + // Settings upgrade/downgrade handling + if (!migrateSettings()) { + throw ExitException{EXIT_FAILURE, tr("Could not load or upgrade client settings!")}; + } - // Checking if settings Icon Theme is valid - QString savedIcontheme = QtUiSettings().value("IconTheme", QVariant("")).toString(); -#ifndef WITH_OXYGEN - if (savedIcontheme == "oxygen") - QtUiSettings().remove("IconTheme"); -#endif -#ifndef WITH_BREEZE - if (savedIcontheme == "breeze") - QtUiSettings().remove("IconTheme"); -#endif -#ifndef WITH_BREEZE_DARK - if (savedIcontheme == "breezedark") - QtUiSettings().remove("IconTheme"); -#endif + _client.reset(new Client(std::unique_ptr(new QtUi()))); // TODO C++14: std::make_unique - // Set the icon theme - if (Quassel::isOptionSet("icontheme")) - QIcon::setThemeName(Quassel::optionValue("icontheme")); - else if (QtUiSettings().value("IconTheme", QVariant("")).toString() != "") - QIcon::setThemeName(QtUiSettings().value("IconTheme").toString()); - else if (QIcon::themeName().isEmpty()) - // Some platforms don't set a default icon theme; chances are we can find our bundled theme though - QIcon::setThemeName("breeze"); - - // session resume - QtUi *gui = new QtUi(); - Client::init(gui); - // init gui only after the event loop has started - // QTimer::singleShot(0, gui, SLOT(init())); - gui->init(); - resumeSessionIfPossible(); - return true; - } - return false; + // Init UI only after the event loop has started + // TODO Qt5: Make this a lambda + QTimer::singleShot(0, this, SLOT(initUi())); } -QtUiApplication::~QtUiApplication() +void QtUiApplication::initUi() { - Client::destroy(); + QtUi::instance()->init(); + + // Needs to happen after UI init, so the MainWin quit handler is registered first + Quassel::registerQuitHandler(quitHandler()); + + resumeSessionIfPossible(); } -void QtUiApplication::quit() +Quassel::QuitHandler QtUiApplication::quitHandler() { - QtUi::mainWindow()->quit(); + // Wait until the Client instance is destroyed before quitting the event loop + return [this]() { + quInfo() << "Client shutting down..."; + connect(_client.get(), SIGNAL(destroyed()), QCoreApplication::instance(), SLOT(quit())); + _client.release()->deleteLater(); + }; } @@ -214,7 +99,7 @@ bool QtUiApplication::migrateSettings() // // NOTE: If you increase the minor version, you MUST ALSO add new version upgrade logic in // applySettingsMigration()! Otherwise, settings upgrades will fail. - const uint VERSION_MINOR_CURRENT = 7; + const uint VERSION_MINOR_CURRENT = 9; // Stored minor version uint versionMinor = s.versionMinor(); @@ -279,14 +164,87 @@ 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: + { + // New default changes: show highest sender prefix mode, if available + + // -------- + // ChatView settings + ChatViewSettings chatViewSettings; + 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)); + } + // -------- + + // Migration complete! + return true; + } + + 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 + // this change was made, so no need to migrate those. + + // -------- + // NotificationSettings + NotificationSettings notificationSettings; + + // Check each highlight rule for a "Channel" field. If one exists, convert to RegEx mode. + // 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) + { + // 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) { + // We have a rule to convert + + // Mark as a regular expression, allowing the Channel filtering to work the same as + // before the upgrade + highlightRule["RegEx"] = true; + + // 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|$)"; + + // Save the rule back + highlightList[index] = highlightRule; + changesMade = true; + } + } + + // Save the modified rules if any changes were made + if (changesMade) { + notificationSettings.setHighlightList(highlightList); + } + // -------- + + // Migration complete! + return true; + } case 7: { - // New default changes: ProxyType=3 (no proxy) now means QNetworkProxy::HttpProxy - // So we have to change it to ProxyType=2 (QNetworkProxy::NoProxy) - const QString proxyType = "ProxyType"; - if (settings.valueExists(proxyType) && settings.value(proxyType)=="3") { - settings.setValue(proxyType, 2); + // New default changes: UseProxy is no longer used in CoreAccountSettings + CoreAccountSettings s; + for (auto &&accountId : s.knownAccounts()) { + auto map = s.retrieveAccountData(accountId); + if (!map.value("UseProxy", false).toBool()) { + map["ProxyType"] = static_cast(QNetworkProxy::ProxyType::NoProxy); + } + map.remove("UseProxy"); + s.storeAccountData(accountId, map); } + // Migration complete! return true; }