diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
index 60965c846..372ab63c0 100755
--- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
+++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
@@ -275,6 +275,8 @@ void ConnectFriendWizard::initializePage(int id)
case Page_FriendRequest:
{
std::cerr << "Friend request page id : " << peerDetails.id << "; gpg_id : " << peerDetails.gpg_id << std::endl;
+
+ setPixmap(QWizard::LogoPixmap, QPixmap(":/images/user/user_request48.png"));
//set the radio button to sign the GPG key
if (peerDetails.accept_connection && !peerDetails.ownsign) {
@@ -305,6 +307,8 @@ void ConnectFriendWizard::initializePage(int id)
ui->fr_nameEdit->setText(QString::fromUtf8(peerDetails.name.c_str()));
ui->fr_emailEdit->setText(QString::fromUtf8(peerDetails.email.c_str()));
ui->fr_locationEdit->setText(QString::fromUtf8(peerDetails.location.c_str()));
+
+ ui->fr_label->setText(tr("You have a friend request from") + " " + QString::fromUtf8(peerDetails.name.c_str()));
fillGroups(this, ui->fr_groupComboBox, groupId);
}
diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui b/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
index 10c7505a5..7ce13d926 100644
--- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
+++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
@@ -411,6 +411,9 @@
false
+
+ false
+
@@ -526,142 +529,170 @@
ConnectFriendWizard::Page_FriendRequest
-
- -
-
-
-
- 12
-
-
+
+
+ 6
+
+
+ 6
+
+
-
+
-
+ QFrame#frame{
border: 2px solid #CCCCCC;
border-radius:6px;
background: white;
+}
+
+
+ QFrame::StyledPanel
+
+
+ QFrame::Raised
+
+
+
-
+
+
+
+ 12
+
+
+
+
-
-
- You have a friend request .
-
-
-
- -
-
-
-
- 96
- 96
-
-
-
-
- 96
- 96
-
-
-
-
- -
-
-
- Peer details
-
-
-
- QFormLayout::AllNonFixedFieldsGrow
-
-
-
-
+
- Name:
+ You have a friend request .
- -
-
-
- Name
-
-
-
- -
-
-
- Email:
-
-
-
- -
-
-
- Location:
-
-
-
- -
-
-
- Location
-
-
-
- -
-
-
- Email
-
-
-
-
-
-
- -
-
-
- Options
-
-
-
-
-
-
- Add friend to group:
-
-
-
- -
-
-
-
-
-
- Authenticate friend (Sign GPG Key)
+
+
+
+ 96
+ 96
+
+
+
+
+ 96
+ 96
+
+
+
+
+border: 2px solid #CCCCCC;
+border-radius:6px;
+background: white;
- -
-
-
- Add as friend to connect with
+
-
+
+
+ Peer details
+
+
+ QFormLayout::AllNonFixedFieldsGrow
+
+
-
+
+
+ Name:
+
+
+
+ -
+
+
+ Name
+
+
+
+ -
+
+
+ Email:
+
+
+
+ -
+
+
+ Location:
+
+
+
+ -
+
+
+ Location
+
+
+
+ -
+
+
+ Email
+
+
+
+
+ -
+
+
+ Options
+
+
+
-
+
+
+ Add friend to group:
+
+
+
+ -
+
+
+ -
+
+
+ Authenticate friend (Sign GPG Key)
+
+
+
+ -
+
+
+ Add as friend to connect with
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 488
+ 118
+
+
+
+
- -
-
-
- Qt::Vertical
-
-
-
- 488
- 118
-
-
-
-
@@ -844,6 +875,7 @@ background: white;
+