New default sender colors!

[quassel.git] / src / qtui / qtuiapplication.cpp

diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp
index 50c3c71..2b6b58c 100644 (file)
--- a/src/qtui/qtuiapplication.cpp
+++ b/src/qtui/qtuiapplication.cpp
@@ -166,8 +166,8 @@ bool QtUiApplication::init()
         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 Oxygen theme though
-            QIcon::setThemeName("oxygen");
+            // 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();
@@ -210,7 +210,7 @@ bool QtUiApplication::migrateSettings()
     // --------
     // Check minor settings version, handling upgrades/downgrades as needed
     // Current minor version
-    const uint VERSION_MINOR_CURRENT = 2;
+    const uint VERSION_MINOR_CURRENT = 6;
     // Stored minor version
     uint versionMinor = s.versionMinor();
 
@@ -269,12 +269,126 @@ bool QtUiApplication::applySettingsMigration(QtUiSettings settings, const uint n
     // oldest version.  Ignore those, start from 2 and higher.
     // 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'.
-    case 2:
+    // 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.
+    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:
     {
-        // Use explicit scope via { ... } to avoid cross-initialization
+        // 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.
+
+        // --------
+        // InputWidget settings
+        UiSettings settingsInputWidget("InputWidget");
+        const QString enableInputPerChatId = "EnablePerChatHistory";
+        if (!settingsInputWidget.valueExists(enableInputPerChatId)) {
+            // New default value is true, preserve previous behavior by setting to false
+            settingsInputWidget.setValue(enableInputPerChatId, false);
+        }
+
+        const QString enableInputLinewrap = "EnableLineWrap";
+        if (!settingsInputWidget.valueExists(enableInputLinewrap)) {
+            // New default value is true, preserve previous behavior by setting to false
+            settingsInputWidget.setValue(enableInputLinewrap, false);
+        }
+        // --------
+
+        // Migration complete!
+        return true;
+    }
+    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