Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
14e94f1f
Commit
14e94f1f
authored
Jan 28, 2016
by
ctrlaltca
Browse files
Merge pull request #1767 from Fizztastic/fix_1764
Sounds on buddy login & logout.
parents
5fcd8a73
9767b1f6
Changes
4
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/soundengine.cpp
View file @
14e94f1f
...
@@ -170,6 +170,8 @@ void SoundEngine::themeChangedSlot()
...
@@ -170,6 +170,8 @@ void SoundEngine::themeChangedSlot()
<<
"player_join"
<<
"player_leave"
<<
"player_disconnect"
<<
"player_reconnect"
<<
"player_concede"
<<
"player_join"
<<
"player_leave"
<<
"player_disconnect"
<<
"player_reconnect"
<<
"player_concede"
// Spectator
// Spectator
<<
"spectator_join"
<<
"spectator_leave"
<<
"spectator_join"
<<
"spectator_leave"
// Buddy
<<
"buddy_join"
<<
"buddy_leave"
// Chat & UI
// Chat & UI
<<
"chat_mention"
<<
"all_mention"
<<
"private_message"
;
<<
"chat_mention"
<<
"all_mention"
<<
"private_message"
;
...
...
cockatrice/src/tab_userlists.cpp
View file @
14e94f1f
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
#include
"userlist.h"
#include
"userlist.h"
#include
"userinfobox.h"
#include
"userinfobox.h"
#include
"abstractclient.h"
#include
"abstractclient.h"
#include
"soundengine.h"
#include
<QHBoxLayout>
#include
<QHBoxLayout>
#include
<QVBoxLayout>
#include
<QVBoxLayout>
#include
<QPushButton>
#include
<QPushButton>
...
@@ -146,12 +147,19 @@ void TabUserLists::processUserJoinedEvent(const Event_UserJoined &event)
...
@@ -146,12 +147,19 @@ void TabUserLists::processUserJoinedEvent(const Event_UserJoined &event)
ignoreList
->
sortItems
();
ignoreList
->
sortItems
();
buddyList
->
sortItems
();
buddyList
->
sortItems
();
if
(
buddyList
->
getUsers
().
keys
().
contains
(
userName
))
soundEngine
->
playSound
(
"buddy_join"
);
emit
userJoined
(
info
);
emit
userJoined
(
info
);
}
}
void
TabUserLists
::
processUserLeftEvent
(
const
Event_UserLeft
&
event
)
void
TabUserLists
::
processUserLeftEvent
(
const
Event_UserLeft
&
event
)
{
{
QString
userName
=
QString
::
fromStdString
(
event
.
name
());
QString
userName
=
QString
::
fromStdString
(
event
.
name
());
if
(
buddyList
->
getUsers
().
keys
().
contains
(
userName
))
soundEngine
->
playSound
(
"buddy_leave"
);
if
(
allUsersList
->
deleteUser
(
userName
))
{
if
(
allUsersList
->
deleteUser
(
userName
))
{
ignoreList
->
setUserOnline
(
userName
,
false
);
ignoreList
->
setUserOnline
(
userName
,
false
);
buddyList
->
setUserOnline
(
userName
,
false
);
buddyList
->
setUserOnline
(
userName
,
false
);
...
...
sounds/Default/buddy_join.wav
0 → 100644
View file @
14e94f1f
File added
sounds/Default/buddy_leave.wav
0 → 100644
View file @
14e94f1f
File added
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment