Setting for disabling /mentions tab highlight (#1994)

Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
This commit is contained in:
apa420 2021-01-16 14:27:19 +01:00 committed by GitHub
parent b587173e18
commit f19cc60a5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 1 deletions

View file

@ -29,6 +29,7 @@
- Minor: Deprecate loading of "v1" window layouts. If you haven't updated Chatterino in more than 2 years, there's a chance you will lose your window layout. - Minor: Deprecate loading of "v1" window layouts. If you haven't updated Chatterino in more than 2 years, there's a chance you will lose your window layout.
- Minor: User popup will now automatically display messages as they are received - Minor: User popup will now automatically display messages as they are received
- Minor: Changed the English in two rate-limited system messages (#1878) - Minor: Changed the English in two rate-limited system messages (#1878)
- Minor: Added a setting to disable messages sent to /mentions split from making the tab highlight with the red marker (#1994)
- Minor: Added image for streamer mode in the user popup icon. - Minor: Added image for streamer mode in the user popup icon.
- Minor: Added vip and unvip buttons. - Minor: Added vip and unvip buttons.
- Minor: Added settings for displaying where the last message was. - Minor: Added settings for displaying where the last message was.

View file

@ -264,6 +264,8 @@ public:
BoolSetting longAlerts = {"/highlighting/alerts", false}; BoolSetting longAlerts = {"/highlighting/alerts", false};
BoolSetting highlightMentions = {"/highlighting/mentions", true};
/// Filtering /// Filtering
BoolSetting excludeUserMessagesFromFilter = { BoolSetting excludeUserMessagesFromFilter = {
"/filtering/excludeUserMessages", false}; "/filtering/excludeUserMessages", false};

View file

@ -805,7 +805,10 @@ void ChannelView::messageAppended(MessagePtr &message,
{ {
if (messageFlags->has(MessageFlag::Highlighted) && if (messageFlags->has(MessageFlag::Highlighted) &&
messageFlags->has(MessageFlag::ShowInMentions) && messageFlags->has(MessageFlag::ShowInMentions) &&
!messageFlags->has(MessageFlag::Subscription)) !messageFlags->has(MessageFlag::Subscription) &&
(getSettings()->highlightMentions ||
this->channel_->getType() != Channel::Type::TwitchMentions))
{ {
this->tabHighlightRequested.invoke(HighlightState::Highlighted); this->tabHighlightRequested.invoke(HighlightState::Highlighted);
} }

View file

@ -625,6 +625,8 @@ void GeneralPage::initLayout(GeneralPageView &layout)
layout.addCheckbox("Combine multiple bit tips into one", s.stackBits); layout.addCheckbox("Combine multiple bit tips into one", s.stackBits);
layout.addCheckbox("Ask for confirmation when uploading an image", layout.addCheckbox("Ask for confirmation when uploading an image",
s.askOnImageUpload); s.askOnImageUpload);
layout.addCheckbox("Messages in /mentions highlights tab",
s.highlightMentions);
layout.addStretch(); layout.addStretch();

View file

@ -425,6 +425,23 @@ std::unique_ptr<QMenu> SplitHeader::createMainMenu()
this->split_->setModerationMode(!this->split_->getModerationMode()); this->split_->setModerationMode(!this->split_->getModerationMode());
}); });
if (this->split_->getChannel()->getType() == Channel::Type::TwitchMentions)
{
auto action = new QAction(this);
action->setText("Enable /mention tab highlights");
action->setCheckable(true);
QObject::connect(moreMenu, &QMenu::aboutToShow, this, [action, this]() {
action->setChecked(getSettings()->highlightMentions);
});
action->connect(action, &QAction::triggered, this, [this]() {
getSettings()->highlightMentions =
!getSettings()->highlightMentions;
});
moreMenu->addAction(action);
}
if (dynamic_cast<TwitchChannel *>(this->split_->getChannel().get())) if (dynamic_cast<TwitchChannel *>(this->split_->getChannel().get()))
{ {
moreMenu->addAction("Show viewer list", this->split_, moreMenu->addAction("Show viewer list", this->split_,