X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fqtuiapplication.cpp;h=fc04f59be7839161869265b7d0f5aa80673cacdd;hb=c55df5f2d765b100b7a1ead5a72202f969aa9581;hp=568cbc11e4c1645dc41f2d02ededc6a452e5e40d;hpb=ed7cd841afa09766477e3bd03ff1700321d2540c;p=quassel.git diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp index 568cbc11..fc04f59b 100644 --- a/src/qtui/qtuiapplication.cpp +++ b/src/qtui/qtuiapplication.cpp @@ -20,19 +20,21 @@ #include "qtuiapplication.h" -#include #include +#include #include #ifdef HAVE_KDE4 # include #endif -#include "client.h" +#include "chatviewsettings.h" #include "cliparser.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 @@ -80,16 +82,9 @@ QtUiApplication::QtUiApplication(int &argc, char **argv) #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 - qInstallMsgHandler(Client::logMessage); -#else - qInstallMessageHandler(Client::logMessage); +#if QT_VERSION >= 0x050000 connect(this, &QGuiApplication::commitDataRequest, this, &QtUiApplication::commitData, Qt::DirectConnection); connect(this, &QGuiApplication::saveStateRequest, this, &QtUiApplication::saveState, Qt::DirectConnection); #endif @@ -100,106 +95,47 @@ QtUiApplication::QtUiApplication(int &argc, char **argv) } -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; - } - - // 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 - - // 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"); - - 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())); - - Quassel::registerQuitHandler([]() { - QtUi::mainWindow()->quit(); - }); - + if (!Quassel::init()) { + throw ExitException{EXIT_FAILURE, tr("Could not initialize Quassel!")}; + } - return true; + // Settings upgrade/downgrade handling + if (!migrateSettings()) { + throw ExitException{EXIT_FAILURE, tr("Could not load or upgrade client settings!")}; } - return false; -} + _client.reset(new Client(std::unique_ptr(new QtUi()))); // TODO C++14: std::make_unique -QtUiApplication::~QtUiApplication() -{ - Client::destroy(); - Quassel::destroy(); + // Init UI only after the event loop has started + // TODO Qt5: Make this a lambda + QTimer::singleShot(0, this, SLOT(initUi())); } void QtUiApplication::initUi() { QtUi::instance()->init(); + + // Needs to happen after UI init, so the MainWin quit handler is registered first + Quassel::registerQuitHandler(quitHandler()); + resumeSessionIfPossible(); } +Quassel::QuitHandler QtUiApplication::quitHandler() +{ + // 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(); + }; +} + + bool QtUiApplication::migrateSettings() { // -------- @@ -219,7 +155,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 = 8; + const uint VERSION_MINOR_CURRENT = 9; // Stored minor version uint versionMinor = s.versionMinor(); @@ -284,6 +220,25 @@ 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 @@ -331,6 +286,7 @@ bool QtUiApplication::applySettingsMigration(QtUiSettings settings, const uint n // -------- // Migration complete! + return true; } case 7: {