Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-04 04:14:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fixed unread chat cound in FriendsDialog, fix display of status in distant chat (Patch from electron)

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7832 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-01-10 13:13:41 +00:00
parent 0e2c4266fa
commit 4d26726a88
8 changed files with 131 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

48
retroshare-gui/src/gui/chat/ChatUserNotify.cpp
View file

@ -28,10 +28,39 @@
#include <retroshare/rsnotify.h>
#include <retroshare/rsmsgs.h>
static std::map<ChatId, int> waitingChats;
static ChatUserNotify* instance = 0;
/*static*/ void ChatUserNotify::getPeersWithWaitingChat(std::vector<RsPeerId> &peers)
{
for(std::map<ChatId, int>::iterator mit = waitingChats.begin(); mit != waitingChats.end(); ++mit)
{
if(mit->first.isPeerId() && std::find(peers.begin(), peers.end(), mit->first.toPeerId()) == peers.end())
peers.push_back(mit->first.toPeerId());
}
}
/*static*/ void ChatUserNotify::clearWaitingChat(ChatId id)
{
std::map<ChatId, int>::iterator mit = waitingChats.find(id);
if(mit != waitingChats.end())
{
waitingChats.erase(mit);
if(instance)
instance->updateIcon();
}
}
ChatUserNotify::ChatUserNotify(QObject *parent) :
UserNotify(parent)
{
connect(NotifyQt::getInstance(), SIGNAL(chatMessageReceived(ChatMessage)), this, SLOT(chatMessageReceived(ChatMessage)));
instance = this;
}
ChatUserNotify::~ChatUserNotify()
{
instance = 0;
}
bool ChatUserNotify::hasSetting(QString *name, QString *group)
@ -55,7 +84,7 @@ QIcon ChatUserNotify::getMainIcon(bool hasNew)
unsigned int ChatUserNotify::getNewCount()
{
int sum = 0;
for(std::map<ChatId, int>::iterator mit = mWaitingChats.begin(); mit != mWaitingChats.end(); ++mit)
for(std::map<ChatId, int>::iterator mit = waitingChats.begin(); mit != waitingChats.end(); ++mit)
{
sum += mit->second;
}
@ -65,10 +94,8 @@ unsigned int ChatUserNotify::getNewCount()
void ChatUserNotify::iconClicked()
{
ChatDialog *chatDialog = NULL;
if (mWaitingChats.empty() == false) {
chatDialog = ChatDialog::getChat(mWaitingChats.begin()->first, RS_CHAT_OPEN | RS_CHAT_FOCUS);
mWaitingChats.erase(mWaitingChats.begin());
}
// ChatWidget removes the waiting chat from the list with clearWaitingChat()
chatDialog = ChatDialog::getChat(waitingChats.begin()->first, RS_CHAT_OPEN | RS_CHAT_FOCUS);
if (chatDialog == NULL) {
MainWindow::showWindow(MainWindow::Friends);
@ -78,13 +105,18 @@ void ChatUserNotify::iconClicked()
void ChatUserNotify::chatMessageReceived(ChatMessage msg)
{
if(ChatDialog::getExistingChat(msg.chat_id) || (Settings->getChatFlags() & RS_CHAT_OPEN) || msg.chat_id.isGxsId())
if(!msg.chat_id.isBroadcast()
&&( ChatDialog::getExistingChat(msg.chat_id)
|| (Settings->getChatFlags() & RS_CHAT_OPEN)
|| msg.chat_id.isGxsId()))
{
ChatDialog::chatMessageReceived(msg);
}
else
{
// this implicitly counts broadcast messages, because broadcast messages are not handled by chat dialog
bool found = false;
for(std::map<ChatId, int>::iterator mit = mWaitingChats.begin(); mit != mWaitingChats.end(); ++mit)
for(std::map<ChatId, int>::iterator mit = waitingChats.begin(); mit != waitingChats.end(); ++mit)
{
if(msg.chat_id.isSameEndpoint(mit->first))
{
@ -93,7 +125,7 @@ void ChatUserNotify::chatMessageReceived(ChatMessage msg)
}
}
if(!found)
mWaitingChats[msg.chat_id] = 1;
waitingChats[msg.chat_id] = 1;
updateIcon();
}
}