From b3e888d582caa84d0ddf4425c73415a23e0f9cf3 Mon Sep 17 00:00:00 2001 From: hristoterezov Date: Thu, 28 Nov 2013 19:16:58 +0200 Subject: [PATCH] Updates chat room button icons and chat room file menu icon. --- resources/images/images.properties | 12 ++++++++---- .../{autoJoinPressed.png => autoJoinOff.png} | Bin 1394 -> 1233 bytes .../impl/gui/buttons/autoJoinOffOver.png | Bin 0 -> 1348 bytes .../impl/gui/buttons/autoJoinOffPressed.png | Bin 0 -> 1424 bytes .../buttons/{autoJoin.png => autoJoinOn.png} | Bin 1200 -> 1227 bytes .../{autoJoinOver.png => autoJoinOnOver.png} | Bin 1307 -> 1339 bytes .../impl/gui/buttons/autoJoinOnPressed.png | Bin 0 -> 1418 bytes .../images/impl/gui/buttons/leaveRoom.png | Bin 1298 -> 1201 bytes .../images/impl/gui/buttons/leaveRoomOver.png | Bin 1471 -> 1312 bytes .../impl/gui/buttons/leaveRoomOverPressed.png | Bin 1558 -> 0 bytes .../impl/gui/buttons/leaveRoomPressed.png | Bin 0 -> 1397 bytes resources/images/impl/gui/common/chatRoom.png | Bin 0 -> 1414 bytes .../images/impl/gui/common/chatRoom16x16.png | Bin 1414 -> 429 bytes .../impl/gui/main/menus/FileMenu.java | 2 +- .../impl/gui/utils/ImageLoader.java | 8 +++++++- .../muc/MUCCustomContactActionService.java | 17 ++++++++--------- 16 files changed, 24 insertions(+), 15 deletions(-) rename resources/images/impl/gui/buttons/{autoJoinPressed.png => autoJoinOff.png} (51%) create mode 100644 resources/images/impl/gui/buttons/autoJoinOffOver.png create mode 100644 resources/images/impl/gui/buttons/autoJoinOffPressed.png rename resources/images/impl/gui/buttons/{autoJoin.png => autoJoinOn.png} (58%) rename resources/images/impl/gui/buttons/{autoJoinOver.png => autoJoinOnOver.png} (57%) create mode 100644 resources/images/impl/gui/buttons/autoJoinOnPressed.png delete mode 100644 resources/images/impl/gui/buttons/leaveRoomOverPressed.png create mode 100644 resources/images/impl/gui/buttons/leaveRoomPressed.png create mode 100644 resources/images/impl/gui/common/chatRoom.png diff --git a/resources/images/images.properties b/resources/images/images.properties index 3ca43dad0..a08f92acc 100644 --- a/resources/images/images.properties +++ b/resources/images/images.properties @@ -74,6 +74,7 @@ service.gui.icons.EXCLAMATION_MARK=resources/images/impl/gui/common/exclamationM service.gui.icons.OPENED_GROUP=resources/images/impl/gui/common/openedGroup.png service.gui.icons.CLOSED_GROUP=resources/images/impl/gui/common/closedGroup.png service.gui.icons.CHAT_ROOM_16x16_ICON=resources/images/impl/gui/common/chatRoom16x16.png +service.gui.icons.CHAT_ROOM_ICON=resources/images/impl/gui/common/chatRoom.png service.gui.icons.CHAT_ROOM_JOINED_ICON=resources/images/impl/gui/common/chatRoomJoined.png service.gui.icons.CHAT_SERVER_16x16_ICON=resources/images/impl/gui/common/multiUserChatServer16x16.png service.gui.icons.MESSAGE_RECEIVED_ICON=resources/images/impl/gui/common/envelope.png @@ -263,10 +264,13 @@ service.gui.buttons.CALL_INFO=resources/images/impl/gui/buttons/callInfo.png service.gui.buttons.ZRTP_ID_BUTTON=resources/images/impl/gui/buttons/zrtpEditId.png service.gui.icons.LEAVE_ICON_BUTTON=resources/images/impl/gui/buttons/leaveRoom.png service.gui.icons.LEAVE_ICON_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/leaveRoomOver.png -service.gui.icons.LEAVE_ICON_PRESSED_BUTTON=resources/images/impl/gui/buttons/leaveRoomOverPressed.png -service.gui.icons.AUTOJOIN_ICON_BUTTON=resources/images/impl/gui/buttons/autoJoin.png -service.gui.icons.AUTOJOIN_ICON_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/autoJoinOver.png -service.gui.icons.AUTOJOIN_ICON_PRESSED_BUTTON=resources/images/impl/gui/buttons/autoJoinPressed.png +service.gui.icons.LEAVE_ICON_PRESSED_BUTTON=resources/images/impl/gui/buttons/leaveRoomPressed.png +service.gui.icons.AUTOJOIN_ON_ICON_BUTTON=resources/images/impl/gui/buttons/autoJoinOn.png +service.gui.icons.AUTOJOIN_ON_ICON_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/autoJoinOnOver.png +service.gui.icons.AUTOJOIN_ON_ICON_PRESSED_BUTTON=resources/images/impl/gui/buttons/autoJoinOnPressed.png +service.gui.icons.AUTOJOIN_OFF_ICON_BUTTON=resources/images/impl/gui/buttons/autoJoinOff.png +service.gui.icons.AUTOJOIN_OFF_ICON_ROLLOVER_BUTTON=resources/images/impl/gui/buttons/autoJoinOffOver.png +service.gui.icons.AUTOJOIN_OFF_ICON_PRESSED_BUTTON=resources/images/impl/gui/buttons/autoJoinOffPressed.png # Sound level icons service.gui.soundlevel.SOUND_LEVEL_ACTIVE_LEFT=resources/images/impl/gui/common/soundlevel/soundActiveLeft.png diff --git a/resources/images/impl/gui/buttons/autoJoinPressed.png b/resources/images/impl/gui/buttons/autoJoinOff.png similarity index 51% rename from resources/images/impl/gui/buttons/autoJoinPressed.png rename to resources/images/impl/gui/buttons/autoJoinOff.png index 75c6a404286e3f34c23396ee7eafe2c100e84588..7b711dfbce025f7ebe6e7134b1d224214bfc6d63 100644 GIT binary patch delta 403 zcmeywb&+#J6qACpsf&T5k&BCoo4Jvpp{uczn~|B5p}CQXk%6n3lZor(Dkd42B4?b6 zwlO8k8(A0_8k(CJm>U_GSr{5x7#TUbxEPq3nz@-cn>m?HwqUNSPm@eo!N9=q-_yl0 zq~g|_Fl)YM1D>NAwvOu$Tv(dyZuR|wtk$^;Ua~hX&0Q$u&3^qt!5 z_{Gt0#ViU*n_8BhblN7kcD@JazLiETS5v?27CSIgx4fladCT3!l{$MextP2630a)t zUReB+XK#b&(ry9vP5Nh4^9AaSX4o#?Fvh=o4Fqz`o6qAC5fs3=VfvKU1qqC!-p{uczlckHRvx|kZp{tXrv8mU_GSr{5x7#TS_ySSPdnHn1#ni?8SwqUNS?<`7GVqjog;OXKR zQgQ1}*j~RD2Z4LB(*&f8A678dGOf&6x5*~{;XBSZ`WruSZrQwK*Y^#Zwi<+}sr?g4 z_t8sR@5uS)p*g37(~e~Q1EPMP3>l~WOiN2|dm1^-@bspbV>cuVSS;2^cQ%SY@XP*t zv{k_Qjt?WF%AC)o;yN4+Z|ZL{+??$l<7V)WdF_Jz3r$O|O=3~o!CKpJoAHasqk{rJ zSi&48RbTK*XrIE+$Q!_A+of^J^U<~0LdU-^kv%Rs@$k;Gq93YIUAkbyk ztaXQsg%#hgex0p!dC}Wrv%Bv63Od!T#{A;o{?g1@_onS%T<+!)@gw6=ZfWe@^7>7e zzg%&-#C>raPlsOTid$x(YZ9s_{dZUKO$%RnI#PgT`QwijuXerj)E7LPwmJFI!HNmsrKZqNNK^Vx6a5`WFDUu@o=DoL7B*TVexN^9Z|hDoPm zJDSr z1<%~X^wgl##FWaylc_cg49ppsArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8 zNvY|XdA3ULckfqH$V{%1*XSQL?vFu&J;D8jzb> zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XRMoSU}&gdW~OIo zVrph)sH0$HU}&Uo07PcGh9*{~W>!Y#3Q(W~w5=#5%__*n4QdyVXRDM^Qc_^0uU}qX zu2*iXmtT~wZ)j<02{OaTNEfI=x41H|B(Xv_uUHvof=g;~a#3bMNoIbY0?5R~r2Ntn zTP2`NAzsKW@b!fooL3ADC}5E3S0onb8|oS8=jMX^1y)^L5|oN?23FO@A(aKG`a!A1 z`K3k4!1zd0hG_np+{nPp!qCvt+`_`i(bC1z$jQyX(#;WO1~$FUrY;7KMlO~nZstaYhOWj=ZboKK zhUP{lMh32CPA0A}y`Fi+C5d^-sW5vpf%Zc6THw`d)eNyv)d8P=MIezzg z9AjW$Eb?@545_%4l#-mB%)sQQFpWKlQ6VjD0pAbqBk~PD6b0(j*_bA%RymwuKH|f3 zg;`W}nR5v@#`<#pj!N;mL*U`s*Gn^15)4NBx-4 z9y_He7733OW@XtiNw&OWUiG`$L)krlJMdBfS8Goy@F=NEqL;`neXd8_6e@*Gjljs z9ID~Sx?bDHrYJsjbyFvjs9f`O^>bP0l+XkKiKxmP literal 0 HcmV?d00001 diff --git a/resources/images/impl/gui/buttons/autoJoinOffPressed.png b/resources/images/impl/gui/buttons/autoJoinOffPressed.png new file mode 100644 index 0000000000000000000000000000000000000000..b94c956f4e06cf3f8fc35314afbd559becf11c0b GIT binary patch literal 1424 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)t!3HFg#O7xMDajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_cg49ppsArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8 zNvY|XdA3ULckfqH$V{%1*XSQL?vFu&J;D8jzb> zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XRMoSU}&gdW~OIo zVrph)sH0$HU}&Uo07PcGh9*{~W>!Y#3Q(W~w5=#5%__*n4QdyVXRDM^Qc_^0uU}qX zu2*iXmtT~wZ)j<02{OaTNEfI=x41H|B(Xv_uUHvof=g;~a#3bMNoIbY0?5R~r2Ntn zTP2`NAzsKW@b!fooL3ADC}5E3S0onb8|oS8=jMX^1y)^L5|oN?23FO@A(aKG`a!A1 z`K3k4!1zd0hG_np+{nPp!qCvt+`_`i(bC1z$jQyX(#;WO1~$EphR#NghUNw)ZstaYhOWj=ZboKK zhUP{lMh32CPA0A}y`Fi+C5d^-sW5vpf%Zc5nz`ZCYvo*&npl!w6q28x14{t`8Tlpo z#Toep3eLf13L3tN$(eZ|0ZmW@LHz5IT9jFqn&MWJpQ`{4VXI6mE-)~%0Hz;=&n=9M z99>)t%uIofayD}^Q-bPEAt%)IfsWA!B@d+J0uutJK@bz3_<{Wgq2}ic*gvOy~g?s(n8*9_nJGW zGL|}cc>LjU9FhNGJqyUJ4^rnfw>{~-9syoN2lM8%OK?a=!K ziw60~84^tI4={Ng<+GA}G~uzr21c!g?vh8FR1AM@jX4t2aOPo%-o%q(JxR=lsZ*w& zo~m-vclv?8$353lrhQz;zCL?e(ZNlAURp{Qbws(M*B;c15_~9hUo$^x>7MLUUyoN@ z-+V!F<=GXUGDY)h@+AWoWU=i{U$Rz9QEpCdwbI<(s-eqIUC1hAG}nvP4YcHzG~hXW zSb;-r-D|lMKeM(K#oTR~Cb8`DOS_*RD{9m{t;*Yq+%>M&hQHgg$B$kA_^0Tp8Z&Zl zAJ0$>4F0)D(-f@ z33bLE^HtfEbmI2ABIf8xdmh*Sxc_^}^i$F+^Sf0nE#y{|^e=H}keig&&+U_GSr{5x7#TUbxEPq3nz@-cn>m?HwqUNSe~>c&1_J}bPfr)e zkcwMx!Zz|X83;V(sB7GR;K8F89h>FfCj4OYmAUci-ocim4{bI~S{ApSmGk8RRq>+h z+UvhpTxaN*p_^E_ZNgfIm&~F*@8Tt$iezj1SPQls;{AC#_}2Q1HrJA7pEZK zS!t8Sfs+U4d}4dnYEbT8sBT#Q=ws|9!=w*^*X=nOco?J{9x!xwGIJ!qJk6}+uza!b z&!guSZ%mvld^{li_Pjq*3mx=@TT7H{mha7+l^Z$j#G2bmD_jFhI1jRC-~Q(KbZYeD z#c!7Dv3Y2gF5An#?%1YNKTH(Xe(nACmZ{Y7`M!y=Wi|FE-}~LuzbeSQ`=9X=)-U2> a2@Gb_)U{@8`TqkL3=E#GelF{r5}E*5bE9DZ delta 369 zcmX@jxq)*-6qACni=&&Fp_ze+qqC!-p{uczlckHRvx|kZp{tXrv8mLwm{}MaS{NBQI=i@<7?~Oy8=4v#O}1dJtAEw}=RX4j!#z(I z$B>F!Nq_$Tw`aCx5N4ixV1;W0qq4HH1T&+?q5sMsU%pp%lUdm}Wyy&ScU$GVwMU#3 z-n`|IWZ)8% z8EF^mbsoNBJi>nA$v@(ZWw%3(`k&R);XMgTe~DWM4fXO@Xs diff --git a/resources/images/impl/gui/buttons/autoJoinOver.png b/resources/images/impl/gui/buttons/autoJoinOnOver.png similarity index 57% rename from resources/images/impl/gui/buttons/autoJoinOver.png rename to resources/images/impl/gui/buttons/autoJoinOnOver.png index 3da139d50da47e6a4bc6454a0382acc85d21f331..e2af2fbc3d9de8f67912b4cdafbebfcad6a21db6 100644 GIT binary patch delta 438 zcmbQuwVP{06qACpsf&T5k&CH`o4Jvpp{uczn~|B5p}CQXk%6n3lZor(Dkd42A`_g7 zwlO8k8(A0_8k(CJm>U_GSr{5x7#TUbxEPq3nz@-cn>m?HwqUN~klWo>!@$6pIe8zm zPkl|p%+5x?2G-aI&(F_y*D#zgckW%ba2MX5{s%%jIyViz{r~?zQbJPle?l<(Wag%o zDUmEb-^5qWJ;rYKqCk}|AVsGw~cx@-WBLQJy%UBjACnZ%S zP79c`XQDUDl7i>WJ4GVpL_QkW`RJ~5Imof*)Y?wYef;uvd&C3W8$6m<9L z>FMXCq@>O0|VJNf(O=5+psX}BPDF>Ks5}3%jUvN{)jUylAMZ!(=4*qYN z^qt>IU_GSr{5x7#TS_ySSPdnHn1#ni?8SwqUN~SY61S%fP_sIe8zm zPkq~b`+7OXM4g~BK0GB%Iy++A)-b+#^TzDOtHhcKGDR-DbNU}l($Tru!o#pEYR4}7 z`hPyI*Vrd1pHf1=1NJ;MH3aiI`%v|SQQ z*wbrA*zULU%irth=(r*roistTWV(L59rubP0l+XkKR$G)D diff --git a/resources/images/impl/gui/buttons/autoJoinOnPressed.png b/resources/images/impl/gui/buttons/autoJoinOnPressed.png new file mode 100644 index 0000000000000000000000000000000000000000..1d0490565abcfec50d30dc2e6083a79c0dd303be GIT binary patch literal 1418 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)t!3HFg#O7xMDajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_cg49ppsArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8 zNvY|XdA3ULckfqH$V{%1*XSQL?vFu&J;D8jzb> zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XRMoSU}&gdW~OIo zVrph)sH0$HU}&Uo07PcGh9*{~W>!Y#3Q(W~w5=#5%__*n4QdyVXRDM^Qc_^0uU}qX zu2*iXmtT~wZ)j<02{OaTNEfI=x41H|B(Xv_uUHvof=g;~a#3bMNoIbY0?5R~r2Ntn zTP2`NAzsKW@b!fooL3ADC}5E3S0onb8|oS8=jMX^1y)^L5|oN?23FO@A(aKG`a!A1 z`K3k4!1zd0hG_np+{nPp!qCvt+`_`i(bC1z$jQyX(#;WO1~$EphR#NgK)ohz=0=8wuEtJoMrKZi z=0+w)2CimKCay5Oo_WP3iFwJXFncqB_Coa<ylcOS(cjOR+OKs01jcROe`)iFtPxqAB4{>jEo#z zTnx-i&D>0!&791Xpn6lt2{nD7WAs7E11Y({gn(%f#Dph)AP1g(QuBa$rU;lhUR;`e zje&u2ho_5UNX4x^Vb*?!9R%*iu1~$V;KWDP2P{h#dAdrjdoZWro~d{PU#FVr_XUfV zI%ou*KJbaI>j{3tne^TeaAZv4x&f1b{{g> zljWQfd2P#*O%YpSEACF1%D==WD8^;k%@B(>&m|wNnJ8fP(RaEir&+*>Tb4lv?7G{k z)~9@&9qy9i>J-cPwrfkL(dUHR+1xMRti4kjI`tHr^oQ^F>Tju+t~$Xf-hK36j@j(n z+xCX1@qDd6+JC{Q`FZ8;DY4gWPr63kj-Jcmb$|P3{m}WB4?VyBb9d;n2g@?$l3IS0 zzWrSL|7_u$$E!L6uWrim>D>~uJw|W6`s9oZ_Q|;lW!wpT{qAHVgRDv~AL|R9N6t?yyB0l&ZeV2K X<=D|Q$2o)>R62UP`njxgN@xNAr|U_GSr{5x7#TUbxEPq3nz@-cn>m?HwqUNSpJT3gn}LDhzNd?0 zNX4zBKmY&RGutuz%jyXrh)V?E)cV|P%}J>@q?yMIB{5hqWU#m5zWA92j* zXE&+j=j;Bb%&20>uVD9~MxOhC^!y)>ICx($Eq-&V{!y0KqafL$ET&o294_~F7Q0K> z-hXiVOa$vi!*vgSe|vjdc)UjZUl}}I{an^LB{Ts5UYCSE delta 468 zcmdnUIf-jS6qACptD%X3xvPnZqqCEtp{uczlckHRvx|kZp{tXrv8m1yp9~TP#q%^6BEX$GFi2<4-XDeX&QZXsI%(K7k#{`u%Gi6Q|_AFLq zuGMimKO?}9U%{?H`}3nSlYa;?OI=`H)~oHZ%&q6h0jCu%46~{^T<-5Ic9)1t<6J1j zygGWrQ{|Y0>}THkH#lu`Q7QH@?%ev~Q?Or2|&7BB#Tr>mdKI;Vst07b&H#{d8T diff --git a/resources/images/impl/gui/buttons/leaveRoomOver.png b/resources/images/impl/gui/buttons/leaveRoomOver.png index 2ff653b365622163e2bbdc7a88bdb1d018ba155e..33afdefd60ef62ef1f7bdd083b20863f42b30608 100644 GIT binary patch delta 408 zcmdnby?|>&6qACRiIIzmlclqXo4Jvpp{uczn~|B5p}CQXk%6n3lZor(Dkd42A}5@R zwlO8k8(A0_8k(CJm>U_GSr{5x7#TUbxEPq3nz@-cn>m?HwqUN~m>FeY&A`CuH+dhk ze|=}8Ujysx2j}P8_X}J)aqe6mb1-|7^6Tc07nQRf)UZrXNj!N>^2M1m1wZZU|H(Lp z@lR4dskET2d&!B%!RMVk3l2PDxto6DQAev*=Jba1n%g*R{Z8~L2h}q1>{`h@Zx6e> zos*to!a>9GcQM8K`s*VU6&0Ch{aCSPjSr{G@gqm-zf8*F^pjVd&fy_=rhQ)ihpAF8 z8U!PzMhi>V$lKLa=qf2)a`4%wX#GMjeqW7PhNr0IG=aJO^K7fX9k_5|1AoRz=UGdv zmi+kP)~RaH{jd2^*QBDJ8Oy{q`sywy?yqBr{4(pz$nU4>K!-vx%|ag1|aZs^>bP0l+XkKCBvQO delta 568 zcmZ3$wV!)K6qAC5fs3=VfvKs9qqC!-p{uczlckHRvx|kZp{tXrv8mU_GSr{5x7#TS_ySSPdnHn1#ni?8SwqUN~NcLCjW?*1^J9!_o zf4x>=(eH0>U#a`g`ywGJS*Rbk=f<%ghW0Ay-Tetk`{{8u>Tvu1eJ3;mIG~H-f zVd3H_3;G{S($Tre!aRTGOhyTxBnR&You^Kn@=`M}sGm@IxQ(}9R(t?63Lx>FTdvzg9&>MX>?h`1<>oFEQRz`a4*Adwad7PMNZVi<{e=L3h%b zvuC%?H_g6gnPM99QP9A!fZ0%5Som`FgvbB?{yxs1QqQvKf527uo}Qj~M~V5&GbLWI zw9R*|c+9c0rJ=s{_nn=^XZP;elhoSM!jti6@up2issg-cKJHx-)pXhYgzBOB_Vvr0 zYLBpgR$M5=91@kV#3$z`NBD=@A0Hm}c64~yURcm=;>|N%Ki-ae%aTbl-W}&QoS$b~ zosf}ngMG^rMc*LVpqiS+M}%g${&y^FRZr3nQk4G7dh{Z{)syS|rV8D0mv0CKaQ+jx vvhFtzualmZxaWdtS}ShtV9i>|#3I2UaDAHG`qI0G3_#%N>gTe~DWM4f;VJUO diff --git a/resources/images/impl/gui/buttons/leaveRoomOverPressed.png b/resources/images/impl/gui/buttons/leaveRoomOverPressed.png deleted file mode 100644 index 8168f754b6e5571ae189b96e3031c0281bd5be1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1558 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)t!3HFg#O7xMDajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_cg49ppsArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8 zNvY|XdA3ULckfqH$V{%1*XSQL?vFu&J;D8jzb> zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XRMoSU}&gdW~OIo zVrph)sH0$HU}&Uo07PcGh9*{~W>!Y#3Q(W~w5=#5%__*n4QdyVXRDM^Qc_^0uU}qX zu2*iXmtT~wZ)j<02{OaTNEfI=x41H|B(Xv_uUHvof=g;~a#3bMNoIbY0?5R~r2Ntn zTP2`NAzsKW@b!fooL3ADC}5E3S0onb8|oS8=jMX^1y)^L5|oN?23FO@A(aKG`a!A1 z`K3k4!1zd0hG_np+{nPp!qCvt+`_`i(bC1z$jQyX(#;WO1~$FUu7*H;t_CKK&Q6AguEtJImM*T& zE*8#)u1==Lrj{_ho_WP3iFwJXFncqB_CoZ!xZ%}n)eNyv)d8P=MIaHQj zI>^AlWp5n3$gFx7F`4xVo;-^4&slx%)pSe*Zb|dw=5d z&z6Tj*K{P#us$H_kaWjT^aqEGWZTE7Pc8Dq&3`knXXu=smAAox;ixcU*LATElU+Z| z|6ufozk<1LpCYHz2Ae(N+Z}(bX<*-dKsz+Iu-~`{v6pzf>;1xFc`n;$7NHPW&*AUA1aok(ZKZ zkeGU(tJ1`j{rBr%eXUBC>pw2v>!$zs>w%!Og4ts8bf%xSo$aFrwB~`-#1gByhl5sr zx%E#zF_OVi;N4oKgFHqamsuyUh@Ur_d1h(S#uMMGY|~vhKAr1aRAU$a?PtxuyzSL9 zeAL#f33cu*+F2v*qAx3GxwUHVKP8||tFC78yNGK~J+(G%^UrVFr-{3M)O)2e{~Aw7 zMmzH^=86re`z}88z0C8VsxA9&m3)b-Am6XK8{Ra?6#ISqFQ~hAVy&~zr+Zmj^TfDX z{|0E3Bx`qNZH<~^qxSFPE|qkxP5CUb*ZFl^|Fs?pm2Td4G=6U7Et$Df?INf7AA0z~ zdAamqvvkMfE2VkZ@*RrmV<&A5yHH{CZ;IE_c@0lKhwVBS#-A!YiFM-3V{Gw>R#!bN z+beAs>QCh?y)WkJQ?O_GmD&Y-EH9iVl}~Kg=bAD>CVSShKSBu%W}j}aDl}sA1eMgD Lu6{1-oD!MDSr z1<%~X^wgl##FWaylc_cg49ppsArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8 zNvY|XdA3ULckfqH$V{%1*XSQL?vFu&J;D8jzb> zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XRMoSU}&gdW~OIo zVrph)sH0$HU}&Uo07PcGh9*{~W>!Y#3Q(W~w5=#5%__*n4QdyVXRDM^Qc_^0uU}qX zu2*iXmtT~wZ)j<02{OaTNEfI=x41H|B(Xv_uUHvof=g;~a#3bMNoIbY0?5R~r2Ntn zTP2`NAzsKW@b!fooL3ADC}5E3S0onb8|oS8=jMX^1y)^L5|oN?23FO@A(aKG`a!A1 z`K3k4!1zd0hG_np+{nPp!qCvt+`_`i(bC1z$jQyX(#;WO23EZ$MlL2!js_-f=0=8wuEtJoMrKZi z=0+w)2CimKCay5Oo_WP3iFwJXFncpW_JZ|Vy5ZGp)eNyv)d8P=MIc~@{ zg)lHMF7|YB45_%aC(PRKu!BJC`smFXr%X9gCff#s8+hh4u@%UwBPs(c=-WVn5Bf zMg7BJkqXvp4q^Y9bsOb_WLU%;G)puWEm8BlxgqG9-F1b{mP=RnrHClrcW@FEeOt0L zbJw5Kjk&kuHuvv4ecm)%b5ql6vAED9Zi@xfW6i$Y>$g4sdFh_{IeR-k9LSabz3i{k z>aVY7ZBfp?>M`HLv?zB`neV^Y#rq~IlunOb`8daWld00eqE$~yS`sTP=AReudo0r< z6ez&*dr9qm`}f|LBq!PkE@67V?RVPcD?dzQbWd9y+tVF-N&NW7*{^q{Yt>$^67-uA zEbe-d*Te7kq%W@)U(NbzG5f5Z!zYtdD<{92_+o;I%hGo;!4u|WP03jpfB)sOPfpA8 zT_y?1luy}JZPmySt8$i+^M#&J^ApR{o1R2BFfz!VUV6uDZkQ*iAoO(gb6Mw<&;$TA C%J2aI literal 0 HcmV?d00001 diff --git a/resources/images/impl/gui/common/chatRoom.png b/resources/images/impl/gui/common/chatRoom.png new file mode 100644 index 0000000000000000000000000000000000000000..a6743c44189f64186e869c08e92566d4317e2ecc GIT binary patch literal 1414 zcmeAS@N?(olHy`uVBq!ia0vp@K+MO%1|+}KPrC%9BuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFlS_jM3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWv2L<~p`n7AnVzAE zshOFfj)IYap^?4;5Si&3npl~dSs9rtK!Fm_wxX0Ys~{IQs9ivwtx`rwNr9EVetCJh zUb(Seeo?xx^|#0uTKVr7^KE~&-IMVSR9nfZANAQKal@=Hr> zm4GgVcpk{1iHq`zbF$JDTz5Q`N^fZsd*)yF1AWQ8NHOu6e~9ub2mdn za}xt|BLg!FLqkh*3kxSlOBYKcCpQC2H%FKm*z`I%nHxD;TDqAy85K@kM;uS;rCW?5>ATTyRuBSsmZ76feCoSMbdd zuVB{`+(%3V=O1Wxk(QpQq1LLQ)%9cQ%%j#qCd~DD{XhSgm8XSmzW?5_Ge)nxaXyPy z)27Ay0`yl*(&&2M<-gd0WNuo-wJ^TO zLMF*TqUCPh@iVi}vRU*cZwOo6>b98i@WTm>Ql69687Q_pDSoKh`yqbI?c5dDUvGJ+ z>TdeMhX3`~S*qPf9|=zIQH#9yw8(M!WlsSSGYOuO^s5D08u=ztnUabxdS1=&Tdp(n z{PX^X605VH+Lztr{B^AQQ^=Mi3(?hAyG+}UIh?yyVbhnqJJM+KNg2kQIbzdJFAX}R z?Wk&FweIrE5N6k{0o=d#Wzp$P!5DfzSj literal 0 HcmV?d00001 diff --git a/resources/images/impl/gui/common/chatRoom16x16.png b/resources/images/impl/gui/common/chatRoom16x16.png index a6743c44189f64186e869c08e92566d4317e2ecc..cd8c2c77eeed11d98d1a32d057028320abc321d5 100644 GIT binary patch delta 401 zcmV;C0dD?=3#|hoiBL{Q4GJ0x0000DNk~Le0000J0000J2nGNE0CG?^%#k4{e*sTP zL_t(I%VUU$h^PnR{{-+ibTI}X0Md>?%)tNyL>TlxJUsjl7Q+;Q^ylE<;AAT+D`p^@ zi2+>!9;|>a2GsKth=2R~`uYKBMuILQ()EA+{rx?Nav2eZ{R0NYS7gKf00n-K=rT}P z{sm!oclSbUE>pnbItFYm23ih^f91cPo}Lx#?CdJYhW#TYc|cwK$<56z6KXgwDY1#o z)gT}bGn}Y&hA$SO7~&8TT?WP)8X6YH#>Ottp!tK>s|Ygl-rpjlp6Q zBcq3ghW>^*pMXI>K*VoQ({n4QxlPrlF}Cu5wSxu>@$olD=V8vXDEh&1}Ot+ zL0I9z48$yGw!V{*kx2q+kd~Gf0B2-004^zT0hmEyVPOw|2E>5U5D;@gr5PDW0Z@bP vF)}hL0l6|j%*j9@P=p$U0U{$K@wyHG92%@q6pAUI00000NkvXXu0mjfuG*Po literal 1414 zcmeAS@N?(olHy`uVBq!ia0vp@K+MO%1|+}KPrC%9BuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFlS_jM3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWv2L<~p`n7AnVzAE zshOFfj)IYap^?4;5Si&3npl~dSs9rtK!Fm_wxX0Ys~{IQs9ivwtx`rwNr9EVetCJh zUb(Seeo?xx^|#0uTKVr7^KE~&-IMVSR9nfZANAQKal@=Hr> zm4GgVcpk{1iHq`zbF$JDTz5Q`N^fZsd*)yF1AWQ8NHOu6e~9ub2mdn za}xt|BLg!FLqkh*3kxSlOBYKcCpQC2H%FKm*z`I%nHxD;TDqAy85K@kM;uS;rCW?5>ATTyRuBSsmZ76feCoSMbdd zuVB{`+(%3V=O1Wxk(QpQq1LLQ)%9cQ%%j#qCd~DD{XhSgm8XSmzW?5_Ge)nxaXyPy z)27Ay0`yl*(&&2M<-gd0WNuo-wJ^TO zLMF*TqUCPh@iVi}vRU*cZwOo6>b98i@WTm>Ql69687Q_pDSoKh`yqbI?c5dDUvGJ+ z>TdeMhX3`~S*qPf9|=zIQH#9yw8(M!WlsSSGYOuO^s5D08u=ztnUabxdS1=&Tdp(n z{PX^X605VH+Lztr{B^AQQ^=Mi3(?hAyG+}UIh?yyVbhnqJJM+KNg2kQIbzdJFAX}R z?Wk&FweIrE5N6k{0o=d#Wzp$P!5DfzSj diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java index 74e413605..10031838b 100644 --- a/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java +++ b/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java @@ -221,7 +221,7 @@ public void loadSkin() ImageLoader.GROUPS_16x16_ICON))); myChatRoomsItem.setIcon( new ImageIcon(ImageLoader.getImage( - ImageLoader.CHAT_ROOM_OFFLINE_ICON))); + ImageLoader.CHAT_ROOM_MENU_ICON))); if(closeMenuItem != null) { diff --git a/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java b/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java index 51af8c6d2..256ba918e 100644 --- a/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java +++ b/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java @@ -958,9 +958,15 @@ public class ImageLoader = new ImageID("service.gui.icons.CLOSED_GROUP"); /** - * The image used for chat rooms. + * The image used for chat rooms presence status. */ public static final ImageID CHAT_ROOM_OFFLINE_ICON + = new ImageID("service.gui.icons.CHAT_ROOM_ICON"); + + /** + * The image used for chat rooms presence status. + */ + public static final ImageID CHAT_ROOM_MENU_ICON = new ImageID("service.gui.icons.CHAT_ROOM_16x16_ICON"); /** diff --git a/src/net/java/sip/communicator/impl/muc/MUCCustomContactActionService.java b/src/net/java/sip/communicator/impl/muc/MUCCustomContactActionService.java index 6b560fb28..34e6e7059 100644 --- a/src/net/java/sip/communicator/impl/muc/MUCCustomContactActionService.java +++ b/src/net/java/sip/communicator/impl/muc/MUCCustomContactActionService.java @@ -58,8 +58,8 @@ public class MUCCustomContactActionService */ private String[] actionsIcons = { "service.gui.icons.LEAVE_ICON_BUTTON", - "service.gui.icons.AUTOJOIN_ICON_BUTTON", - "service.gui.icons.AUTOJOIN_ICON_PRESSED_BUTTON" + "service.gui.icons.AUTOJOIN_ON_ICON_BUTTON", + "service.gui.icons.AUTOJOIN_OFF_ICON_BUTTON" }; /** @@ -67,8 +67,8 @@ public class MUCCustomContactActionService */ private String[] actionsIconsRollover = { "service.gui.icons.LEAVE_ICON_ROLLOVER_BUTTON", - "service.gui.icons.AUTOJOIN_ICON_ROLLOVER_BUTTON", - "service.gui.icons.AUTOJOIN_ICON_ROLLOVER_BUTTON" + "service.gui.icons.AUTOJOIN_ON_ICON_ROLLOVER_BUTTON", + "service.gui.icons.AUTOJOIN_OFF_ICON_ROLLOVER_BUTTON" }; /** @@ -76,8 +76,8 @@ public class MUCCustomContactActionService */ private String[] actionsIconsPressed = { "service.gui.icons.LEAVE_ICON_PRESSED_BUTTON", - "service.gui.icons.AUTOJOIN_ICON_PRESSED_BUTTON", - "service.gui.icons.AUTOJOIN_ICON_BUTTON", + "service.gui.icons.AUTOJOIN_ON_ICON_PRESSED_BUTTON", + "service.gui.icons.AUTOJOIN_OFF_ICON_PRESSED_BUTTON", }; /** @@ -477,10 +477,9 @@ public boolean isVisible(SourceContact actionSource) return false; if(name.equals("autojoin")) - return !room.isAutojoin(); - - if(name.equals("autojoin_pressed")) return room.isAutojoin(); + else if(name.equals("autojoin_pressed")) + return !room.isAutojoin(); } } return false;