Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-09 06:42:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

removed copy/paste of links of type PERSON in friendlist. This caused confusion and did not provide anything useful since the creation of the full certificate links

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6771 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-09-27 21:40:51 +00:00
parent e21d869006
commit 40ed94f7fb
2 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

50
retroshare-gui/src/gui/common/FriendList.cpp
View file

@ -403,14 +403,14 @@ void FriendList::peerTreeWidgetCostumPopupMenu()
if (type == TYPE_SSL) { if (type == TYPE_SSL) {
contextMnu.addAction(QIcon(IMAGE_COPYLINK), tr("Copy certificate link"), this, SLOT(copyFullCertificate())); contextMnu.addAction(QIcon(IMAGE_COPYLINK), tr("Copy certificate link"), this, SLOT(copyFullCertificate()));
} }
if (type == TYPE_GPG) { //if (type == TYPE_GPG) {
contextMnu.addAction(QIcon(IMAGE_COPYLINK), tr("Copy RetroShare Link"), this, SLOT(copyLink())); // contextMnu.addAction(QIcon(IMAGE_COPYLINK), tr("Copy RetroShare Link"), this, SLOT(copyLink()));
} //}
QAction *action = contextMnu.addAction(QIcon(IMAGE_PASTELINK), tr("Paste Friend Link"), this, SLOT(pastePerson())); QAction *action = contextMnu.addAction(QIcon(IMAGE_PASTELINK), tr("Paste certificate link"), this, SLOT(pastePerson()));
if (RSLinkClipboard::empty(RetroShareLink::TYPE_PERSON) && RSLinkClipboard::empty(RetroShareLink::TYPE_CERTIFICATE)) {
if (/*RSLinkClipboard::empty(RetroShareLink::TYPE_PERSON) &&*/ RSLinkClipboard::empty(RetroShareLink::TYPE_CERTIFICATE))
action->setDisabled(true); action->setDisabled(true);
}
if (type == TYPE_GPG) { if (type == TYPE_GPG) {
contextMnu.addAction(QIcon(IMAGE_DENYFRIEND), tr("Deny Friend"), this, SLOT(removefriend())); contextMnu.addAction(QIcon(IMAGE_DENYFRIEND), tr("Deny Friend"), this, SLOT(removefriend()));
@ -519,8 +519,8 @@ void FriendList::peerTreeWidgetCostumPopupMenu()
// } // }
// } // }
} else { } else {
QAction *action = contextMnu.addAction(QIcon(IMAGE_PASTELINK), tr("Paste Friend Link"), this, SLOT(pastePerson())); QAction *action = contextMnu.addAction(QIcon(IMAGE_PASTELINK), tr("Paste certificate link"), this, SLOT(pastePerson()));
if (RSLinkClipboard::empty(RetroShareLink::TYPE_PERSON) && RSLinkClipboard::empty(RetroShareLink::TYPE_CERTIFICATE)) { if (/*RSLinkClipboard::empty(RetroShareLink::TYPE_PERSON) &&*/ RSLinkClipboard::empty(RetroShareLink::TYPE_CERTIFICATE)) {
action->setDisabled(true); action->setDisabled(true);
} }
} }
@ -1338,7 +1338,7 @@ void FriendList::recommendfriend()
void FriendList::pastePerson() void FriendList::pastePerson()
{ {
RSLinkClipboard::process(RetroShareLink::TYPE_PERSON); //RSLinkClipboard::process(RetroShareLink::TYPE_PERSON);
RSLinkClipboard::process(RetroShareLink::TYPE_CERTIFICATE); RSLinkClipboard::process(RetroShareLink::TYPE_CERTIFICATE);
} }
@ -1356,22 +1356,22 @@ void FriendList::copyFullCertificate()
RSLinkClipboard::copyLinks(urls); RSLinkClipboard::copyLinks(urls);
} }
void FriendList::copyLink() // void FriendList::copyLink()
{ // {
QTreeWidgetItem *c = getCurrentPeer(); // QTreeWidgetItem *c = getCurrentPeer();
//
if (c == NULL) { // if (c == NULL) {
return; // return;
} // }
//
QList<RetroShareLink> urls; // QList<RetroShareLink> urls;
RetroShareLink link; // RetroShareLink link;
if (link.createPerson(getRsId(c))) { // if (link.createPerson(getRsId(c))) {
urls.push_back(link); // urls.push_back(link);
} // }
//
RSLinkClipboard::copyLinks(urls); // RSLinkClipboard::copyLinks(urls);
} // }
/** /**
* Find out which group is selected * Find out which group is selected

2
retroshare-gui/src/gui/common/FriendList.h
View file

@ -140,7 +140,7 @@ private slots:
void configurefriend(); void configurefriend();
void chatfriend(QTreeWidgetItem *); void chatfriend(QTreeWidgetItem *);
void chatfriendproxy(); void chatfriendproxy();
void copyLink(); //void copyLink();
void copyFullCertificate(); void copyFullCertificate();
// void exportfriend(); // void exportfriend();
void addFriend(); void addFriend();