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

Moved strings of RsPeerDetails::autoconnect for translation to the GUI side and added integer constants for it.

Browse source 
Fixed sorting of available friends in MessengerWindow.
Recompile of the GUI needed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3952 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-01-06 18:26:39 +00:00
parent 13ab90e14b
commit dd55b2bf74
10 changed files with 313 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -36,6 +36,7 @@
#include "gui/help/browser/helpbrowser.h"
#include "gui/common/PeerDefs.h"
#include "gui/MainWindow.h"
#include "gui/common/StatusDefs.h"
static QMap<std::string, ConfCertDialog*> instances;
@ -159,8 +160,8 @@ void ConfCertDialog::load()
ui.extPort -> setValue(detail.extPort);
ui.dynDNS->setText(QString::fromStdString(detail.dyndns));
ui.statusline->setText(QString::fromStdString(detail.autoconnect));
ui.statusline->setText(StatusDefs::connectStateString(detail));
ui.ipAddressList->clear();
for(std::list<std::string>::const_iterator it(detail.ipAddressList.begin());it!=detail.ipAddressList.end();++it)