From 519fb01536165ee7f5759a2847d646dd72e585aa Mon Sep 17 00:00:00 2001 From: defnax Date: Fri, 17 Apr 2020 21:57:44 +0200 Subject: [PATCH] Added icons for create & post to pulse * Added icons for create & post to pulse * Changed Subscribe strings to Follow/Unfollow * Added Label for Follow list --- .../src/gui/TheWire/TheWire_images.qrc | 12 +----- retroshare-gui/src/gui/TheWire/WireDialog.ui | 39 +++++++++++++++--- .../src/gui/TheWire/WireGroupItem.cpp | 6 +-- .../src/gui/TheWire/images/compose.png | Bin 0 -> 2624 bytes retroshare-gui/src/retroshare-gui.pro | 3 +- 5 files changed, 40 insertions(+), 20 deletions(-) create mode 100644 retroshare-gui/src/gui/TheWire/images/compose.png diff --git a/retroshare-gui/src/gui/TheWire/TheWire_images.qrc b/retroshare-gui/src/gui/TheWire/TheWire_images.qrc index 7919a4500..f6cf0b441 100644 --- a/retroshare-gui/src/gui/TheWire/TheWire_images.qrc +++ b/retroshare-gui/src/gui/TheWire/TheWire_images.qrc @@ -1,15 +1,5 @@ - images/kuickshow.png - images/kview_24.png - images/kview_64.png - images/album_64.png - images/album_subscribe.png - images/album_unsubscribe.png - images/album_create_64.png - images/album_default_128.png - images/my_album_48.png - images/subscribed_album_48.png - images/friends_album_48.png + images/compose.png diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.ui b/retroshare-gui/src/gui/TheWire/WireDialog.ui index 0c0ab6f75..eb1f91d2a 100644 --- a/retroshare-gui/src/gui/TheWire/WireDialog.ui +++ b/retroshare-gui/src/gui/TheWire/WireDialog.ui @@ -40,6 +40,13 @@ Create Account + + + :/icons/png/add.png:/icons/png/add.png + + + Qt::ToolButtonTextBesideIcon + @@ -47,6 +54,13 @@ Post Pulse + + + :/images/compose.png:/images/compose.png + + + Qt::ToolButtonTextBesideIcon + @@ -143,7 +157,7 @@ - Subscribed + Following @@ -153,6 +167,20 @@ + + + + + 10 + 75 + true + + + + Who to Follow + + + @@ -163,8 +191,8 @@ 0 0 - 231 - 435 + 228 + 421 @@ -291,8 +319,8 @@ 0 0 - 429 - 435 + 431 + 443 @@ -339,6 +367,7 @@ + diff --git a/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp b/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp index d09a9e1e5..71eafb3fe 100644 --- a/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp +++ b/retroshare-gui/src/gui/TheWire/WireGroupItem.cpp @@ -64,13 +64,13 @@ void WireGroupItem::setGroupSet() } else if (mGroup.mMeta.mSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED) { - toolButton_type->setText("Subcribed"); - toolButton_subscribe->setText("Unsubcribe"); + toolButton_type->setText("Following"); + toolButton_subscribe->setText("Unfollow"); } else { toolButton_type->setText("Other"); - toolButton_subscribe->setText("Subcribe"); + toolButton_subscribe->setText("Follow"); } } diff --git a/retroshare-gui/src/gui/TheWire/images/compose.png b/retroshare-gui/src/gui/TheWire/images/compose.png new file mode 100644 index 0000000000000000000000000000000000000000..3a033462bf70ff3409595937d76f66b12f1d1bef GIT binary patch literal 2624 zcmZ`(c{r478-JJ?`x;uvlCqRtzI@4Agk%XPv@tnILNOUxJF<7|jAk=QDn+8NWGB@m zMYgfUkPxy&Vi=s~oxbHde|*>VzRz>N_w)Px?%#c1&-Erb*jWk-NDBY}gsrX29pQc* zdHGOq{V|-uf*ab$%+?HmvNS<976ZQ(JgppU0SHruxL5#I5&TyGu4)4?7G=+iCsl9MTSR@1hPq|55zcO&eQ2!kR;(Ks+;1?GG zLn5v17Yq&Yq|X0P7~CX8mYd9g7{n^62QdSKd_*56IRFMX;=C6SkpSjF<^Uk}A;I-c zxI**D3YB3CG$xGEl>fPcvKS~x9Q>8!hDX1eqC&y<+?>9U_BkTpAvA+<(L}@*M;x&M z1CZB&d~%dw7a+F}mP3v>f-nHY4h|Bs{zl}mI0_FpQ6vT$4j%y^y`agRJRCC!h6HVM zVANjd8L3EygF=vi2$393N*81y)5t*pNKE4BP`h|wBSim31s8{7tPj&@GqXimH=SKQQ2G%ZT-S;m&vIE7xPgA@Bt z{}fN0mu`GxGM5jQN4kFrVv7p@-eR^C%8u@W2M*|lp&ursgZ z2)BLxwAXn)??dz-lYeN7-dMbHYh6VkWaggl7*FJyVf)LxgjK~^+v+5l-+Jy-`&1dn zTn3)}Sw7hG3RP(pemm4u?Q4Tw`d#6hlx;2NwTRVj2!Y+O=Qzt!jlQ;JN*U$^c zNAJj)DHqPX{c?am+I+Wx=H4=?t;L-l+1u-E^qFn%i_#t!S{DRe*3}~{1-R+MHo4B* zSek=GjI0&>;J<9;77T#ME9B+MQ4^7YNnV__tp)EFw79sUu4ZBNBmkH=YjZQ_(Egc$ znIn=GJ9+2jMSUm@`Kmm3_FNWAOLj>|7d=S)E*Tr9DtG3>VJnPlvMEvYD$(L3;TU1W zvoOic&AZU(zESUDCwu=)Nq9BB;;DWEJ7n1+g4xh|lO7tsms)$3NR>9xQ6q}} zdD&B~T6UU(BUwrYi#j$pt>1n<^QXFv@Q19R$VeHi1vA{Ek~%h^hLdd&80Syy?oN;# z2eXXVCD~CYbxKX2Nx7F6)zZ(oXl;a*^2;~I=X}P|%ie`QA&ng>Q$hdMp5oZ!7hCY` zy@Xh5i+)LP^I3gCx`sM4QeK%^6?Ma%$^SAm*$wqVKBFSw(&C&!wd^n#f%(UZMNQHE zCv&`Ut9XwQZx^}gY!jc;}$%*ynEw9@f;YoiMJN-{mV|K)Tb zcE~F~^RKpFynZi=n*p>bXqjt7#KDWhOS+FTJNUG>?wI zG`8gT^UD0sZms#%kA}1LwTrL&xdY^?sH3BTSuEPdkn5Wz;oc=j{^b%CCC{A^C*)e? z=RQO+l5-90WE{V1jE|Kq%({puEI4H79o_WcRu)Y^AP`Jg@SEBt=$f#Pb=LjPtzg;D zd5ZRqgT5Kz=ZwB7KJNL*(?I!_QEpr)9krgQM-V9{52s+qCryq;9>-E+Jk{$pGU^n| z_fs5gCnbDae6QXtn&uK4D38e7N)E{)V^9w08{mk|5$ZGhgNC&B9=0IqCX1=>E}w*N?h-E7 zM6EGzmvSCh+`m_P>F_7zC`MaSj@h%BWbrD8M7H``eWFdIl2>YF{Q;Th!o7=R_DaU{ z0U@0J_Bg>ZN@n0sFP`#bt-zQo8v)5$ZJ6@(+_j^VEstV+gnMzvl4?}(ve5(`(pxoM zV&%P+h1f;W-S{Cjx6ws^*FfnvgrYinTbNVmiqpc)dB%%3+4T|b74iOSqVIQ1u7$i| zj<3{V5~5=LHAkCGI*ysv%@*D}dY9Lu*lhD^eyd|Ut+*+Gd1CxJzE!rdwmEjUOV9f0 z^NJ=JoA?dX54V`Z(LEmN@E@&&vv9@zj>UNycm{dF4d`m?YHMigY3S%X>*yQo*E9Hs zwwkuKfwuO2WBj(i5&Q#x_w~N^{|OAwwnvb#1F7H?=#9f;gS-G9kJt1K@C)|DUiQ)q V4Dun*8cIVDu(q%>e|*>@<}Y*L+%EtC literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index 8806741ee..a5d6838ae 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -1240,7 +1240,8 @@ gxsthewire { gui/TheWire/WireGroupItem.cpp \ gui/TheWire/WireGroupDialog.cpp \ gui/TheWire/PulseAddDialog.cpp \ - + + RESOURCES += gui/TheWire/TheWire_images.qrc } identities {