mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-12 11:02:30 -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
|
@ -52,6 +52,7 @@
|
|||
#include "util/Widget.h"
|
||||
#include "settings/rsharesettings.h"
|
||||
#include "common/RSTreeWidgetItem.h"
|
||||
#include "common/PeerDefs.h"
|
||||
|
||||
#include "RetroShareLink.h"
|
||||
|
||||
|
@ -193,7 +194,7 @@ MessengerWindow::MessengerWindow(QWidget* parent, Qt::WFlags flags)
|
|||
std::string ownId = rsPeers->getOwnId();
|
||||
if (rsPeers->getPeerDetails(ownId, pd)) {
|
||||
/* calculate only once */
|
||||
m_nickName = QString::fromStdString(pd.name) + " - " + QString::fromStdString(pd.location);
|
||||
m_nickName = PeerDefs::nameWithLocation(pd);
|
||||
#ifdef MINIMAL_RSGUI
|
||||
ui.statusButton->setText(m_nickName);
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue