diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp index a9f93584a..cb839daa5 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp @@ -322,8 +322,8 @@ void GxsGroupDialog::setupReadonly() //ui.groupLogo->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_ICON)); ui.addLogoButton->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_ICON)); - ui.groupDesc->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_DESCRIPTION)); - ui.groupDescLabel->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_DESCRIPTION)); + ui.groupDesc->setReadOnly(mReadonlyFlags & GXS_GROUP_FLAGS_DESCRIPTION); + //ui.groupDescLabel->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_DESCRIPTION)); ui.distribGroupBox->setEnabled(!(mReadonlyFlags & GXS_GROUP_FLAGS_DISTRIBUTION)); @@ -367,6 +367,7 @@ void GxsGroupDialog::updateFromExistingMeta(const QString &description) /* setup name */ ui.groupName->setText(QString::fromUtf8(mGrpMeta.mGroupName.c_str())); + ui.headerFrame->setHeaderText(QString::fromUtf8(mGrpMeta.mGroupName.c_str())); /* set description */ ui.groupDesc->setPlainText(description); diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui index 1d0a4ff93..7eb95077e 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui @@ -7,14 +7,23 @@ 0 0 695 - 588 + 542 Create New - + + 0 + + + 0 + + + 0 + + 0 @@ -41,7 +50,16 @@ 0 - + + 4 + + + 4 + + + 4 + + 4 @@ -96,7 +114,11 @@ - + + + Set a descriptive title here + + @@ -105,7 +127,16 @@ 9 - + + 3 + + + 3 + + + 3 + + 3 @@ -205,7 +236,16 @@ - + + 0 + + + 0 + + + 0 + + 0 @@ -249,20 +289,6 @@ - - - - - - Description - - - - - - - - @@ -272,7 +298,16 @@ 0 - + + 4 + + + 4 + + + 4 + + 4 @@ -315,7 +350,16 @@ 0 - + + 4 + + + 4 + + + 4 + + 4 @@ -351,7 +395,16 @@ 0 - + + 4 + + + 4 + + + 4 + + 4 @@ -486,6 +539,26 @@ + + + + + + + Description + + + + + + + Set a descriptive description here + + + + + + @@ -514,6 +587,11 @@
gui/common/FriendSelectionWidget.h
1 + + MimeTextEdit + QTextEdit +
gui/common/MimeTextEdit.h
+
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.cpp index 190b48001..c4d9a87b2 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.cpp +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.cpp @@ -227,6 +227,8 @@ void GxsChannelPostsWidget::insertChannelDetails(const RsGxsChannelGroup &group) chanImage = QPixmap(CHAN_DEFAULT_IMAGE); } ui->logoLabel->setPixmap(chanImage); + + ui->subscribersLabel->setText(QString::number( group.mMeta.mPop)) ; if (group.mMeta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_PUBLISH) { diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.ui b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.ui index 7b3ba2db6..bf72b74d7 100644 --- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.ui +++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidget.ui @@ -14,16 +14,7 @@ 4 - - 0 - - - 0 - - - 0 - - + 0 @@ -35,16 +26,7 @@ QFrame::Sunken - - 4 - - - 4 - - - 4 - - + 4 @@ -121,11 +103,46 @@ Subscribe + + + :/images/RSS_004_32.png:/images/RSS_004_32.png + + + + 16 + 16 + + + + Qt::ToolButtonTextBesideIcon + true + + + + + 30 + 0 + + + + Subscribers + + + + + + + + + Qt::AlignCenter + + + diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index d2158b52e..5cd7d1049 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -1,6 +1,7 @@ images/add_chat24.png + images/RSS_004_32.png images/mail-encrypted-full.png images/decrypt-mail.png images/inbox_22.png diff --git a/retroshare-gui/src/gui/images/RSS_004_32.png b/retroshare-gui/src/gui/images/RSS_004_32.png new file mode 100644 index 000000000..c6abd93dc Binary files /dev/null and b/retroshare-gui/src/gui/images/RSS_004_32.png differ diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index 316746d10..1f585c272 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -579,3 +579,9 @@ QLabel#sharekeyinfo_label{ background: #FFFFD7; background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2); } + +QLabel#subscribersLabel{ + border: 1px solid #CCCCCC; + border-radius: 6px; + +} \ No newline at end of file