From fcb7b6c3404701039fdc83c5a9a35898350e1608 Mon Sep 17 00:00:00 2001 From: defnax Date: Tue, 11 Nov 2014 20:12:53 +0000 Subject: [PATCH] * Added to change dynamicly the share key info description. * Added default stylesheet for the info label. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7673 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- .../src/gui/gxs/GxsGroupShareKey.cpp | 7 ++--- .../src/gui/gxs/GxsGroupShareKey.ui | 26 ++++++++++++++++--- .../src/gui/qss/stylesheet/Standard.qss | 7 +++++ 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/retroshare-gui/src/gui/gxs/GxsGroupShareKey.cpp b/retroshare-gui/src/gui/gxs/GxsGroupShareKey.cpp index dcbd9af12..0f378e6af 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupShareKey.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupShareKey.cpp @@ -79,14 +79,14 @@ void GroupShareKey::setTyp() ui->headerFrame->setHeaderImage(QPixmap(":/images/channels.png")); ui->headerFrame->setHeaderText(tr("Share Channel")); - - + ui->sharekeyinfo_label->setText(tr("You can let your friends know about your Channel by sharing it with them. Select the Friends with which you want to Share your Channel.")); } else if(mGrpType == FORUM_KEY_SHARE) { ui->headerFrame->setHeaderImage(QPixmap(":/images/konversation64.png")); ui->headerFrame->setHeaderText(tr("Share Forum")); + ui->sharekeyinfo_label->setText(tr("You can let your friends know about your Forum by sharing it with them. Select the Friends with which you want to Share your Forum.")); } else if (mGrpType == POSTED_KEY_SHARE) @@ -95,7 +95,8 @@ void GroupShareKey::setTyp() return; ui->headerFrame->setHeaderImage(QPixmap(":/images/posted_64.png")); - ui->headerFrame->setHeaderText(tr("Share Posted")); + ui->headerFrame->setHeaderText(tr("Share Posted")); + ui->sharekeyinfo_label->setText(tr("You can let your friends know about your Posted by sharing it with them. Select the Friends with which you want to Share your Posted.")); } else diff --git a/retroshare-gui/src/gui/gxs/GxsGroupShareKey.ui b/retroshare-gui/src/gui/gxs/GxsGroupShareKey.ui index 306347100..ada400951 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupShareKey.ui +++ b/retroshare-gui/src/gui/gxs/GxsGroupShareKey.ui @@ -6,12 +6,12 @@ 0 0 - 472 + 526 347 - Share Channel + Share @@ -134,9 +134,27 @@ - + + + + 11 + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + - Select the Friends with which you want to Share your Channel. + You can let your friends know about your Channel by sharing it with them. +Select the Friends with which you want to Share your Channel. + + + true diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index efaa32c71..f36ad64ca 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -563,3 +563,10 @@ PostedItem QLabel#notes { border: 2px solid #CCCCCC; border-radius: 10px } + +QLabel#sharekeyinfo_label{ + border: 1px solid #DCDC41; + border-radius: 6px; + background: #FFFFD7; + background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2); +}