noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Added functionality of making the flash taskbar last until the app is focused again (#767)

Browse source 
* Added functionality of making the flash taskbar last until chatterino is focused again

* added it for every flash taskbar

Fixes #760
This commit is contained in:
apa420 2018-10-06 17:51:13 +02:00 committed by pajlada
parent 98c1d61e78
commit 5dce212cb4
5 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/controllers/notifications/NotificationController.cpp
View file

@ -180,8 +180,13 @@ void NotificationController::getFakeTwitchChannelLiveStatus(
getApp()->notifications->playSound();
}
if (getSettings()->notificationFlashTaskbar) {
QApplication::alert(
getApp()->windows->getMainWindow().window(), 2500);
if (getSettings()->longAlerts) {
QApplication::alert(
getApp()->windows->getMainWindow().window(), 0);
} else {
QApplication::alert(
getApp()->windows->getMainWindow().window(), 2500);
}
}
}
return Success;

10
src/providers/twitch/TwitchChannel.cpp
View file

@ -408,8 +408,14 @@ void TwitchChannel::setLive(bool newLiveStatus)
getApp()->notifications->playSound();
}
if (getSettings()->notificationFlashTaskbar) {
QApplication::alert(
getApp()->windows->getMainWindow().window(), 2500);
if (getSettings()->longAlerts) {
QApplication::alert(
getApp()->windows->getMainWindow().window(), 0);
} else {
QApplication::alert(
getApp()->windows->getMainWindow().window(),
2500);
}
}
}
auto live = makeSystemMessage(this->getName() + " is live");

9
src/providers/twitch/TwitchMessageBuilder.cpp
View file

@ -788,8 +788,13 @@ void TwitchMessageBuilder::parseHighlights(bool isPastMsg)
}
if (doAlert) {
QApplication::alert(getApp()->windows->getMainWindow().window(),
2500);
if (getSettings()->longAlerts) {
QApplication::alert(
getApp()->windows->getMainWindow().window(), 0);
} else {
QApplication::alert(
getApp()->windows->getMainWindow().window(), 2500);
}
}
}
}

5
src/singletons/Settings.hpp
View file

@ -117,7 +117,8 @@ public:
BoolSetting enableLowercaseLink = {"/links/linkLowercase", true};
/// Ignored phrases
QStringSetting ignoredPhraseReplace = {"/ignore/ignoredPhraseReplace", "***"};
QStringSetting ignoredPhraseReplace = {"/ignore/ignoredPhraseReplace",
"***"};
/// Ingored Users
BoolSetting enableTwitchIgnoredUsers = {"/ignore/enableTwitchIgnoredUsers",
@ -143,6 +144,8 @@ public:
"/highlighting/whisperHighlight/enableTaskbarFlashing", false};
QStringSetting highlightColor = {"/highlighting/color", "#4B282C"};
BoolSetting longAlerts = {"/highlighting/alerts", false};
/// Logging
BoolSetting enableLogging = {"/logging/enabled", false};

3
src/widgets/settingspages/HighlightingPage.cpp
View file

@ -149,6 +149,9 @@ HighlightingPage::HighlightingPage()
layout.append(createCheckBox(ALWAYS_PLAY,
getSettings()->highlightAlwaysPlaySound));
layout.append(createCheckBox(
"Flash taskbar only stops highlighting when chatterino is focused",
getSettings()->longAlerts));
}
// ---- misc