From 83ecc4e8b4a410bc6f5a8846ac4f461483230f58 Mon Sep 17 00:00:00 2001 From: defnax Date: Thu, 25 Dec 2014 17:05:26 +0000 Subject: [PATCH] Added PlaceHolderText for Name/Description (gxs Group Dialog) Set the description Text field to read only for the Show Mode Display at Header Channel name (Show Mode) Display Subscribers on Channels git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7793 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp | 5 +- retroshare-gui/src/gui/gxs/GxsGroupDialog.ui | 124 ++++++++++++++---- .../gui/gxschannels/GxsChannelPostsWidget.cpp | 2 + .../gui/gxschannels/GxsChannelPostsWidget.ui | 57 +++++--- retroshare-gui/src/gui/images.qrc | 1 + retroshare-gui/src/gui/images/RSS_004_32.png | Bin 0 -> 5691 bytes .../src/gui/qss/stylesheet/Standard.qss | 6 + 7 files changed, 150 insertions(+), 45 deletions(-) create mode 100644 retroshare-gui/src/gui/images/RSS_004_32.png 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 0000000000000000000000000000000000000000..c6abd93dcc46cb80fbde3a7ba71f8f3ff2a72da3 GIT binary patch literal 5691 zcmV-B7R2d^P)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000YSNkl;V7!`6d7W z0NVfc^Z)<`Iobd3^7a3u$ou~WG~53I03rnd5rFRiTP^7T{}TED0{z_N00bZm00oKx z0RQRk*8l(j|NjKR!3qIU6oBFX+^$J1=9)>71q)?qGfPjPyqJae@E%GQ);1_B7N)s{ z808$_C(T(2A`H@}tyewFpc@>c;!KjNIQ_)2hG?fr#`fVDHf~(13g$UvY96bP<_*G+ zMSf*Ri{(KD{c;hQ!0GM&ftx(thy=009601i?E>15p%!;s4xuCP)kc z$skzSrqDtgA&rHk6WoB{9>m4CfCx5%qF^tgm0(hZfB{7rMIFpMGBfx1eG=}(=pqAg zC~G}-9hnMxj#@O&aS;Q?z9)BU-KR+jfL2QX@M9a*M_2Q|z1~*Pt+E8;dyHeBpsp$A z=|j*6#i&2O8LPwXOgXyB8LTIqPK2=6M9F`R^=fQK*dO{_?0&Lx*3dYNDPC(*%1z!$|^h)qW!{)vEm(z0nGx zvdB-0Dciyl{IfvstWgDF0EXXhW_HgdF^7a~>>{WE34$PkNP7JNUK+tdf?#21VdY=Y zNFDEY}&J=zQ)6-td$;sg5rrf$~bnkbD_nY!h;IPnD^ zrWkoV#<>q~xp!b6Jb#7Vog{ATpq)OZ9c9y2fOb7> zm*{pM=?pMgOVEH*6cjM#wUkbz>(Q0=d8NFeh875DM50>|$R7yc?se~vL3hqUyE=ACd|A3;n5JV{A z7lK99MFX}_L_w>eRBaI}32A3C)A_jb-uvG7xEL*p&;I-#&Nq#M#qG45*6#?;NE<>!FFD~v&z*>^A#4xf z;?;s9Pt+mGQ#7oh0izO*5_{}^%NrLQ?Vcm`8GC0+jxXjszue|>JL2~NnAC7#(<2p7 zapx34?BQ#F>SSm}b2UaYRi0d}a^?_xyjfreJ>FSQpeQ*0d4n%552$o9{LLP;N8l$O ziV@$G)S#0Fdr!pLzFRzX(DL|PN^Qy_uS}q4TfBGpS7tXC2)RQlLNEcrpE4?nMhX^W z0-n7#hrB4PymcFTIr_p5M>p!&`ZUvN2epbOprU}EHc&z+36!V_Jl*J`uL?h$f#nTL zYh?L)3u@|k=|C5aK!XPY={@m+Qyc3ou{ ze!jK#+WVZd=gcITBx93C1Ey(mQ?WWz+CmGt&{o91(pC|?sBJBRc%>KKSTBWAylDkd zMD!wvwDbqGB(*}RQd=pdlqNPbjAO`j@-uVhoHP6Ey?#C~_UX(B;=WpYUwrSoHtTzz zZ|!hl`-`C7L-Mrk*tQJ97iyor#vt8It;eviT`VdDppXxkGp`o8Jd5(&G(JESRMC0@ zN%_eA|1l6CHKkZNJ-O_^NGW{pTXQ_{`5rePbzE`B#US=^EZ&2^b@7Mo%|}2)o`8 zZPzI(#|~$Nq?~%_67RoTQ_MTG(OXIJt^e9@vAE0*Khw*YaH^>yA3xFM^y3SRCd&H6 z(8(doppH-lOBID8gPu#6sRuzZfT&_n9Lm8xhHpInA@BWTOkNsD?hU~#P2G}dO6|@~ zSiyuFB^T&q42|X7YGN1-U%$2D;6A0UESa@f;~`U0qkM23Ui){!xpl|>PNHX0%VdR~ zg+U!zPX_j82oY`SMNQdtlGz6!`O-zu_&cosCb>X2!}fEUJV#5%!}pXF&T{?o23?)d z>j)Mj$h#M}c=6Pb z#p90Ef#G9wTm0Zm!4rSkkIXi7t5#SyJ#5zKu!bsvw}5*@@}=`nVd8hSh)_CYu0Zw_ zFqb2JN1W+UYQ>}76%O0Ti5oILciRl9TT=OqvNPsOukPW6x0P%6UnA>xm@PfOcrEaq zGY80f5!q;9qlQ6E+N@#Zp)m;A(+1KNCDJBRL~TNC%LsJ}F0j#^;o`}oeCFN-%$-L$ z^0z}|KTnL;uCh6V=a;VWvpYALf9W8@k!NeZ2h@8s1VTvo3SPS762CvO%85?FEq=nvU6=Uj?F|dBAK~&)8CHhxf3o6a zG2pTDB|Wx4GVZ%^0vqcDp{?mXnmlNLltw7e8dW_d> z5FqiGDsPDU?AvV{YWQlh)iZP~(#xP7eJ3j)TI2vyjP7q^d$l&_t*sS_Rl@kg+F?>Q=b+NUey@+<=%>Bu#^eYF94mfRyKE zobE_ln`dzJ$Q_#77R*I96*n!2rm;+-1%q!*XcM3g&;-PLXoy02kIc-T#k62*$79H* z`M>K?5c5~jvSgCbt;r+8@W*QOuv%%UV-4GLr%wNXDlMTBgoq@wCUky+^q$_nEolTb z+k-Li(S3H8I2K8QYCSC)+f%C+Qbe_0f^-WSJ^^vB0)iQUTSm+~BH8PROYKlBAQp@P h3{rO6weC3h&j6KCjg&m1