chatterino2
Code Issues

Allow highlights to be excluded from /mentions (#2036)

Browse Source
This commit is contained in:
Leon Richardt
2020-10-24 14:33:15 +02:00
committed by GitHub
parent 0049a5ebb2
commit ec94869480
12 changed files with 99 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/helper/ChannelView.cpp
+1
View File
@@ -788,6 +788,7 @@ void ChannelView::messageAppended(MessagePtr &message,
if (!messageFlags->has(MessageFlag::DoNotTriggerNotification))
{
if (messageFlags->has(MessageFlag::Highlighted) &&
messageFlags->has(MessageFlag::ShowInMentions) &&
!messageFlags->has(MessageFlag::Subscription))
{
this->tabHighlightRequested.invoke(HighlightState::Highlighted);
src/widgets/settingspages/HighlightingPage.cpp
+6 -4
View File
@@ -55,7 +55,8 @@ HighlightingPage::HighlightingPage()
&getSettings()->highlightedMessages))
.getElement();
view->addRegexHelpLink();
view->setTitles({"Pattern", "Flash\ntaskbar", "Play\nsound",
view->setTitles({"Pattern", "Show in\nMentions",
"Flash\ntaskbar", "Play\nsound",
"Enable\nregex", "Case-\nsensitive",
"Custom\nsound", "Color"});
view->getTableView()->horizontalHeader()->setSectionResizeMode(
@@ -72,7 +73,7 @@ HighlightingPage::HighlightingPage()
view->addButtonPressed.connect([] {
getSettings()->highlightedMessages.append(HighlightPhrase{
"my phrase", true, false, false, false, "",
"my phrase", true, true, false, false, false, "",
*ColorProvider::instance().color(
ColorType::SelfHighlight)});
});
@@ -102,7 +103,8 @@ HighlightingPage::HighlightingPage()
// Case-sensitivity doesn't make sense for user names so it is
// set to "false" by default & the column is hidden
view->setTitles({"Username", "Flash\ntaskbar", "Play\nsound",
view->setTitles({"Username", "Show in\nMentions",
"Flash\ntaskbar", "Play\nsound",
"Enable\nregex", "Case-\nsensitive",
"Custom\nsound", "Color"});
view->getTableView()->horizontalHeader()->setSectionResizeMode(
@@ -119,7 +121,7 @@ HighlightingPage::HighlightingPage()
view->addButtonPressed.connect([] {
getSettings()->highlightedUsers.append(HighlightPhrase{
"highlighted user", true, false, false, false, "",
"highlighted user", true, true, false, false, false, "",
*ColorProvider::instance().color(
ColorType::SelfHighlight)});
});