Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-03 05:32:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed toaster for muted participant of a chat lobby.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6059 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-01-03 16:20:14 +00:00
parent 451c7f5eda
commit 9cfe660e11
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/chat/ChatLobbyDialog.h
View file

@ -40,6 +40,7 @@ public:
virtual bool hasPeerStatus() { return false; } virtual bool hasPeerStatus() { return false; }
virtual bool notifyBlink(); virtual bool notifyBlink();
void setNickname(const QString &nickname); void setNickname(const QString &nickname);
bool isParticipantMuted(const QString &participant);
private slots: private slots:
void showParticipantsFrame(bool show); void showParticipantsFrame(bool show);
@ -68,7 +69,6 @@ private:
void muteParticipant(const QString &nickname); void muteParticipant(const QString &nickname);
void unMuteParticipant(const QString &nickname); void unMuteParticipant(const QString &nickname);
bool isParticipantMuted(const QString &participant);
bool isNicknameInLobby(const QString &nickname); bool isNicknameInLobby(const QString &nickname);
ChatLobbyId lobbyId; ChatLobbyId lobbyId;

6
retroshare-gui/src/gui/notifyqt.cpp
View file

@ -41,6 +41,7 @@
#include "toaster/FriendRequestToaster.h" #include "toaster/FriendRequestToaster.h"
#include "chat/ChatDialog.h" #include "chat/ChatDialog.h"
#include "chat/ChatLobbyDialog.h"
#include "chat/ChatWidget.h" #include "chat/ChatWidget.h"
#include "FriendsDialog.h" #include "FriendsDialog.h"
#include "gui/settings/rsharesettings.h" #include "gui/settings/rsharesettings.h"
@ -700,6 +701,11 @@ void NotifyQt::UpdateGUI()
// do not show when active // do not show when active
break; break;
} }
ChatLobbyDialog *chatLobbyDialog = dynamic_cast<ChatLobbyDialog*>(chatDialog);
if (!chatLobbyDialog || chatLobbyDialog->isParticipantMuted(QString::fromUtf8(title.c_str()))) {
// participant is muted
break;
}
toaster = new Toaster(new ChatLobbyToaster(id, QString::fromUtf8(title.c_str()), QString::fromUtf8(msg.c_str()))); toaster = new Toaster(new ChatLobbyToaster(id, QString::fromUtf8(title.c_str()), QString::fromUtf8(msg.c_str())));
} }
break; break;