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

PeersDialog/MessengerWindow:

Browse source 
- send recommended friend as message
- paste recommended friends as "retroshare://person|..." from clipboard

reworked retroshare link handling
- added new type -> retroshare://person|<name>|<hash>
- added processing of links to RetroShareLink and RSLinkClipboard and removed all processing in anchorClicked of QTextBrowser 
- fixed parseClipboard to handle all found links in clipboard
- disabled the processing of the clickable links (RetroShareLink::processUrl), because QUrl can't handle the RetroShare links properly

removed memory leaks of the QAction in some context menus


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3292 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-07-15 11:25:34 +00:00
parent 3291e61291
commit daf0ea50ee
21 changed files with 712 additions and 525 deletions
Download patch file Download diff file Expand all files Collapse all files

57
retroshare-gui/src/gui/msgs/MessageComposer.cpp
View file

@ -181,6 +181,7 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WFlags flags)
/* Set header resize modes and initial section sizes */
ui.msgFileList->setColumnCount(5);
ui.msgFileList->setColumnHidden ( 4, true);
QHeaderView * _smheader = ui.msgFileList->header () ;
@ -206,9 +207,7 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WFlags flags)
/*static*/ void MessageComposer::msgFriend(std::string id)
{
#ifdef PEERS_DEBUG
std::cerr << "MessageComposer::msgfriend()" << std::endl;
#endif
// std::cerr << "MessageComposer::msgfriend()" << std::endl;
rsicontrol -> ClearInMsg();
rsicontrol -> SetInMsg(id, true);
@ -228,6 +227,57 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WFlags flags)
/* window will destroy itself! */
}
void MessageComposer::recommendFriend(std::list <std::string> &peerids)
{
// std::cerr << "MessageComposer::recommendFriend()" << std::endl;
if (peerids.size() == 0) {
return;
}
// rsicontrol -> ClearInMsg();
// rsicontrol -> SetInMsg(id, true);
/* create a message */
MessageComposer *pMsgDialog = new MessageComposer();
pMsgDialog->newMsg();
pMsgDialog->setWindowTitle(tr("Compose: ") + tr("Friend Recommendation")) ;
pMsgDialog->insertTitleText(tr("Friend Recommendation(s)").toStdString());
std::string sMsgText = tr("I recommend a good friend of me, you can trust him too when you trust me.").toStdString();
sMsgText += "<br><br>";
/* process peer ids */
std::list<FileInfo> files_info;
std::list <std::string>::iterator peerid;
for (peerid = peerids.begin(); peerid != peerids.end(); peerid++) {
RsPeerDetails detail;
if (rsPeers->getPeerDetails(*peerid, detail) == false) {
std::cerr << "MessageComposer::recommendFriend() Couldn't find peer id " << *peerid << std::endl;
continue;
}
RetroShareLink link(QString::fromStdString(detail.name), QString::fromStdString(detail.id));
if (link.valid() == false || link.type() != RetroShareLink::TYPE_PERSON) {
continue;
}
sMsgText += link.toHtmlFull().toStdString() + "<br>";
// FileInfo info;
// info.fname = link.name().toStdString();
// info.hash = link.hash().toStdString();
// info.inRecommend = true;
// files_info.push_back(info);
}
pMsgDialog->insertMsgText(sMsgText);
// pMsgDialog->insertFileList(files_info);
pMsgDialog->show();
/* window will destroy itself! */
}
void MessageComposer::closeEvent (QCloseEvent * event)
{
bool bClose = true;
@ -544,7 +594,6 @@ void MessageComposer::sendMessage_internal(bool bDraftbox)
rsiface->lockData(); /* Lock Interface */
// const std::list<FileInfo>& recList = rsiface->getRecommendList();
for(std::list<FileInfo>::const_iterator it(_recList.begin()); it != _recList.end(); ++it)
if (it -> inRecommend)
mi.files.push_back(*it);