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

@ -84,6 +84,9 @@ CreateForumMsg::CreateForumMsg(std::string fId, std::string pId)
void CreateForumMsg::forumMessageCostumPopupMenu( QPoint point )
{
if(RSLinkClipboard::empty())
return ;
contextMnu = new QMenu( this );
pasteLinkAct = new QAction(QIcon(":/images/pasterslink.png"), tr( "Paste retroshare Link" ), this );
@ -415,14 +418,6 @@ void CreateForumMsg::fileHashingFinished(AttachFileItem* file) {
void CreateForumMsg::pasteLink()
{
QList<QUrl> list = QApplication::clipboard()->mimeData()->urls();
for(QList<QUrl>::const_iterator it(list.begin());it!=list.end();++it)
{
RetroShareLink link(*it) ;
if(link.valid())
ui.forumMessage->insertHtml("<a href='" + link.toString() + "'> " + link.toString() + "</a> <br>") ;
}
ui.forumMessage->insertHtml(RSLinkClipboard::toHtml()) ;
}