#include "qtuiapplication.h"
#include <QIcon>
+#include <QDir>
#include <QStringList>
#ifdef HAVE_KDE4
QtUiApplication::QtUiApplication(int &argc, char **argv)
#ifdef HAVE_KDE4
- : KApplication(), // KApplication is deprecated in KF5
+ : KApplication() // KApplication is deprecated in KF5
#else
- : QApplication(argc, argv),
+ : QApplication(argc, argv)
#endif
- Quassel(),
- _aboutToQuit(false)
{
#ifdef HAVE_KDE4
Q_UNUSED(argc); Q_UNUSED(argv);
}
dataDirs.removeDuplicates();
- setDataDirPaths(dataDirs);
+ Quassel::setDataDirPaths(dataDirs);
#else /* HAVE_KDE4 */
- setDataDirPaths(findDataDirPaths());
+ Quassel::setDataDirPaths(Quassel::findDataDirPaths());
#endif /* HAVE_KDE4 */
#if defined(HAVE_KDE4) || defined(Q_OS_MAC)
- disableCrashhandler();
+ Quassel::disableCrashHandler();
#endif /* HAVE_KDE4 || Q_OS_MAC */
- setRunMode(Quassel::ClientOnly);
+
+ Quassel::setRunMode(Quassel::ClientOnly);
#if QT_VERSION < 0x050000
qInstallMsgHandler(Client::logMessage);
// 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();
+ 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();
+ });
+
+
return true;
}
return false;
}
-void QtUiApplication::quit()
+void QtUiApplication::initUi()
{
- QtUi::mainWindow()->quit();
+ QtUi::instance()->init();
+ resumeSessionIfPossible();
}
// --------
// Check minor settings version, handling upgrades/downgrades as needed
// Current minor version
- const uint VERSION_MINOR_CURRENT = 3;
+ //
+ // 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;
// Stored minor version
uint versionMinor = s.versionMinor();
// Each missed version will be called in sequence. E.g. to upgrade from '1' to '3', this
// function will be called with '2', then '3'.
// Use explicit scope via { ... } to avoid cross-initialization
+ //
+ // In most cases, the goal is to preserve the older default values for keys that haven't been
+ // 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 7:
+ {
+ // 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<int>(QNetworkProxy::ProxyType::NoProxy);
+ }
+ map.remove("UseProxy");
+ s.storeAccountData(accountId, map);
+ }
+
+ // Migration complete!
+ return true;
+ }
+ case 6:
+ {
+ // New default changes: sender colors switched around to Tango-ish theme
+
+ // --------
+ // QtUiStyle settings
+ QtUiStyleSettings settingsUiStyleColors("Colors");
+ // Preserve the old default values for all variants
+ const QColor oldDefaultSenderColorSelf = QColor(0, 0, 0);
+ const QList<QColor> oldDefaultSenderColors = QList<QColor> {
+ 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(179, 151, 117), /// Sender14
+ QColor( 49, 118, 179), /// Sender15
+ };
+ if (!settingsUiStyleColors.valueExists("SenderSelf")) {
+ // Preserve the old default sender color if none set
+ settingsUiStyleColors.setValue("SenderSelf", oldDefaultSenderColorSelf);
+ }
+ QString senderColorId;
+ 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');
+ senderColorId = QString("Sender" + dez);
+ if (!settingsUiStyleColors.valueExists(senderColorId)) {
+ // Preserve the old default sender color if none set
+ settingsUiStyleColors.setValue(senderColorId, oldDefaultSenderColors[i]);
+ }
+ }
+
+ // Update the settings stylesheet with old defaults
+ QtUiStyle qtUiStyle;
+ qtUiStyle.generateSettingsQss();
+ // --------
+
+ // Migration complete!
+ return true;
+ }
+ case 5:
+ {
+ // New default changes: sender colors apply to nearly all messages with nicks
+
+ // --------
+ // QtUiStyle settings
+ QtUiStyleSettings settingsUiStyleColors("Colors");
+ const QString useNickGeneralColorsId = "UseNickGeneralColors";
+ if (!settingsUiStyleColors.valueExists(useNickGeneralColorsId)) {
+ // New default is true, preserve previous behavior by setting to false
+ settingsUiStyleColors.setValue(useNickGeneralColorsId, false);
+ }
+
+ // Update the settings stylesheet with old defaults
+ QtUiStyle qtUiStyle;
+ qtUiStyle.generateSettingsQss();
+ // --------
+
+ // Migration complete!
+ return true;
+ }
+ case 4:
+ {
+ // New default changes: system locale used to generate a timestamp format string, deciding
+ // 24-hour or 12-hour timestamp.
+
+ // --------
+ // ChatView settings
+ const QString useCustomTimestampFormatId = "ChatView/__default__/UseCustomTimestampFormat";
+ if (!settings.valueExists(useCustomTimestampFormatId)) {
+ // New default value is false, preserve previous behavior by setting to true
+ settings.setValue(useCustomTimestampFormatId, true);
+ }
+ // --------
+
+ // Migration complete!
+ return true;
+ }
case 3:
{
- // New default changes: per-chat history and line wrapping enabled by default. Preserve
- // the older default values for keys that haven't been saved.
+ // New default changes: per-chat history and line wrapping enabled by default.
// --------
// InputWidget settings
case 2:
{
// New default changes: sender <nick> brackets disabled, sender colors and sender CTCP
- // colors enabled. Preserve the older default values for keys that haven't been saved.
+ // colors enabled.
// --------
// ChatView settings
projects / quassel.git / blobdiff