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

Cleaner flashing code (#774)

Browse source
This commit is contained in:
apa420 2018-10-07 12:55:44 +02:00 committed by pajlada
parent 767197ab48
commit bb6c2b6135
5 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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

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

10
src/singletons/WindowManager.cpp
View file

@ -444,6 +444,16 @@ void WindowManager::save()
file.flush();
}
void WindowManager::sendAlert()
{
int flashDuration = 2500;
if (getSettings()->longAlerts) {
flashDuration = 0;
}
QApplication::alert(getApp()->windows->getMainWindow().window(),
flashDuration);
}
void WindowManager::encodeNodeRecusively(SplitNode *node, QJsonObject &obj)
{
switch (node->getType()) {

2
src/singletons/WindowManager.hpp
View file

@ -61,6 +61,8 @@ public:
pajlada::Signals::NoArgSignal wordFlagsChanged;
void sendAlert();
private:
void encodeNodeRecusively(SplitContainer::Node *node, QJsonObject &obj);