StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Added alerts and modified groupchat status light to better fit with theme

Browse Source
This commit is contained in:
Flynn 2014-06-27 18:35:39 -07:00
parent d92ae3c0fe
commit aab44382c5
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
img/status/dot_groupchat.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 605 B

After

Width:  |  Height:  |  Size: 613 B

BIN
img/status/dot_groupchat_newmessages.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 764 B

After

Width:  |  Height:  |  Size: 796 B

BIN
img/status/dot_groupchat_notification.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 784 B

After

Width:  |  Height:  |  Size: 814 B

9
widget/widget.cpp
View File

@ -350,13 +350,13 @@ void Widget::onFriendMessageReceived(int friendId, const QString& message)
if ((f->friendId != f2->friendId) || isFriendWidgetActive == 0) if ((f->friendId != f2->friendId) || isFriendWidgetActive == 0)
{ {
f->hasNewMessages = 1; f->hasNewMessages = 1;
playMessageNotification(); newMessageAlert();
} }
} }
else else
{ {
f->hasNewMessages = 1; f->hasNewMessages = 1;
playMessageNotification(); newMessageAlert();
} }
updateFriendStatusLights(friendId); updateFriendStatusLights(friendId);
@ -380,8 +380,9 @@ void Widget::updateFriendStatusLights(int friendId)
f->widget->statusPic.setPixmap(QPixmap("img/status/dot_away_notification.png")); f->widget->statusPic.setPixmap(QPixmap("img/status/dot_away_notification.png"));
} }
void Widget::playMessageNotification() void Widget::newMessageAlert()
{ {
QApplication::alert(this, 1000);
QSound::play("audio/notification.wav"); QSound::play("audio/notification.wav");
} }
@ -427,7 +428,7 @@ void Widget::onGroupMessageReceived(int groupnumber, int friendgroupnumber, cons
{ {
if (message.contains(Settings::getInstance().getUsername(), Qt::CaseInsensitive)) if (message.contains(Settings::getInstance().getUsername(), Qt::CaseInsensitive))
{ {
playMessageNotification(); newMessageAlert();
g->hasNewMessages = 1; g->hasNewMessages = 1;
g->userWasMentioned = 1; g->userWasMentioned = 1;
g->widget->statusPic.setPixmap(QPixmap("img/status/dot_groupchat_notification.png")); g->widget->statusPic.setPixmap(QPixmap("img/status/dot_groupchat_notification.png"));

2
widget/widget.h
View File

@ -84,7 +84,7 @@ private:
GroupWidget* activeGroupWidget; GroupWidget* activeGroupWidget;
void updateFriendStatusLights(int friendId); void updateFriendStatusLights(int friendId);
int isFriendWidgetActive, isGroupWidgetActive; int isFriendWidgetActive, isGroupWidgetActive;
void playMessageNotification(); void newMessageAlert();
}; };
#endif // WIDGET_H #endif // WIDGET_H