From ca9d3d38d187fb9e1d6c501c3b164ba4bec383ec Mon Sep 17 00:00:00 2001 From: joss17 Date: Tue, 16 Mar 2010 18:53:52 +0000 Subject: [PATCH] Added info and consistency for gpg sign and trust signification git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2565 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/NetworkDialog.cpp | 2 +- retroshare-gui/src/gui/TrustView.cpp | 10 ++-- .../src/gui/connect/ConfCertDialog.cpp | 4 ++ .../src/gui/connect/ConfCertDialog.ui | 54 +++++++++++++------ 4 files changed, 47 insertions(+), 23 deletions(-) diff --git a/retroshare-gui/src/gui/NetworkDialog.cpp b/retroshare-gui/src/gui/NetworkDialog.cpp index b3924630d..0efea789f 100644 --- a/retroshare-gui/src/gui/NetworkDialog.cpp +++ b/retroshare-gui/src/gui/NetworkDialog.cpp @@ -149,7 +149,7 @@ NetworkDialog::NetworkDialog(QWidget *parent) ui.unvalidGPGkeyWidget->sortItems( 1, Qt::AscendingOrder ); //ui.networkTab->addTab(new NetworkView(),QString(tr("Network View"))); - ui.networkTab->addTab(new TrustView(),QString(tr("Trust matrix"))); + ui.networkTab->addTab(new TrustView(),QString(tr("Authentication matrix"))); QString version = "-"; std::map::iterator vit; diff --git a/retroshare-gui/src/gui/TrustView.cpp b/retroshare-gui/src/gui/TrustView.cpp index 5e940cae6..aeb407576 100644 --- a/retroshare-gui/src/gui/TrustView.cpp +++ b/retroshare-gui/src/gui/TrustView.cpp @@ -199,7 +199,7 @@ void TrustView::update() if(i_ji == NULL) { i_ij->setBackgroundColor(Qt::yellow) ; - i_ij->setToolTip(trustTableTW->horizontalHeaderItem(i)->text() + tr(" is trusted (one way) by " )+trustTableTW->verticalHeaderItem(j)->text()) ; + i_ij->setToolTip(trustTableTW->horizontalHeaderItem(i)->text() + tr(" is athenticated (one way) by " )+trustTableTW->verticalHeaderItem(j)->text()) ; i_ij->setText(tr("Half")) ; } else @@ -207,22 +207,22 @@ void TrustView::update() if(i==j) { i_ij->setBackgroundColor(Qt::red) ; - i_ij->setToolTip(trustTableTW->horizontalHeaderItem(i)->text() + tr(" trusts himself") ) ; + i_ij->setToolTip(trustTableTW->horizontalHeaderItem(i)->text() + tr(" athenticated himself") ) ; } else { i_ij->setBackgroundColor(Qt::green) ; - i_ij->setToolTip(trustTableTW->horizontalHeaderItem(i)->text() + " and " +trustTableTW->verticalHeaderItem(j)->text() + tr(" trust each others") ) ; + i_ij->setToolTip(trustTableTW->horizontalHeaderItem(i)->text() + " and " +trustTableTW->verticalHeaderItem(j)->text() + tr(" athenticated each others") ) ; i_ij->setText(tr("Full")) ; } } } } for(int i=0;irowCount();++i) - trustTableTW->verticalHeaderItem(i)->setToolTip(trustTableTW->verticalHeaderItem(i)->text()+ tr(" is trusted by ") + QString::number(ni[i]) + tr(" peers, including him(her)self.")) ; + trustTableTW->verticalHeaderItem(i)->setToolTip(trustTableTW->verticalHeaderItem(i)->text()+ tr(" is athenticated by ") + QString::number(ni[i]) + tr(" peers, including him(her)self.")) ; for(int j=0;jcolumnCount();++j) - trustTableTW->horizontalHeaderItem(j)->setToolTip(trustTableTW->horizontalHeaderItem(j)->text()+ tr(" trusts ") + QString::number(nj[j]) + tr(" peers, including him(her)self.")) ; + trustTableTW->horizontalHeaderItem(j)->setToolTip(trustTableTW->horizontalHeaderItem(j)->text()+ tr(" athenticated ") + QString::number(nj[j]) + tr(" peers, including him(her)self.")) ; } diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp index 1d5d9c84a..5276fadde 100644 --- a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp +++ b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp @@ -174,6 +174,8 @@ void ConfCertDialog::loadDialog() } if (detail.gpg_id == rsPeers->getGPGOwnId()) { + ui.gpgSignInfoBrowser->hide(); + ui.gpgTrustInfoBrowser->hide(); ui.make_friend_button->hide(); ui.signGPGKeyCheckBox->hide(); ui.signKeyButton->hide(); @@ -188,6 +190,8 @@ void ConfCertDialog::loadDialog() ui.signersBox->setTitle(tr("Your key is signed by : ")); } else { + ui.gpgSignInfoBrowser->show(); + ui.gpgTrustInfoBrowser->show(); ui.make_friend_button->show(); ui.signGPGKeyCheckBox->show(); ui.signKeyButton->show(); diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.ui b/retroshare-gui/src/gui/connect/ConfCertDialog.ui index 7bc25a3d8..59082adc7 100644 --- a/retroshare-gui/src/gui/connect/ConfCertDialog.ui +++ b/retroshare-gui/src/gui/connect/ConfCertDialog.ui @@ -7,14 +7,14 @@ 0 0 505 - 527 + 613 Peer Details - + :/images/rstray3.png:/images/rstray3.png @@ -25,7 +25,7 @@ - + :/images/peerdetails_16x16.png:/images/peerdetails_16x16.png @@ -246,7 +246,7 @@ - + :/images/security-high-16.png:/images/security-high-16.png @@ -274,10 +274,10 @@ - None + None - + :/images/security-low-48.png:/images/security-low-48.png @@ -297,10 +297,10 @@ - Marginal + Marginal - + :/images/security-medium-48.png:/images/security-medium-48.png @@ -320,10 +320,10 @@ - Full + Full - + :/images/security-high-48.png:/images/security-high-48.png @@ -336,6 +336,17 @@ + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The trust settings refers to the gnupg web of trust mecanism. This trust means how you trust your friends when he is signing other gpg keys. If you set your trust to "full", it means that when your friend sign a key, this key will be shown as validated by the web of trust in the network view.</p></body></html> + + + @@ -379,6 +390,17 @@ + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">You should sign a key when you are sure that the person who claims ownership on this key is the real owner of the key. When you are sure that the name of the key owner is the real name of the emmitter of this key, you may sign it to confirm it. Signing the key will be public unless public discovery is not setted. This means you friends can check if you did sign someone's key.</p></body></html> + + + @@ -393,7 +415,7 @@ Sign GPG key - + :/images/view-certificate-sign-32.png:/images/view-certificate-sign-32.png @@ -413,7 +435,7 @@ SignGPG Key - + :/images/view-certificate-sign-48.png:/images/view-certificate-sign-48.png @@ -446,7 +468,7 @@ Deny Friend - + :/images/user/deny_user48.png:/images/user/deny_user48.png @@ -466,7 +488,7 @@ Make Friend - + :/images/user/add_user48.png:/images/user/add_user48.png @@ -537,8 +559,6 @@ - - - +