mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-21 22:24:07 +01:00
Added Live Notification suppression to Streamer Mode (#2342)
This commit is contained in:
parent
78aae8e93f
commit
acbabd2664
6 changed files with 17 additions and 7 deletions
|
@ -3,7 +3,7 @@
|
||||||
## Unversioned
|
## Unversioned
|
||||||
|
|
||||||
- Major: Added "Channel Filters". See https://wiki.chatterino.com/Filters/ for how they work or how to configure them. (#1748, #2083, #2090, #2200)
|
- Major: Added "Channel Filters". See https://wiki.chatterino.com/Filters/ for how they work or how to configure them. (#1748, #2083, #2090, #2200)
|
||||||
- Major: Added Streamer Mode configuration (under `Settings -> General`), where you can select which features of Chatterino should behave differently when you are in Streamer Mode. (#2001, #2316)
|
- Major: Added Streamer Mode configuration (under `Settings -> General`), where you can select which features of Chatterino should behave differently when you are in Streamer Mode. (#2001, #2316, #2342)
|
||||||
- Major: Color mentions to match the mentioned users. You can disable this by unchecking "Color @usernames" under `Settings -> General -> Advanced (misc.)`. (#1963, #2284)
|
- Major: Color mentions to match the mentioned users. You can disable this by unchecking "Color @usernames" under `Settings -> General -> Advanced (misc.)`. (#1963, #2284)
|
||||||
- Minor: Added a button to the split context menu to open the moderation view for a channel when the account selected has moderator permissions. (#2321)
|
- Minor: Added a button to the split context menu to open the moderation view for a channel when the account selected has moderator permissions. (#2321)
|
||||||
- Minor: Made BetterTTV emote tooltips use authors' display name. (#2267)
|
- Minor: Made BetterTTV emote tooltips use authors' display name. (#2267)
|
||||||
|
|
|
@ -173,11 +173,15 @@ void NotificationController::getFakeTwitchChannelLiveStatus(
|
||||||
getApp()->toasts->sendChannelNotification(channelName,
|
getApp()->toasts->sendChannelNotification(channelName,
|
||||||
Platform::Twitch);
|
Platform::Twitch);
|
||||||
}
|
}
|
||||||
if (getSettings()->notificationPlaySound)
|
if (getSettings()->notificationPlaySound &&
|
||||||
|
!(isInStreamerMode() &&
|
||||||
|
getSettings()->streamerModeSupressLiveNotifications))
|
||||||
{
|
{
|
||||||
getApp()->notifications->playSound();
|
getApp()->notifications->playSound();
|
||||||
}
|
}
|
||||||
if (getSettings()->notificationFlashTaskbar)
|
if (getSettings()->notificationFlashTaskbar &&
|
||||||
|
!(isInStreamerMode() &&
|
||||||
|
getSettings()->streamerModeSupressLiveNotifications))
|
||||||
{
|
{
|
||||||
getApp()->windows->sendAlert();
|
getApp()->windows->sendAlert();
|
||||||
}
|
}
|
||||||
|
|
|
@ -193,6 +193,8 @@ public:
|
||||||
BoolSetting streamerModeHideViewerCountAndDuration = {
|
BoolSetting streamerModeHideViewerCountAndDuration = {
|
||||||
"/streamerMode/hideViewerCountAndDuration", false};
|
"/streamerMode/hideViewerCountAndDuration", false};
|
||||||
BoolSetting streamerModeMuteMentions = {"/streamerMode/muteMentions", true};
|
BoolSetting streamerModeMuteMentions = {"/streamerMode/muteMentions", true};
|
||||||
|
BoolSetting streamerModeSupressLiveNotifications = {
|
||||||
|
"/streamerMode/supressLiveNotifications", false};
|
||||||
|
|
||||||
/// Ignored Phrases
|
/// Ignored Phrases
|
||||||
QStringSetting ignoredPhraseReplace = {"/ignore/ignoredPhraseReplace",
|
QStringSetting ignoredPhraseReplace = {"/ignore/ignoredPhraseReplace",
|
||||||
|
|
|
@ -38,7 +38,9 @@ bool Toasts::isEnabled()
|
||||||
{
|
{
|
||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
return WinToastLib::WinToast::isCompatible() &&
|
return WinToastLib::WinToast::isCompatible() &&
|
||||||
getSettings()->notificationToast;
|
getSettings()->notificationToast &&
|
||||||
|
!(isInStreamerMode() &&
|
||||||
|
getSettings()->streamerModeSupressLiveNotifications);
|
||||||
#else
|
#else
|
||||||
return false;
|
return false;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -346,6 +346,8 @@ void GeneralPage::initLayout(GeneralPageView &layout)
|
||||||
"Hide viewer count and stream length while hovering over split header",
|
"Hide viewer count and stream length while hovering over split header",
|
||||||
s.streamerModeHideViewerCountAndDuration);
|
s.streamerModeHideViewerCountAndDuration);
|
||||||
layout.addCheckbox("Mute mention sounds", s.streamerModeMuteMentions);
|
layout.addCheckbox("Mute mention sounds", s.streamerModeMuteMentions);
|
||||||
|
layout.addCheckbox("Supress Live Notifications",
|
||||||
|
s.streamerModeSupressLiveNotifications);
|
||||||
|
|
||||||
layout.addTitle("Link Previews");
|
layout.addTitle("Link Previews");
|
||||||
layout.addDescription(
|
layout.addDescription(
|
||||||
|
|
|
@ -29,9 +29,9 @@ NotificationPage::NotificationPage()
|
||||||
{
|
{
|
||||||
auto settings = tabs.appendTab(new QVBoxLayout, "Options");
|
auto settings = tabs.appendTab(new QVBoxLayout, "Options");
|
||||||
{
|
{
|
||||||
settings.emplace<QLabel>("You can be informed when certain "
|
settings.emplace<QLabel>(
|
||||||
"channels go live. You can be "
|
"You can be informed when certain channels go live. You "
|
||||||
"informed in multiple ways:");
|
"can be informed in multiple ways:");
|
||||||
|
|
||||||
settings.append(this->createCheckBox(
|
settings.append(this->createCheckBox(
|
||||||
"Flash taskbar", getSettings()->notificationFlashTaskbar));
|
"Flash taskbar", getSettings()->notificationFlashTaskbar));
|
||||||
|
|
Loading…
Reference in a new issue