diff --git a/src/controllers/highlights/HighlightModel.cpp b/src/controllers/highlights/HighlightModel.cpp index e1b6e410b..58d6c76dc 100644 --- a/src/controllers/highlights/HighlightModel.cpp +++ b/src/controllers/highlights/HighlightModel.cpp @@ -120,14 +120,16 @@ void HighlightModel::afterInit() std::vector redeemedRow = this->createRow(); setBoolItem(redeemedRow[Column::Pattern], getSettings()->enableRedeemedHighlight.getValue(), true, false); - redeemedRow[Column::Pattern]->setData("Highlights redeemed with Bits", - Qt::DisplayRole); - setBoolItem(redeemedRow[Column::FlashTaskbar], - getSettings()->enableRedeemedHighlightTaskbar.getValue(), true, - false); - setBoolItem(redeemedRow[Column::PlaySound], - getSettings()->enableRedeemedHighlightSound.getValue(), true, - false); + redeemedRow[Column::Pattern]->setData( + "Highlights redeemed with Twitch Bits", Qt::DisplayRole); + // setBoolItem(redeemedRow[Column::FlashTaskbar], + // getSettings()->enableRedeemedHighlightTaskbar.getValue(), true, + // false); + // setBoolItem(redeemedRow[Column::PlaySound], + // getSettings()->enableRedeemedHighlightSound.getValue(), true, + // false); + redeemedRow[Column::FlashTaskbar]->setFlags(0); + redeemedRow[Column::PlaySound]->setFlags(0); redeemedRow[Column::UseRegex]->setFlags(0); redeemedRow[Column::CaseSensitive]->setFlags(0); @@ -192,8 +194,8 @@ void HighlightModel::customRowSetData(const std::vector &row, } else if (rowIndex == 3) { - getSettings()->enableRedeemedHighlightTaskbar.setValue( - value.toBool()); + // getSettings()->enableRedeemedHighlightTaskbar.setValue( + // value.toBool()); } } } @@ -218,8 +220,8 @@ void HighlightModel::customRowSetData(const std::vector &row, } else if (rowIndex == 3) { - getSettings()->enableRedeemedHighlightSound.setValue( - value.toBool()); + // getSettings()->enableRedeemedHighlightSound.setValue( + // value.toBool()); } } } diff --git a/src/singletons/Settings.hpp b/src/singletons/Settings.hpp index 46f95075e..1d56e5787 100644 --- a/src/singletons/Settings.hpp +++ b/src/singletons/Settings.hpp @@ -207,10 +207,10 @@ public: BoolSetting enableRedeemedHighlight = { "/highlighting/redeemedHighlight/highlighted", true}; - BoolSetting enableRedeemedHighlightSound = { - "/highlighting/redeemedHighlight/enableSound", false}; - BoolSetting enableRedeemedHighlightTaskbar = { - "/highlighting/redeemedHighlight/enableTaskbarFlashing", false}; + // BoolSetting enableRedeemedHighlightSound = { + // "/highlighting/redeemedHighlight/enableSound", false}; + // BoolSetting enableRedeemedHighlightTaskbar = { + // "/highlighting/redeemedHighlight/enableTaskbarFlashing", false}; QStringSetting redeemedHighlightSoundUrl = { "/highlighting/redeemedHighlightSoundUrl", ""}; QStringSetting redeemedHighlightColor = { diff --git a/src/singletons/WindowManager.cpp b/src/singletons/WindowManager.cpp index 5c9f23cad..80a3ef45d 100644 --- a/src/singletons/WindowManager.cpp +++ b/src/singletons/WindowManager.cpp @@ -445,6 +445,8 @@ void WindowManager::initialize(Settings &settings, Paths &paths) [this](auto, auto) { this->forceLayoutChannelViews(); }); settings.collpseMessagesMinLines.connect( [this](auto, auto) { this->forceLayoutChannelViews(); }); + settings.enableRedeemedHighlight.connect( + [this](auto, auto) { this->forceLayoutChannelViews(); }); this->initialized_ = true; } diff --git a/src/widgets/settingspages/GeneralPage.cpp b/src/widgets/settingspages/GeneralPage.cpp index 7c4acf998..82c041b5f 100644 --- a/src/widgets/settingspages/GeneralPage.cpp +++ b/src/widgets/settingspages/GeneralPage.cpp @@ -359,6 +359,8 @@ void GeneralPage::initLayout(SettingsLayout &layout) // layout.addCheckbox("Mark last message you read"); // layout.addDropdown("Last read message style", {"Default"}); layout.addCheckbox("Show deleted messages", s.hideModerated, true); + layout.addCheckbox("Highlight messages redeemed with Twitch Bits", + s.enableRedeemedHighlight); layout.addDropdown( "Timestamps", {"Disable", "h:mm", "hh:mm", "h:mm a", "hh:mm a", "h:mm:ss", "hh:mm:ss",