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

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

View file

@ -26,6 +26,7 @@
#include "FeedHolder.h"
#include "../RsAutoUpdatePage.h"
#include "gui/msgs/MessageComposer.h"
#include "gui/common/StatusDefs.h"
#include "gui/notifyqt.h"
@ -178,7 +179,7 @@ void PeerItem::updateItem()
}
/* top Level info */
QString status = QString::fromStdString(RsPeerStateString(details.state));
QString status = StatusDefs::peerStateString(details.state);
#if 0
/* Append additional status info from status service */
@ -201,7 +202,7 @@ void PeerItem::updateItem()
ipLabel->setText(QString::fromStdString(out.str()));
}
connLabel->setText(QString::fromStdString(details.autoconnect));
connLabel->setText(StatusDefs::connectStateString(details));
/* do buttons */
chatButton->setEnabled(details.state & RS_PEER_STATE_CONNECTED);