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

merged and fixed conflict with upstream/master

Browse source
This commit is contained in:
mr-alice 2016-11-04 13:52:11 +01:00
commit 2bb9a87b3b
17 changed files with 245 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

11
retroshare-gui/src/gui/common/MimeTextEdit.cpp
View file

@ -78,6 +78,17 @@ void MimeTextEdit::insertFromMimeData(const QMimeData* source)
}
#endif
//insert retroshare links
QList<RetroShareLink> links;
RSLinkClipboard::parseText(source->text(), links);
if(links.size() > 0)
{
for(int i = 0; i < links.size(); ++i)
insertHtml(links[i].toHtml() + "<br>");
return;
}
return RSTextEdit::insertFromMimeData(source);
}