Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-26 07:59:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

* 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
Show Stats 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 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 ); makefriendAct = new QAction(QIcon(IMAGE_MAKEFRIEND), tr( "Accept friend" ), this );
else else
makefriendAct = new QAction(QIcon(IMAGE_MAKEFRIEND), tr( "Make friend" ), this ); 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() ) ); connect( makefriendAct , SIGNAL( triggered() ), this, SLOT( makeFriend() ) );
contextMnu.addAction( makefriendAct); contextMnu.addAction( makefriendAct);
#ifdef TODO #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 ); deleteCertAct = new QAction(QIcon(IMAGE_PEERDETAILS), tr( "Delete certificate" ), this );
connect( deleteCertAct, SIGNAL( triggered() ), this, SLOT( deleteCert() ) ); 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."))) ; 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 #ifdef RS_USE_PGPSSL
else if (detail.trustLvl > GPGME_VALIDITY_MARGINAL) else if (detail.validLvl > GPGME_VALIDITY_MARGINAL)
{ {
backgrndcolor=Qt::cyan; backgrndcolor=Qt::cyan;
item -> setIcon(0,(QIcon(IMAGE_DENIED))); item -> setIcon(0,(QIcon(IMAGE_DENIED)));

2
retroshare-gui/src/gui/NetworkView.cpp
View File

@ -170,7 +170,7 @@ void NetworkView::insertPeers()
{ {
continue; continue;
} }
switch(detail.trustLvl) switch(detail.validLvl)
{ {
default: default:
case GPGME_VALIDITY_UNKNOWN: case GPGME_VALIDITY_UNKNOWN:

6
retroshare-gui/src/gui/StartDialog.ui
View File

@ -708,7 +708,11 @@ p, li { white-space: pre-wrap; }
<widget class="QComboBox" name="loadName" /> <widget class="QComboBox" name="loadName" />
</item> </item>
<item row="5" column="0" colspan="2" > <item row="5" column="0" colspan="2" >
<widget class="QLineEdit" name="loadGPGPasswd" /> <widget class="QLineEdit" name="loadGPGPasswd" >
<property name="echoMode" >
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item> </item>
<item row="4" column="0" > <item row="4" column="0" >
<widget class="QLabel" name="label_5" > <widget class="QLabel" name="label_5" >

1
retroshare-gui/src/rsiface/rspeers.h
View File

@ -83,6 +83,7 @@ class RsPeerDetails
std::list<std::string> signers; std::list<std::string> signers;
uint32_t trustLvl; uint32_t trustLvl;
uint32_t validLvl;
bool ownsign; /* we have signed certificate */ bool ownsign; /* we have signed certificate */
bool trusted; /* we trust their signature on others */ bool trusted; /* we trust their signature on others */