Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-06 08:05:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Updated rspeers.h to match libretroshare.

Browse source 
* switched pgp password to encrypted entry
 * corrected NetworkDialog / NetworkView to use validLvl instead of trustLvl.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1271 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2009-05-25 11:45:07 +00:00
parent d4b52a59e5
commit 42d2b62420
4 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
retroshare-gui/src/gui/NetworkDialog.cpp
View file

@ -195,7 +195,7 @@ void NetworkDialog::connecttreeWidgetCostumPopupMenu( QPoint point )
}
else // not a friend
{
if(detail.trustLvl > RS_TRUST_LVL_MARGINAL) // it's a denied old friend.
if(detail.validLvl > RS_TRUST_LVL_MARGINAL) // it's a denied old friend.
makefriendAct = new QAction(QIcon(IMAGE_MAKEFRIEND), tr( "Accept friend" ), this );
else
makefriendAct = new QAction(QIcon(IMAGE_MAKEFRIEND), tr( "Make friend" ), this );
@ -203,7 +203,7 @@ void NetworkDialog::connecttreeWidgetCostumPopupMenu( QPoint point )
connect( makefriendAct , SIGNAL( triggered() ), this, SLOT( makeFriend() ) );
contextMnu.addAction( makefriendAct);
#ifdef TODO
if(detail.trustLvl > RS_TRUST_LVL_MARGINAL) // it's a denied old friend.
if(detail.validLvl > RS_TRUST_LVL_MARGINAL) // it's a denied old friend.
{
deleteCertAct = new QAction(QIcon(IMAGE_PEERDETAILS), tr( "Delete certificate" ), this );
connect( deleteCertAct, SIGNAL( triggered() ), this, SLOT( deleteCert() ) );
@ -454,7 +454,7 @@ void NetworkDialog::insertConnect()
item -> setToolTip(k,QString::fromStdString(detail.name) + QString(tr(" is trusting you. \nRight-click and select 'make friend' to be able to connect."))) ;
}
#ifdef RS_USE_PGPSSL
else if (detail.trustLvl > GPGME_VALIDITY_MARGINAL)
else if (detail.validLvl > GPGME_VALIDITY_MARGINAL)
{
backgrndcolor=Qt::cyan;
item -> setIcon(0,(QIcon(IMAGE_DENIED)));