ported branch v0.5.0 commits 2529 and 2544 to trunk

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2545 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-03-15 12:57:08 +00:00
parent a4d1e61aa2
commit cc17744ee3
13 changed files with 123 additions and 105 deletions

View file

@ -1192,7 +1192,7 @@ void SearchDialog::copysearchLink()
int numdls = itemsForCopy.size();
QTreeWidgetItem * item;
QList<QUrl> urls ;
std::vector<RetroShareLink> urls ;
for (int i = 0; i < numdls; ++i)
{
@ -1211,12 +1211,10 @@ void SearchDialog::copysearchLink()
RetroShareLink link(fname, fsize, fhash);
if(link.valid())
urls.push_back(link.toUrl()) ;
urls.push_back(link) ;
}
}
QMimeData *dt = new QMimeData;
dt->setUrls(urls) ;
QApplication::clipboard()->setMimeData(dt) ;
RSLinkClipboard::copyLinks(urls) ;
}
void SearchDialog::sendLinkTo( )
@ -1228,8 +1226,8 @@ void SearchDialog::sendLinkTo( )
nMsgDialog->newMsg();
nMsgDialog->insertTitleText("New RetroShare Link(s)");
nMsgDialog->insertHtmlText(QApplication::clipboard()->text().toStdString());
nMsgDialog->insertMsgText(RSLinkClipboard::toHtml().toStdString()) ;
nMsgDialog->show();
}