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

New class for working with peer names (rsid, name + location, ...) - PeerDefs.

Browse source 
Show the location in brackets - "name (location)" (defined now in PeerDefs).
Renamed head of context menu in PeersDialog for ssl items.
Fixed german translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3553 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-09-28 20:33:34 +00:00
parent 277a321f1b
commit de16f6c72d
20 changed files with 304 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

5
retroshare-gui/src/gui/connect/ConfCertDialog.cpp
View file

@ -31,6 +31,7 @@
#include <retroshare/rsdisc.h>
#include "gui/help/browser/helpbrowser.h"
#include "gui/common/PeerDefs.h"
ConfCertDialog *ConfCertDialog::instance()
{
@ -133,7 +134,7 @@ void ConfCertDialog::loadDialog()
ui.name->setText(QString::fromStdString(detail.name));
ui.peerid->setText(QString::fromStdString(detail.id));
ui.rsid->setText(QString::fromStdString(detail.name) + "@" + QString::fromStdString(detail.id));
ui.rsid->setText(PeerDefs::rsid(detail));
if (!detail.isOnlyGPGdetail) {
@ -396,7 +397,7 @@ void ConfCertDialog::denyFriend() {
void ConfCertDialog::signGPGKey() {
std::string gpg_id = rsPeers->getGPGId(mId);
if (!rsPeers->signGPGCertificate(gpg_id)) {
QMessageBox::StandardButton sb = QMessageBox::warning ( NULL,
QMessageBox::warning ( NULL,
tr("Signature Failure"),
tr("Maybe password is wrong"),
QMessageBox::Ok);