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

- removed "use olf key format" from certificate export

Browse source 
- improved GXS Id display when unsigned
- use ProfileManager to export own PGP key pair in keyring and profile.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7562 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-09-25 20:14:21 +00:00
parent 37ddbf63cc
commit eede11a772
7 changed files with 44 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

45
retroshare-gui/src/gui/NetworkDialog.cpp
View file

@ -34,6 +34,7 @@
#include "common/RSTreeWidgetItem.h"
#include <gui/common/FriendSelectionDialog.h>
#include "gui/msgs/MessageComposer.h"
#include "gui/profile/ProfileManager.h"
#include "NetworkDialog.h"
//#include "TrustView.h"
#include "NetworkView.h"
@ -218,11 +219,11 @@ void NetworkDialog::connectTreeWidgetCostumPopupMenu( QPoint /*point*/ )
contextMnu->addAction(QIcon(IMAGE_MAKEFRIEND), tr("Make friend"), this, SLOT(makeFriend()));
}
if(peer_id == rsPeers->getGPGOwnId())
contextMnu->addAction(QIcon(IMAGE_EXPORT), tr("Export my certificate..."), this, SLOT(on_actionExportKey_activated()));
contextMnu->addAction(QIcon(IMAGE_EXPORT), tr("Export/create a new location"), this, SLOT(on_actionExportKey_activated()));
contextMnu->addAction(QIcon(IMAGE_PEERDETAILS), tr("Peer details..."), this, SLOT(peerdetails()));
//contextMnu->addAction(QIcon(IMAGE_MESSAGE), tr("Send Message"), this, SLOT(sendDistantMessage()));
contextMnu->addAction(QIcon(IMAGE_COPYLINK), tr("Copy RetroShare Link"), this, SLOT(copyLink()));
//contextMnu->addAction(QIcon(IMAGE_MESSAGE), tr("Send Message"), this, SLOT(sendDistantMessage()));
//contextMnu->addAction(QIcon(IMAGE_COPYLINK), tr("Copy RetroShare Link"), this, SLOT(copyLink()));
contextMnu->addSeparator() ;
contextMnu->addAction(QIcon(IMAGE_CLEAN_UNUSED), tr("Remove unused keys..."), this, SLOT(removeUnusedKeys()));
@ -690,42 +691,8 @@ void NetworkDialog::on_actionAddFriend_activated()
void NetworkDialog::on_actionExportKey_activated()
{
// qDebug() << " exportcert";
//
// std::string cert = rsPeers->GetRetroshareInvite();
// if (cert.empty()) {
// QMessageBox::information(this, tr("RetroShare"),
// tr("Sorry, create certificate failed"),
// QMessageBox::Ok, QMessageBox::Ok);
// return;
// }
//
// use misc::getSaveFileName
// QString qdir = QFileDialog::getSaveFileName(this,
// tr("Please choose a filename"),
// QDir::homePath(),
// tr("RetroShare Certificate (*.rsc );;All Files (*)"));
// //Todo: move save to file to p3Peers::SaveCertificateToFile
//
// if (qdir.isEmpty() == false) {
// QFile CertFile (qdir);
// if (CertFile.open(QIODevice::WriteOnly/* | QIODevice::Text*/)) {
// if (CertFile.write(QByteArray(cert.c_str())) > 0) {
// QMessageBox::information(this, tr("RetroShare"),
// tr("Certificate file successfully created"),
// QMessageBox::Ok, QMessageBox::Ok);
// } else {
// QMessageBox::information(this, tr("RetroShare"),
// tr("Sorry, certificate file creation failed"),
// QMessageBox::Ok, QMessageBox::Ok);
// }
// CertFile.close();
// } else {
// QMessageBox::information(this, tr("RetroShare"),
// tr("Sorry, certificate file creation failed"),
// QMessageBox::Ok, QMessageBox::Ok);
// }
// }
ProfileManager prof ;
prof.exec() ;
}
void NetworkDialog::on_actionCreate_New_Profile_activated()