updated settingsdialog

settings/settings.cpp

@@ -6,44 +6,85 @@
 namespace chatterino {
 namespace settings {
 
-StringSetting Settings::theme("", "dark");
-StringSetting Settings::user("", "");
-FloatSetting Settings::emoteScale("", 1.0);
-BoolSetting Settings::scaleEmotesByLineHeight("", false);
-BoolSetting Settings::showTimestamps("", true);
-BoolSetting Settings::showTimestampSeconds("", false);
-BoolSetting Settings::allowDouplicateMessages("", true);
-BoolSetting Settings::linksDoubleClickOnly("", false);
-BoolSetting Settings::hideEmptyInput("", false);
-BoolSetting Settings::showMessageLength("", false);
-BoolSetting Settings::seperateMessages("", false);
-BoolSetting Settings::mentionUsersWithAt("", false);
-BoolSetting Settings::allowCommandsAtEnd("", false);
-BoolSetting Settings::enableHighlights("", true);
-BoolSetting Settings::enableHighlightSound("", true);
-BoolSetting Settings::enableHighlightTaskbar("", true);
-BoolSetting Settings::customHighlightSound("", false);
-BoolSetting Settings::enableTwitchEmotes("", true);
-BoolSetting Settings::enableBttvEmotes("", true);
-BoolSetting Settings::enableFFzEmotes("", true);
-BoolSetting Settings::enableEmojis("", true);
-BoolSetting Settings::enableGifAnimations("", true);
-BoolSetting Settings::enableGifs("", true);
-BoolSetting Settings::inlineWhispers("", true);
-BoolSetting Settings::windowTopMost("", true);
-BoolSetting Settings::hideTabX("", false);
+Settings Settings::_;
 
-QSettings Settings::settings(
-    QStandardPaths::writableLocation(QStandardPaths::AppDataLocation),
-    QSettings::IniFormat);
+Settings::Settings()
+    : settings(
+          QStandardPaths::writableLocation(QStandardPaths::AppDataLocation),
+          QSettings::IniFormat)
+    , settingsItems()
+    , portable(false)
+    , wordTypeMask(messages::Word::Default)
+    , theme("", "dark")
+    , user("", "")
+    , emoteScale("", 1.0)
+    , scaleEmotesByLineHeight("", false)
+    , showTimestamps("", true)
+    , showTimestampSeconds("", false)
+    , showLastMessageIndicator("", false)
+    , allowDouplicateMessages("", true)
+    , linksDoubleClickOnly("", false)
+    , hideEmptyInput("", false)
+    , showMessageLength("", false)
+    , seperateMessages("", false)
+    , mentionUsersWithAt("", false)
+    , allowCommandsAtEnd("", false)
+    , enableHighlights("", true)
+    , enableHighlightSound("", true)
+    , enableHighlightTaskbar("", true)
+    , customHighlightSound("", false)
+    , enableTwitchEmotes("", true)
+    , enableBttvEmotes("", true)
+    , enableFfzEmotes("", true)
+    , enableEmojis("", true)
+    , enableGifAnimations("", true)
+    , enableGifs("", true)
+    , inlineWhispers("", true)
+    , windowTopMost("", true)
+    , hideTabX("", false)
+{
+    settingsItems.reserve(25);
+    settingsItems.push_back(&theme);
+    settingsItems.push_back(&user);
+    settingsItems.push_back(&emoteScale);
+    settingsItems.push_back(&scaleEmotesByLineHeight);
+    settingsItems.push_back(&showTimestamps);
+    settingsItems.push_back(&showTimestampSeconds);
+    settingsItems.push_back(&showLastMessageIndicator);
+    settingsItems.push_back(&allowDouplicateMessages);
+    settingsItems.push_back(&linksDoubleClickOnly);
+    settingsItems.push_back(&hideEmptyInput);
+    settingsItems.push_back(&showMessageLength);
+    settingsItems.push_back(&seperateMessages);
+    settingsItems.push_back(&mentionUsersWithAt);
+    settingsItems.push_back(&allowCommandsAtEnd);
+    settingsItems.push_back(&enableHighlights);
+    settingsItems.push_back(&enableHighlightSound);
+    settingsItems.push_back(&enableHighlightTaskbar);
+    settingsItems.push_back(&customHighlightSound);
+    settingsItems.push_back(&enableTwitchEmotes);
+    settingsItems.push_back(&enableBttvEmotes);
+    settingsItems.push_back(&enableFfzEmotes);
+    settingsItems.push_back(&enableEmojis);
+    settingsItems.push_back(&enableGifAnimations);
+    settingsItems.push_back(&enableGifs);
+    settingsItems.push_back(&inlineWhispers);
+    settingsItems.push_back(&windowTopMost);
+    settingsItems.push_back(&hideTabX);
 
-std::vector<Setting *> Settings::settingsItems;
-
-bool Settings::portable(false);
-
-messages::Word::Type Settings::wordTypeMask = messages::Word::Default;
-
-int Settings::_ = Settings::_init();
+    QObject::connect(&showTimestamps, &BoolSetting::valueChanged, this,
+                     &Settings::updateWordTypeMask);
+    QObject::connect(&showTimestampSeconds, &BoolSetting::valueChanged, this,
+                     &Settings::updateWordTypeMask);
+    QObject::connect(&enableBttvEmotes, &BoolSetting::valueChanged, this,
+                     &Settings::updateWordTypeMask);
+    QObject::connect(&enableEmojis, &BoolSetting::valueChanged, this,
+                     &Settings::updateWordTypeMask);
+    QObject::connect(&enableFfzEmotes, &BoolSetting::valueChanged, this,
+                     &Settings::updateWordTypeMask);
+    QObject::connect(&enableTwitchEmotes, &BoolSetting::valueChanged, this,
+                     &Settings::updateWordTypeMask);
+}
 
 void
 Settings::save()
@@ -62,9 +103,45 @@ Settings::load()
 }
 
 bool
-Settings::isIgnoredEmote(const QString &emote)
+Settings::isIgnoredEmote(const QString &)
 {
     return false;
 }
+
+void
+Settings::updateWordTypeMask(bool)
+
+{
+    using namespace messages;
+
+    uint32_t mask = Word::Text;
+
+    if (showTimestamps.get()) {
+        mask |= showTimestampSeconds.get() ? Word::TimestampWithSeconds
+                                           : Word::TimestampNoSeconds;
+    }
+
+    mask |= enableTwitchEmotes.get() ? Word::TwitchEmoteImage
+                                     : Word::TwitchEmoteText;
+    mask |= enableFfzEmotes.get() ? Word::FfzEmoteImage : Word::FfzEmoteText;
+    mask |= enableBttvEmotes.get() ? Word::BttvEmoteImage : Word::BttvEmoteText;
+    mask |= (enableBttvEmotes.get() && enableGifs.get()) ? Word::BttvEmoteImage
+                                                         : Word::BttvEmoteText;
+    mask |= enableEmojis.get() ? Word::EmojiImage : Word::EmojiText;
+
+    mask |= Word::BitsAmount;
+    mask |= enableGifs.get() ? Word::BitsAnimated : Word::BitsStatic;
+
+    mask |= Word::Badges;
+    mask |= Word::Username;
+
+    Word::Type _mask = (Word::Type)mask;
+
+    //    if (mask != _mask) {
+    wordTypeMask = _mask;
+
+    emit wordTypeMaskChanged();
+    //    }
+}
 }
 }