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

Changed the chat service from a timer tick from the gui to a service tick.

Browse source 
Created a new notifier for new chat available - NOTIFY_LIST_CHAT. Removed the QTimer in PeersDialog and connect the signal.
Created news feed for public chat (prework of defnax, need still some gui changes)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3413 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-08-31 17:13:52 +00:00
parent c7c6f6d36a
commit b6b5fa5cd6
18 changed files with 832 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

6
retroshare-gui/src/gui/chat/PopupChatDialog.cpp
View file

@ -457,7 +457,7 @@ void PopupChatDialog::addChatMsg(ChatInfo *ci)
}
QString timestamp = "[" + QDateTime::currentDateTime().toString("hh:mm:ss") + "]";
QString name = QString::fromStdString(ci ->name);
QString name = QString::fromStdString(rsPeers->getPeerName(ci->rsid));
QString message = QString::fromStdWString(ci -> msg);
//replace http://, https:// and www. with <a href> links
@ -536,7 +536,6 @@ void PopupChatDialog::sendChat()
const RsConfig &conf = rsiface->getConfig();
ci.rsid = conf.ownId;
ci.name = conf.ownName;
rsiface->unlockData(); /* Unlock Interface */
}
@ -552,7 +551,6 @@ std::cout << "PopupChatDialog:sendChat " << styleHtm.toStdString() << std::endl;
/* put proper destination */
ci.rsid = dialogId;
ci.name = dialogName;
rsMsgs -> ChatSend(ci);
chatWidget ->clear();
@ -1002,7 +1000,6 @@ void PopupChatDialog::fileHashingFinished(AttachFileItem* file)
const RsConfig &conf = rsiface->getConfig();
ci.rsid = conf.ownId;
ci.name = conf.ownName;
rsiface->unlockData(); /* Unlock Interface */
}
@ -1030,7 +1027,6 @@ void PopupChatDialog::fileHashingFinished(AttachFileItem* file)
/* put proper destination */
ci.rsid = dialogId;
ci.name = dialogName;
rsMsgs -> ChatSend(ci);
}