diff --git a/retroshare-gui/src/gui/FriendRecommendDialog.cpp b/retroshare-gui/src/gui/FriendRecommendDialog.cpp index fde8c2905..85827e812 100644 --- a/retroshare-gui/src/gui/FriendRecommendDialog.cpp +++ b/retroshare-gui/src/gui/FriendRecommendDialog.cpp @@ -39,6 +39,9 @@ FriendRecommendDialog::FriendRecommendDialog() : ui->setupUi(this); setAttribute(Qt::WA_DeleteOnClose, true); + + ui->headerFrame->setHeaderImage(QPixmap(":/images/user/friends64.png")); + ui->headerFrame->setHeaderText(tr("Friend Recommendations")); Settings->loadWidgetInformation(this); diff --git a/retroshare-gui/src/gui/FriendRecommendDialog.ui b/retroshare-gui/src/gui/FriendRecommendDialog.ui index e97789c2d..c2e19d137 100644 --- a/retroshare-gui/src/gui/FriendRecommendDialog.ui +++ b/retroshare-gui/src/gui/FriendRecommendDialog.ui @@ -20,56 +20,88 @@ true - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - - - - - - - Message: + + + 0 + + + 0 + + + + + QFrame::NoFrame + + + QFrame::Raised - - - - - 0 - 0 - + + + + QFrame::StyledPanel - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + QFrame::Raised + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + + + + + + + 0 + 0 + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + Message: + + + + + + messageEdit + buttonBox + label @@ -81,6 +113,12 @@
gui/common/FriendSelectionWidget.h
1 + + HeaderFrame + QFrame +
gui/common/headerframe.h
+ 1 +
diff --git a/retroshare-gui/src/gui/connect/ConnectProgressDialog.ui b/retroshare-gui/src/gui/connect/ConnectProgressDialog.ui index e8ab030c3..e1fc3ad73 100644 --- a/retroshare-gui/src/gui/connect/ConnectProgressDialog.ui +++ b/retroshare-gui/src/gui/connect/ConnectProgressDialog.ui @@ -18,6 +18,12 @@ :/images/rstray3.png:/images/rstray3.png
+ + 0 + + + 0 + @@ -262,12 +268,12 @@ <!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:'Lucida Grande'; font-size:13pt; 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;">This Widget shows the progress of your connection to your new peer.</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">It is helpful for problem-solving.</p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If you are an expert RS user, or trust that RS will do the right thing</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">you can close it.</p></body></html> +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; 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;"><span style=" font-family:'Lucida Grande'; font-size:13pt;">This Widget shows the progress of your connection to your new peer.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande'; font-size:13pt;">It is helpful for problem-solving.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:13pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande'; font-size:13pt;">If you are an expert RS user, or trust that RS will do the right thing</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande'; font-size:13pt;">you can close it.</span></p></body></html> diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index 31bee21c5..071265593 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -470,6 +470,7 @@ images/user/remove_user24.png images/user/deny_user48.png images/user/friends24.png + images/user/friends64.png images/user/friends24_notify.png images/user/friend_suggestion16.png images/user/identity16.png