From 96b0d4a372feb07b3ddbde443b02bb417892bb9f Mon Sep 17 00:00:00 2001 From: defnax Date: Tue, 20 Nov 2012 14:08:28 +0000 Subject: [PATCH] Added subscribe/unsubscribe to album icons Fixed layout spaces for GxsGroupDialog.ui, when some labels/buttons is hided. git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5859 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/Identity/IdDialog.ui | 533 ++++++++++-------- .../src/gui/PhotoShare/PhotoShare.cpp | 2 + .../src/gui/PhotoShare/PhotoShare.ui | 4 +- .../src/gui/PhotoShare/Photo_images.qrc | 4 +- .../gui/PhotoShare/images/album_subscribe.png | Bin 0 -> 1813 bytes .../PhotoShare/images/album_unsubscribe.png | Bin 0 -> 1761 bytes retroshare-gui/src/gui/gxs/GxsGroupDialog.ui | 7 +- 7 files changed, 319 insertions(+), 231 deletions(-) create mode 100644 retroshare-gui/src/gui/PhotoShare/images/album_subscribe.png create mode 100644 retroshare-gui/src/gui/PhotoShare/images/album_unsubscribe.png diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui index ecc942f00..a124df4ca 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.ui +++ b/retroshare-gui/src/gui/Identity/IdDialog.ui @@ -13,10 +13,73 @@ - - - - + + + + + 6 + + + 0 + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 1 + + + + + + + + :/images/groupchat.png + + + + + + + + 11 + + + + Identities + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + New ID + + + + + + + Showing: @@ -84,7 +147,7 @@ - + @@ -106,260 +169,278 @@ - - - - - Delete ID - - - - - - - Edit Reputation - - - - - - - Edit ID - - - - - - - New ID - - - - - - - - - Identity Type + + + 0 - - - - - Nickname + + + + + 3 - - - - - - true - - - true - - - - - - - - false - + - Yourself - - - true + Delete ID - - - false - + - Friend - - - true + Edit Reputation - - - false - + - Friend of Friend - - - true + Edit ID - - - false - - - Other - - - true - - - - - + Qt::Horizontal + + + 40 + 20 + + + + + + + + + + + Identity Type + + + + + + Nickname + - - + + - false - - - Pseudonym - - true + + true + + + + + + + + + false + + + Yourself + + + true + + + + + + + false + + + Friend + + + true + + + + + + + false + + + Friend of Friend + + + true + + + + + + + false + + + Other + + + true + + + + + + + Qt::Horizontal + + + + + + + false + + + Pseudonym + + + true + + + + + + + + + Key ID + + + + + + + true + + + true + + + + + + + GPG Name + + + + + + + true + + + true + + + + + + + GPG Email + + + + + + + true + + + true + + + + + + + true + + + true + + + + + + + true + + + true + + + + + + + GPG Id + + + + + + + GPG Hash + - - - - - Key ID - - - - - - - true - - - true - - - - - - - GPG Name - - - - - - - true - - - true - - - - - - - GPG Email - - - - - - - true - - - true - - - - - - - true - - - true - - - - - - - true - - - true - - - - - - - GPG Id - - - - - - - GPG Hash - - - - - - - - - - Reputation - - - - - - Your Rating - - - - - - - - - - Overall Rating - - - - - - - - - - - + + + + + + Reputation + + + + + + Your Rating + + + + + + + + + + Overall Rating + + + + + + + + + + + + + - + diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoShare.cpp b/retroshare-gui/src/gui/PhotoShare/PhotoShare.cpp index 010990d4b..b2ea8a63a 100644 --- a/retroshare-gui/src/gui/PhotoShare/PhotoShare.cpp +++ b/retroshare-gui/src/gui/PhotoShare/PhotoShare.cpp @@ -330,6 +330,7 @@ void PhotoShare::updateAlbums() ui.toolButton_subscribe->setEnabled(true); ui.toolButton_subscribe->setText("Unsubscribe From Album"); + ui.toolButton_subscribe->setIcon(QIcon(":/images/album_unsubscribe.png")); ui.toolButton_NewAlbum->setEnabled(false); ui.toolButton_SlideShow->setEnabled(true); @@ -347,6 +348,7 @@ void PhotoShare::updateAlbums() ui.toolButton_subscribe->setEnabled(true); ui.toolButton_subscribe->setText("Subscribe To Album"); + ui.toolButton_subscribe->setIcon(QIcon(":/images/album_subscribe.png")); ui.toolButton_NewAlbum->setEnabled(false); ui.toolButton_SlideShow->setEnabled(false); diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoShare.ui b/retroshare-gui/src/gui/PhotoShare/PhotoShare.ui index 0cd71e64c..0662f0f7e 100644 --- a/retroshare-gui/src/gui/PhotoShare/PhotoShare.ui +++ b/retroshare-gui/src/gui/PhotoShare/PhotoShare.ui @@ -111,8 +111,8 @@ Subscribe To Album - - :/images/konqsidebar_news24.png:/images/konqsidebar_news24.png + + :/images/album_subscribe.png:/images/album_subscribe.png diff --git a/retroshare-gui/src/gui/PhotoShare/Photo_images.qrc b/retroshare-gui/src/gui/PhotoShare/Photo_images.qrc index 86cbd58ef..0b1667402 100644 --- a/retroshare-gui/src/gui/PhotoShare/Photo_images.qrc +++ b/retroshare-gui/src/gui/PhotoShare/Photo_images.qrc @@ -1,6 +1,8 @@ images/kuickshow.png - images/kview_24.png + images/kview_24.png + images/album_subscribe.png + images/album_unsubscribe.png diff --git a/retroshare-gui/src/gui/PhotoShare/images/album_subscribe.png b/retroshare-gui/src/gui/PhotoShare/images/album_subscribe.png new file mode 100644 index 0000000000000000000000000000000000000000..3ba182fe52e8c9695325fb6dab004874d4f519e7 GIT binary patch literal 1813 zcmV+w2kQ8VP)(>D0LMKL?uzU^a7L!D%7VUQK&#D zT!f$nwIx!CKvmNRNO&kA5tk^Tr7e!2Zo$+o1ruy1v76M6?ZmZrZST(R?9R+N{Qs;i znm*x&yl{4P=FH`M-+%uP(^|vz9Q?YX|6dRoy}iBHm%#J9-Fx<^N^m{U`}+QD*tU)6 ziThsLyw>In7>nL0P)y-cg}?+;O6ka&7;zj2gc=wJt#GOFUUPiRAf$Ji;hko)MKSdF zdeWdu_5SwshK#A15D)?|BESo$X-OCb1cSUdX<7?lp^kv@B@t?lvd{vzv$>L5GEwy+ zg<%LYbx^Edy=Za1DWN*}~+4qYH#Wv8nDMM9>^9td|m} zs!7#6k<*EawjmoTVQ7owdItgFo6%l_M;>KlxCAU_B~WTLXYIfZyC)9ZqZjX zs;A1Xq*C{S;>mUouF*hCEaYE8N|XP8m6nxA+uGTOinOZ z5Ne0Zs*#rn9Lpf9VI-qw81_7ha;+elsz_MX`}o*Pz2d%Kt>2J#vmRm52bvrcWduYf zQs@*4B4(lxHSlhNn5o0a;^+p7QpgD{y`gsP z=GjRRKKEE=>}6T2Sv}*DNt0<`d!sNjJ#~3{E;pO)zp(h_8UMcoahux?CaZ|7OZYMa zxj**R&Y$fY2{Vo2#%&vJ?Hv8tPkvCB{KA$O?%&-t!s=!rk%CwQIQ3w}DVDb^K(PS% zqF(Szlg9B+bz~lVYT3!)T9lTQFVv>ZQWfh^M$L-%Yg^5_eaotH~4d~_$o{ugG|0Y)r%#+Y^Sft;-x#2x2^DlkV?)yeAMZA` zd3Ja>!Dqq>!(3%o1|Ys35}Tp^4*Ivg4ljKU&Y!2USOmWWegIZf5@?+I`J*F)1O2_f zZ)j_7s$cc?%;LxH=n=MzGs6NqC;SbaTLveFyE|^}P#gWZV;DEase{}+2#x_8cfxIl zAlU_b&O)#w{OfB0gNg@%0^uw>dFth%j@GT~_HArkv$lj`Xy-OHHnnuTFK)-5ec`md zn0fN|GR_mPk0W_3OQ-ndNgO25vRMq+Vn3=nwWdQfAHuEuOEf(~G) z05`;;rOilLK?2p!La7M+@B^_Me(3DjZ*Bhu``{tmRyy)6`@46FH9bM+_QG&Kq~4Ke zFbx+O*lEa5lHoEAT&cjEfE+*~362Tg0?dyG|K^aW$B>{RQ5jzlUOxEefts;i=icY} z&Zo*R9#f~k6yN`1eCPe*WPhNe#!|&Em;L{-kI$SuRQT=Jz=zabd(xji5=`_K9{Y^k z{9}33SDg=k(f!R&;j?9{tw+`}RnZg+)!x5?lfvj&3zjqkYP!F|%zD{=k6gV!{QFTP zFxvLA@*(A35y^G&rUaW@#O`JE^z^I%9boM0pu7Mg4&~<$h`o>M^Ct{95QS-&ILWfZ zb_~?$FLm8}V=)MAXkORKR(klI9(=ugczc}@V#k*b;4y?MGaUk!I(X<(m}nEG^QL$A z=@lOx*KF+?Nq_#zBKI8@)NsF61aTQA%ph%6lG3vb&lW|=FT2)o-6uBh`pAkkSaS70 z1{Th}DzTkm+Z5613A;-`#YF`gbGT;xP0hFLz%Ty;iR|K}N?DzQ00000NkvXXu0mjf Dap`W@ literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/PhotoShare/images/album_unsubscribe.png b/retroshare-gui/src/gui/PhotoShare/images/album_unsubscribe.png new file mode 100644 index 0000000000000000000000000000000000000000..0f4348d4bdbe7c6b27f0033bac3f8baab744344f GIT binary patch literal 1761 zcmV<71|Io|P)K`%TkF&|#xpQZ} z@0{`Z)QiwP8m$}|OioB2S=+cDS5sjJdaorRH_M3F4irXeC994T8q$TA2DF)iVwYF^|5 zfm2tcYM9CB8Kyn8vs`d+mt|F`?0Nm-;U2bS$KoZPWH>FcZ}fGUNu3LhxhA7vX91ec?Rs#Q zg2xYr0kH&3jKSYxKnzN`of@Fo$wO3D1<{@FyVBwFabw-8`t}7QgZ;dH6Ah2EXb8+) zA$fHdDf0nw!1xFp_~^629}bP5K0Grr@Kh%ECxOeLh7*gG+3HGswHhMbz2&n5z2~fI zKf8YAlABsCeDuyMUiTv+skXJ(WIDGw0}Z+M_OU5Awzp^O=$8ZE?+xfB8_Z0MC%OXO z;vhp(mt`rdoC{0!l;%dmH52=MEvvZi&>)}6iEdXG2Osc(0@Hx{3+oZs^6p@VR) z|IruUN`1FaHREeshWw+T%Hb}`r*KV-JL`Iee%$REC$2xtGlng zO%vL9cIcZEBf)pS(ta6+J-e(DFI%&EXx9hZm#;lM+_#mhD{p@wJ8)V96B?JE9h>R9 zZDoPr@#kMXcc$-n&tBicKwU-U_;jpoMI$p*7g2ODA}n`n%XMe247E0S1FqE%z3{@R zhT3JrKL>MZ(4CdOipV|prY9$BPMiqFVvtH!YU*W=XTelx|JS<<5=|T#Y?{BK;qJ!y zHMMh?hDM~>UsvC>+-11BzTIQQ!od(Tpzh3&Z^SWv^Rl%!p6WhpsI{rs@m!W9W>W?i*qj=-En zweaY8G$E!gMr!Ak-&n&p>`!!-y5jM~6u`yvLtvkZK7d1%Jz37~xIa@A*cAWM;Fj+A%b~*R^9l4;= zzr)9u-w+%cC@wUZgi8br55&iTIicDKQ&|Wxhyawj!Kpzy3bUi;PZXjA%nX!L@Xm+F zujDeBEUr;)^HTt^O!}U<=h1!`yHZS$$^2o&zis{V8ZyC&^8%UxDs6&EfN(6jIGOr1 z>t7QpoE0*Qt`=HwPBw3Lr&2*7$^j}cgsrQHuDOmK!+1mi0*W?U=E!XCWV)_w+_>?o z&~vj<*tYG*WD=EWKrDbRkEf+&36zxd4G-QGj$Q-^nps~cJMY8o#=CFg@o?4cu+M!4 z-~tK@&{|HtcZBM+qlEP3`_00000NkvXXu0mjf Db>vMJ literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui index c0a9160c0..b67f9eee4 100644 --- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui +++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui @@ -159,8 +159,11 @@ border-radius: 10px; - - 0 + + 9 + + + 3