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

* minor changes required to get the gui working with PGP,

Browse source 
* improved NetworkView to show signatures, and friends.

I expect these will be cleaned up later - these were purely functional so i could test pgp.

Enable using RS_USE_PGPSSL in rsiface/rsinit.h
   


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1266 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2009-05-23 15:13:01 +00:00
parent 5f28f76b07
commit 100cf75439
19 changed files with 695 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,6 +31,11 @@
#include "connect/ConnectDialog.h"
#include "rsiface/rsiface.h"
#include "rsiface/rspeers.h"
/* for GPGME */
#include "rsiface/rsinit.h"
#include <gpgme.h>
#include <sstream>
#include <QTimer>
@ -180,6 +185,7 @@ void NetworkDialog::connecttreeWidgetCostumPopupMenu( QPoint point )
return ;
if(peer_id != rsPeers->getOwnId())
{
if(detail.state & RS_PEER_STATE_FRIEND)
{
denyFriendAct = new QAction(QIcon(IMAGE_DENIED), tr( "Deny friend" ), this );
@ -205,6 +211,7 @@ void NetworkDialog::connecttreeWidgetCostumPopupMenu( QPoint point )
}
#endif
}
}
peerdetailsAct = new QAction(QIcon(IMAGE_PEERDETAILS), tr( "Peer details..." ), this );
connect( peerdetailsAct , SIGNAL( triggered() ), this, SLOT( peerdetails() ) );
@ -446,11 +453,19 @@ void NetworkDialog::insertConnect()
for(int k=0;k<8;++k)
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)
{
backgrndcolor=Qt::cyan;
item -> setIcon(0,(QIcon(IMAGE_DENIED)));
}
#else
else if (detail.trustLvl > RS_TRUST_LVL_MARGINAL)
{
backgrndcolor=Qt::cyan;
item -> setIcon(0,(QIcon(IMAGE_DENIED)));
}
#endif
else if (detail.lastConnect < 10000) /* 3 hours? */
{
backgrndcolor=Qt::yellow;