removed functions from SettingsManager that shouldn't be there

2018-06-28 19:38:57 +02:00
parent b667183ca5
commit 5604ae6a67
75 changed files with 600 additions and 507 deletions
@@ -59,6 +59,66 @@ void WindowManager::showAccountSelectPopup(QPoint point)
 WindowManager::WindowManager()
 {
    qDebug() << "init WindowManager";
+
+    auto settings = getSettings();
+
+    this->wordFlagsListener.addSetting(settings->showTimestamps);
+    this->wordFlagsListener.addSetting(settings->showBadges);
+    this->wordFlagsListener.addSetting(settings->enableBttvEmotes);
+    this->wordFlagsListener.addSetting(settings->enableEmojis);
+    this->wordFlagsListener.addSetting(settings->enableFfzEmotes);
+    this->wordFlagsListener.addSetting(settings->enableTwitchEmotes);
+    this->wordFlagsListener.cb = [this](auto) {
+        this->updateWordTypeMask();  //
+    };
+}
+
+MessageElement::Flags WindowManager::getWordFlags()
+{
+    return this->wordFlags;
+}
+
+void WindowManager::updateWordTypeMask()
+{
+    using MEF = MessageElement::Flags;
+    auto settings = getSettings();
+
+    // text
+    auto flags = MEF::Text | MEF::Text;
+
+    // timestamp
+    if (settings->showTimestamps) {
+        flags |= MEF::Timestamp;
+    }
+
+    // emotes
+    flags |= settings->enableTwitchEmotes ? MEF::TwitchEmoteImage : MEF::TwitchEmoteText;
+    flags |= settings->enableFfzEmotes ? MEF::FfzEmoteImage : MEF::FfzEmoteText;
+    flags |= settings->enableBttvEmotes ? MEF::BttvEmoteImage : MEF::BttvEmoteText;
+    flags |= settings->enableEmojis ? MEF::EmojiImage : MEF::EmojiText;
+
+    // bits
+    flags |= MEF::BitsAmount;
+    flags |= settings->enableGifAnimations ? MEF::BitsAnimated : MEF::BitsStatic;
+
+    // badges
+    flags |= settings->showBadges ? MEF::Badges : MEF::None;
+
+    // username
+    flags |= MEF::Username;
+
+    // misc
+    flags |= MEF::AlwaysShow;
+    flags |= MEF::Collapsed;
+
+    // update flags
+    MessageElement::Flags newFlags = static_cast<MessageElement::Flags>(flags);
+
+    if (newFlags != this->wordFlags) {
+        this->wordFlags = newFlags;
+
+        this->wordFlagsChanged.invoke();
+    }
 }

 void WindowManager::layoutChannelViews(Channel *channel)