diff --git a/retroshare-gui/src/gui/toaster/FriendRequestToaster.cpp b/retroshare-gui/src/gui/toaster/FriendRequestToaster.cpp index 88697cbac..96ed683f6 100644 --- a/retroshare-gui/src/gui/toaster/FriendRequestToaster.cpp +++ b/retroshare-gui/src/gui/toaster/FriendRequestToaster.cpp @@ -20,6 +20,7 @@ #include "FriendRequestToaster.h" #include "gui/FriendsDialog.h" #include "gui/connect/FriendRequest.h" +#include "util/WidgetBackgroundImage.h" #include @@ -41,18 +42,21 @@ FriendRequestToaster::FriendRequestToaster(const std::string &gpgId, const QStri ui.friendrequestButton->setEnabled(false); } connect(ui.closeButton, SIGNAL(clicked()), SLOT(hide())); + + QString peerName = QString::fromUtf8(details.name.c_str()); /* set informations */ ui.avatarWidget->setFrameType(AvatarWidget::NORMAL_FRAME); if (knownPeer) { - ui.nameLabel->setText(QString::fromUtf8(details.name.c_str())); - ui.messageLabel->setText(tr("wants to be friend with you on RetroShare")); + ui.messageLabel->setText( peerName + " " + tr("wants to be friend with you on RetroShare")); ui.avatarWidget->setDefaultAvatar(":/images/avatar_request.png"); } else { - ui.nameLabel->setText(sslName); - ui.messageLabel->setText(tr("Unknown (Incoming) Connect Attempt")); + ui.messageLabel->setText( sslName + " " + tr("Unknown (Incoming) Connect Attempt")); ui.avatarWidget->setDefaultAvatar(":/images/avatar_request_unknown.png"); } + + WidgetBackgroundImage::setBackgroundImage(ui.windowFrame, ":images/toaster/backgroundtoaster.png", WidgetBackgroundImage::AdjustNone); + } void FriendRequestToaster::friendrequestButtonSlot() diff --git a/retroshare-gui/src/gui/toaster/FriendRequestToaster.ui b/retroshare-gui/src/gui/toaster/FriendRequestToaster.ui index e9253c8b6..7e05a9f49 100644 --- a/retroshare-gui/src/gui/toaster/FriendRequestToaster.ui +++ b/retroshare-gui/src/gui/toaster/FriendRequestToaster.ui @@ -50,7 +50,7 @@ 6 - 0 + 2 6 @@ -87,20 +87,6 @@ - - - - - 9 - 75 - true - - - - Name - - - @@ -139,6 +125,20 @@ + + + + + 9 + 75 + true + + + + Friend Request + + + @@ -150,7 +150,7 @@ 4 - 4 + 6 2 @@ -158,7 +158,7 @@ 3 - + @@ -174,26 +174,34 @@ - - - - - 218 - 45 - - - - true - - - - + - Accept Friend Request + Confirm Friend Request + + + + + + + + 218 + 35 + + + + + 11 + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true