mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-10 23:52:51 -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
|
@ -70,8 +70,7 @@ public slots:
|
|||
|
||||
protected:
|
||||
/** Default constructor */
|
||||
PopupChatDialog(std::string id, std::string name,
|
||||
QWidget *parent = 0, Qt::WFlags flags = 0);
|
||||
PopupChatDialog(std::string id, const QString name, QWidget *parent = 0, Qt::WFlags flags = 0);
|
||||
/** Default destructor */
|
||||
~PopupChatDialog();
|
||||
|
||||
|
@ -127,7 +126,8 @@ private:
|
|||
QAction *actionTextItalic;
|
||||
QAction *pasteLinkAct ;
|
||||
|
||||
std::string dialogId, dialogName;
|
||||
std::string dialogId;
|
||||
QString dialogName;
|
||||
unsigned int lastChatTime;
|
||||
std::string lastChatName;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue