diff --git a/retroshare-gui/src/gui/connect/FriendRequest.cpp b/retroshare-gui/src/gui/connect/FriendRequest.cpp
index a64f98843..0e71082bf 100644
--- a/retroshare-gui/src/gui/connect/FriendRequest.cpp
+++ b/retroshare-gui/src/gui/connect/FriendRequest.cpp
@@ -89,62 +89,6 @@ void FriendRequest::load()
ui.avatar->setId(mId, false);
- //web of trust
- if (detail.trustLvl == GPGME_VALIDITY_ULTIMATE) {
- //trust is ultimate, it means it's one of our own keys
- ui.web_of_trust_label->setText(tr("Your trust in this peer is ultimate, it's probably a key you own."));
- ui.radioButton_trust_fully->hide();
- ui.radioButton_trust_marginnaly->hide();
- ui.radioButton_trust_never->hide();
- } else {
- ui.radioButton_trust_fully->show();
- ui.radioButton_trust_marginnaly->show();
- ui.radioButton_trust_never->show();
- if (detail.trustLvl == GPGME_VALIDITY_FULL) {
- ui.web_of_trust_label->setText(tr("Your trust in this peer is full."));
- ui.radioButton_trust_fully->setChecked(true);
- ui.radioButton_trust_fully->setIcon(QIcon(":/images/security-high-48.png"));
- ui.radioButton_trust_marginnaly->setIcon(QIcon(":/images/security-medium-off-48.png"));
- ui.radioButton_trust_never->setIcon(QIcon(":/images/security-low-off-48.png"));
- } else if (detail.trustLvl == GPGME_VALIDITY_MARGINAL) {
- ui.web_of_trust_label->setText(tr("Your trust in this peer is marginal."));
- ui.radioButton_trust_marginnaly->setChecked(true);
- ui.radioButton_trust_marginnaly->setIcon(QIcon(":/images/security-medium-48.png"));
- ui.radioButton_trust_never->setIcon(QIcon(":/images/security-low-off-48.png"));
- ui.radioButton_trust_fully->setIcon(QIcon(":/images/security-high-off-48.png"));
- } else if (detail.trustLvl == GPGME_VALIDITY_NEVER) {
- ui.web_of_trust_label->setText(tr("Your trust in this peer is none."));
- ui.radioButton_trust_never->setChecked(true);
- ui.radioButton_trust_never->setIcon(QIcon(":/images/security-low-48.png"));
- ui.radioButton_trust_fully->setIcon(QIcon(":/images/security-high-off-48.png"));
- ui.radioButton_trust_marginnaly->setIcon(QIcon(":/images/security-medium-off-48.png"));
- } else {
- ui.web_of_trust_label->setText(tr("Your trust in this peer is not set."));
-
- //we have to set up the set exclusive to false in order to uncheck it all
- ui.radioButton_trust_fully->setAutoExclusive(false);
- ui.radioButton_trust_marginnaly->setAutoExclusive(false);
- ui.radioButton_trust_never->setAutoExclusive(false);
-
- ui.radioButton_trust_fully->setChecked(false);
- ui.radioButton_trust_marginnaly->setChecked(false);
- ui.radioButton_trust_never->setChecked(false);
-
- ui.radioButton_trust_fully->setAutoExclusive(true);
- ui.radioButton_trust_marginnaly->setAutoExclusive(true);
- ui.radioButton_trust_never->setAutoExclusive(true);
-
- ui.radioButton_trust_never->setIcon(QIcon(":/images/security-low-off-48.png"));
- ui.radioButton_trust_fully->setIcon(QIcon(":/images/security-high-off-48.png"));
- ui.radioButton_trust_marginnaly->setIcon(QIcon(":/images/security-medium-off-48.png"));
- }
- }
-
- if (detail.hasSignedMe) {
- //ui.is_signing_me->setText(tr("Peer has authenticated me as a friend and did sign my GPG key"));
- } else {
- //ui.is_signing_me->setText(tr("Peer has not authenticated me as a friend and did not sign my GPG key"));
- }
}
void FriendRequest::applyDialog()
@@ -162,17 +106,6 @@ void FriendRequest::applyDialog()
}
}
- //check the GPG trustlvl
- if (ui.radioButton_trust_fully->isChecked() && detail.trustLvl != GPGME_VALIDITY_FULL) {
- //trust has changed to fully
- rsPeers->trustGPGCertificate(detail.id, GPGME_VALIDITY_FULL);
- } else if (ui.radioButton_trust_marginnaly->isChecked() && detail.trustLvl != GPGME_VALIDITY_MARGINAL) {
- rsPeers->trustGPGCertificate(detail.id, GPGME_VALIDITY_MARGINAL);
- } else if (ui.radioButton_trust_never->isChecked() && detail.trustLvl != GPGME_VALIDITY_NEVER) {
- rsPeers->trustGPGCertificate(detail.id, GPGME_VALIDITY_NEVER);
- }
-
-
makeFriend();
close();
}
diff --git a/retroshare-gui/src/gui/connect/FriendRequest.ui b/retroshare-gui/src/gui/connect/FriendRequest.ui
index f3e9dae6d..0fd0495b6 100644
--- a/retroshare-gui/src/gui/connect/FriendRequest.ui
+++ b/retroshare-gui/src/gui/connect/FriendRequest.ui
@@ -6,8 +6,8 @@
0
0
- 372
- 355
+ 404
+ 303
@@ -91,6 +91,162 @@ p, li { white-space: pre-wrap; }
+ -
+
+
+ QFrame::NoFrame
+
+
+ QFrame::Plain
+
+
+
-
+
+
+
+ 96
+ 96
+
+
+
+
+ 96
+ 96
+
+
+
+
+ -
+
+
+ Peer Info
+
+
+
-
+
+
+ Name
+
+
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+ Peer ID
+
+
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+ RetroShare ID
+
+
+
+ -
+
+
+ true
+
+
+
+ 0
+ 0
+
+
+
+
+ 16777215
+ 20
+
+
+
+ Qt::ScrollBarAlwaysOff
+
+
+ Qt::ScrollBarAlwaysOff
+
+
+ true
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 2
+
+
+
+
+ -
+
+
+
+ 12
+
+
+
+
+border: 2px solid #CCCCCC;
+border-radius:6px;
+background: white;
+
+
+
+ You have a friend request.
+
+
+
+ -
+
+
-
+
+
+ Sign GPG Key
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
+
+
-
@@ -191,234 +347,6 @@ border-image: url(:/images/btn_blue_hover.png) 4;
- -
-
-
- QFrame::NoFrame
-
-
- QFrame::Plain
-
-
-
-
-
-
-
- 96
- 96
-
-
-
-
- 96
- 96
-
-
-
-
- -
-
-
- Peer Info
-
-
-
-
-
-
- Name
-
-
-
- -
-
-
- true
-
-
-
- -
-
-
- Peer ID
-
-
-
- -
-
-
- true
-
-
-
- -
-
-
- RetroShare ID
-
-
-
- -
-
-
- true
-
-
-
- 0
- 0
-
-
-
-
- 16777215
- 20
-
-
-
- Qt::ScrollBarAlwaysOff
-
-
- Qt::ScrollBarAlwaysOff
-
-
- true
-
-
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
- Your trust in this peer is:
-
-
- true
-
-
-
- -
-
-
- Sign GPG Key
-
-
-
- -
-
-
-
- 125
- 16777215
-
-
-
- None
-
-
-
- :/images/security-low-48.png:/images/security-low-48.png
-
-
-
- 48
- 48
-
-
-
-
- -
-
-
-
- 140
- 16777215
-
-
-
- Marginal
-
-
-
- :/images/security-medium-48.png:/images/security-medium-48.png
-
-
-
- 48
- 48
-
-
-
-
- -
-
-
-
- 130
- 16777215
-
-
-
- Full
-
-
-
- :/images/security-high-48.png:/images/security-high-48.png
-
-
-
- 48
- 48
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 2
-
-
-
-
- -
-
-
-
- 12
-
-
-
-
-border: 2px solid #CCCCCC;
-border-radius:6px;
-background: white;
-
-
-
- You have a friend request.
-
-
-
-
-
-
@@ -437,6 +365,8 @@ background: white;
+
+