Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-10 15:20:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' into Fix_ClangWarnings

Browse source
This commit is contained in:
G10h4ck 2019-04-23 12:45:33 +02:00 • committed by GitHub
commit 9102a698e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
66 changed files with 2471 additions and 559 deletions
Download patch file Download diff file Expand all files Collapse all files

4
retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
View file

@ -329,13 +329,15 @@ void SearchDialog::searchResultWidgetCustomPopupMenu( QPoint /*point*/ )
QMenu contextMnu(this) ;
contextMnu.addAction(QIcon(IMAGE_START), tr("Download"), this, SLOT(download())) ;
contextMnu.addAction(QIcon(IMAGE_BANFILE), tr("Mark as bad"), this, SLOT(ban())) ;
contextMnu.addSeparator();//--------------------------------------
contextMnu.addAction(QIcon(IMAGE_COPYLINK), tr("Copy RetroShare Link"), this, SLOT(copyResultLink())) ;
contextMnu.addAction(QIcon(IMAGE_COPYLINK), tr("Send RetroShare Link"), this, SLOT(sendLinkTo())) ;
contextMnu.addSeparator();//--------------------------------------
contextMnu.addAction(QIcon(IMAGE_BANFILE), tr("Mark as bad"), this, SLOT(ban())) ;
contextMnu.addSeparator();//--------------------------------------
QMenu collectionMenu(tr("Collection"), this);
collectionMenu.setIcon(QIcon(IMAGE_LIBRARY));
collectionMenu.addAction(collCreateAct);