mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-04 23:25:32 -04:00
New class for working with peer names (rsid, name + location, ...) - PeerDefs.
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:
parent
277a321f1b
commit
de16f6c72d
20 changed files with 304 additions and 181 deletions
95
retroshare-gui/src/gui/common/PeerDefs.cpp
Normal file
95
retroshare-gui/src/gui/common/PeerDefs.cpp
Normal file
|
@ -0,0 +1,95 @@
|
|||
/****************************************************************
|
||||
* This file is distributed under the following license:
|
||||
*
|
||||
* Copyright (c) 2010, RetroShare Team
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
* Boston, MA 02110-1301, USA.
|
||||
****************************************************************/
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <retroshare/rspeers.h>
|
||||
|
||||
#include "PeerDefs.h"
|
||||
|
||||
const QString PeerDefs::nameWithLocation(const RsPeerDetails &details)
|
||||
{
|
||||
QString name = QString::fromStdString(details.name);
|
||||
if (details.location.empty() == false) {
|
||||
name += " (" + QString::fromStdString(details.location) + ")";
|
||||
}
|
||||
|
||||
return name;
|
||||
}
|
||||
|
||||
const QString PeerDefs::rsid(const std::string &name, const std::string &id)
|
||||
{
|
||||
if (name.empty()) {
|
||||
return qApp->translate("PeerDefs", "Anonymous") + "@" + QString::fromStdString(id);
|
||||
}
|
||||
|
||||
return QString::fromStdString(name) + "@" + QString::fromStdString(id);
|
||||
}
|
||||
|
||||
const QString PeerDefs::rsid(const RsPeerDetails &details)
|
||||
{
|
||||
return rsid(details.name, details.id);
|
||||
}
|
||||
|
||||
const QString PeerDefs::rsidFromId(const std::string &id, QString *name /*= NULL*/)
|
||||
{
|
||||
QString rsid;
|
||||
|
||||
std::string peerName = rsPeers->getPeerName(id);
|
||||
if (peerName.empty()) {
|
||||
rsid = PeerDefs::rsid("", id);
|
||||
|
||||
if (name) {
|
||||
*name = qApp->translate("PeerDefs", "Anonymous");
|
||||
}
|
||||
} else {
|
||||
rsid = PeerDefs::rsid(peerName, id);
|
||||
|
||||
if (name) {
|
||||
*name = QString::fromStdString(peerName);
|
||||
}
|
||||
}
|
||||
|
||||
return rsid;
|
||||
}
|
||||
|
||||
const std::string PeerDefs::idFromRsid(const QString &rsid, bool check)
|
||||
{
|
||||
// search for cert id in string
|
||||
std::string id;
|
||||
|
||||
int index = rsid.indexOf("@");
|
||||
if (index >= 0) {
|
||||
// found "@", extract cert id from string
|
||||
id = rsid.mid(index + 1).toStdString();
|
||||
} else {
|
||||
// maybe its only the cert id
|
||||
id = rsid.toStdString();
|
||||
}
|
||||
|
||||
if (check) {
|
||||
RsPeerDetails detail;
|
||||
if (rsPeers->getPeerDetails(id, detail) == false) {
|
||||
id.clear();
|
||||
}
|
||||
}
|
||||
|
||||
return id;
|
||||
}
|
42
retroshare-gui/src/gui/common/PeerDefs.h
Normal file
42
retroshare-gui/src/gui/common/PeerDefs.h
Normal file
|
@ -0,0 +1,42 @@
|
|||
/****************************************************************
|
||||
* This file is distributed under the following license:
|
||||
*
|
||||
* Copyright (c) 2010, RetroShare Team
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
* Boston, MA 02110-1301, USA.
|
||||
****************************************************************/
|
||||
|
||||
|
||||
#ifndef _PEERDEFS_H
|
||||
#define _PEERDEFS_H
|
||||
|
||||
#include <QString>
|
||||
|
||||
class RsPeerDetails;
|
||||
|
||||
class PeerDefs
|
||||
{
|
||||
public:
|
||||
static const QString nameWithLocation(const RsPeerDetails &details);
|
||||
|
||||
static const QString rsid(const RsPeerDetails &details);
|
||||
static const QString rsid(const std::string &name, const std::string &id);
|
||||
static const QString rsidFromId(const std::string &id, QString *name = NULL);
|
||||
static const std::string idFromRsid(const QString &rsid, bool check);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue