mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
Merge pull request #1420 from pedro-nonfree/rename-friend-to-trusted-node-statusbar
substitute friend to trusted node in statusbar
This commit is contained in:
commit
bac6eb05b8
@ -41,8 +41,8 @@ DHTStatus::DHTStatus(QWidget *parent)
|
|||||||
|
|
||||||
statusDHT = new QLabel("<strong>" + tr("DHT") + ":</strong>", this );
|
statusDHT = new QLabel("<strong>" + tr("DHT") + ":</strong>", this );
|
||||||
statusDHT->setToolTip(tr("<p>Retroshare uses Bittorrent's DHT as a proxy for connexions. It does not \"store\" your IP in the DHT. \
|
statusDHT->setToolTip(tr("<p>Retroshare uses Bittorrent's DHT as a proxy for connexions. It does not \"store\" your IP in the DHT. \
|
||||||
Instead the DHT is used by your friends to reach you while processing standard DHT requests. \
|
Instead the DHT is used by your trusted nodes to reach you while processing standard DHT requests. \
|
||||||
The status bullet will turn green as soon as Retroshare gets a DHT response from one of your friends.</p>")) ;
|
The status bullet will turn green as soon as Retroshare gets a DHT response from one of your trusted nodes.</p>")) ;
|
||||||
hbox->addWidget(statusDHT);
|
hbox->addWidget(statusDHT);
|
||||||
|
|
||||||
dhtstatusLabel = new QLabel( this );
|
dhtstatusLabel = new QLabel( this );
|
||||||
|
@ -37,7 +37,7 @@ PeerStatus::PeerStatus(QWidget *parent)
|
|||||||
iconLabel->setPixmap(QPixmap(":/icons/avatar_grey_128.png").scaledToHeight(S,Qt::SmoothTransformation));
|
iconLabel->setPixmap(QPixmap(":/icons/avatar_grey_128.png").scaledToHeight(S,Qt::SmoothTransformation));
|
||||||
hbox->addWidget(iconLabel);
|
hbox->addWidget(iconLabel);
|
||||||
|
|
||||||
statusPeers = new QLabel( tr("Friends: 0/0"), this );
|
statusPeers = new QLabel( tr("Trusted nodes: 0/0"), this );
|
||||||
hbox->addWidget(statusPeers);
|
hbox->addWidget(statusPeers);
|
||||||
|
|
||||||
_compactMode = false;
|
_compactMode = false;
|
||||||
@ -51,10 +51,10 @@ void PeerStatus::getPeerStatus(unsigned int nFriendCount, unsigned int nOnlineCo
|
|||||||
/* set users/friends/network */
|
/* set users/friends/network */
|
||||||
|
|
||||||
if (statusPeers){
|
if (statusPeers){
|
||||||
statusPeers->setToolTip(tr("Online Friends/Total Friends") );
|
statusPeers->setToolTip(tr("Online Trusted nodes/Total trusted nodes") );
|
||||||
QString text;
|
QString text;
|
||||||
if (_compactMode) text = QString("%1/%2").arg(nOnlineCount).arg(nFriendCount);
|
if (_compactMode) text = QString("%1/%2").arg(nOnlineCount).arg(nFriendCount);
|
||||||
else text = QString("<strong>%1:</strong> %2/%3 ").arg(tr("Friends")).arg(nOnlineCount).arg(nFriendCount);
|
else text = QString("<strong>%1:</strong> %2/%3 ").arg(tr("Trusted nodes")).arg(nOnlineCount).arg(nFriendCount);
|
||||||
statusPeers -> setText(text);
|
statusPeers -> setText(text);
|
||||||
}
|
}
|
||||||
int S = QFontMetricsF(iconLabel->font()).height();
|
int S = QFontMetricsF(iconLabel->font()).height();
|
||||||
|
@ -42,7 +42,7 @@ TorStatus::TorStatus(QWidget *parent)
|
|||||||
hbox->setSpacing(6);
|
hbox->setSpacing(6);
|
||||||
|
|
||||||
statusTor = new QLabel("<strong>" + tr("Tor") + ":</strong>", this );
|
statusTor = new QLabel("<strong>" + tr("Tor") + ":</strong>", this );
|
||||||
statusTor->setToolTip(tr("<p>This version of Retroshare uses Tor to connect to your friends.</p>")) ;
|
statusTor->setToolTip(tr("<p>This version of Retroshare uses Tor to connect to your trusted nodes.</p>")) ;
|
||||||
hbox->addWidget(statusTor);
|
hbox->addWidget(statusTor);
|
||||||
|
|
||||||
torstatusLabel = new QLabel( this );
|
torstatusLabel = new QLabel( this );
|
||||||
|
Loading…
Reference in New Issue
Block a user