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

added popup chat window for distant chat, decryption code for private chat links. (W) does not compile

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6310 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-04-16 21:13:42 +00:00
parent 46ec44ceea
commit dc0193ae66
10 changed files with 207 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
retroshare-gui/src/gui/chat/ChatDialog.cpp
View file

@ -26,6 +26,7 @@
#include "ChatDialog.h"
#include "gui/common/PeerDefs.h"
#include "PopupChatDialog.h"
#include "PopupDistantChatDialog.h"
#include "ChatLobbyDialog.h"
#include "PopupChatWindow.h"
#include "gui/settings/rsharesettings.h"
@ -91,10 +92,17 @@ void ChatDialog::init(const std::string &peerId, const QString &title)
ChatDialog *cd = getExistingChat(peerId);
if (cd == NULL) {
ChatLobbyId lobby_id;
ChatLobbyId lobby_id = 0;
bool distant_peer = false ;
if (rsMsgs->isLobbyId(peerId, lobby_id)) {
chatflags = RS_CHAT_OPEN | RS_CHAT_FOCUS; // use own flags
}
std::string distant_pgp_id = "" ;
if(distant_peer = rsMsgs->isDistantId(peerId,distant_pgp_id)) {
chatflags = RS_CHAT_OPEN | RS_CHAT_FOCUS; // use own flags
}
if (chatflags & RS_CHAT_OPEN) {
if (lobby_id) {
@ -108,6 +116,10 @@ void ChatDialog::init(const std::string &peerId, const QString &title)
cd->init(peerId, QString::fromUtf8((*it).lobby_name.c_str()));
}
}
} else if(distant_peer) {
cd = new PopupDistantChatDialog();
chatDialogs[peerId] = cd;
cd->init(peerId, tr("Distant peer (PGP id=%1)").arg(distant_pgp_id));
} else {
RsPeerDetails sslDetails;
if (rsPeers->getPeerDetails(peerId, sslDetails)) {