From 2f9f390dbf8be793625a47d6e0cbb07646c39964 Mon Sep 17 00:00:00 2001 From: defnax Date: Tue, 5 Jan 2010 00:00:33 +0000 Subject: [PATCH] update emoticons git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1976 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/images.qrc | 10 ++++++++++ retroshare-gui/src/gui/smileys/airplane.png | Bin 0 -> 940 bytes retroshare-gui/src/gui/smileys/drink.png | Bin 0 -> 1125 bytes retroshare-gui/src/gui/smileys/emotes.acs | 13 +++++++++++-- retroshare-gui/src/gui/smileys/good.png | Bin 0 -> 1011 bytes retroshare-gui/src/gui/smileys/lamp.png | Bin 0 -> 1259 bytes retroshare-gui/src/gui/smileys/time-out.png | Bin 0 -> 1521 bytes retroshare-gui/src/gui/smileys/turtle.png | Bin 0 -> 1078 bytes 8 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 retroshare-gui/src/gui/smileys/airplane.png create mode 100644 retroshare-gui/src/gui/smileys/drink.png create mode 100644 retroshare-gui/src/gui/smileys/good.png create mode 100644 retroshare-gui/src/gui/smileys/lamp.png create mode 100644 retroshare-gui/src/gui/smileys/time-out.png create mode 100644 retroshare-gui/src/gui/smileys/turtle.png diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index e931917d4..846e26042 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -431,6 +431,16 @@ smileys/wink.png smileys/wondering.png smileys/emotes.acs + smileys/rain.png + smileys/thunder.png + smileys/moon.png + smileys/cloudy.png + smileys/lamp.png + smileys/good.png + smileys/drink.png + smileys/airplane.png + smileys/turtle.png + smileys/time-out.png images/connect/connectFriendWatermark.png images/connect/connectFriendLogo.png images/connect/connectFriendBanner.png diff --git a/retroshare-gui/src/gui/smileys/airplane.png b/retroshare-gui/src/gui/smileys/airplane.png new file mode 100644 index 0000000000000000000000000000000000000000..89b45efe5af0bd63ec3431087de04419e66e21c2 GIT binary patch literal 940 zcmV;d15^BoP)2x>J zkRMs5y?@65LWnQNMCs6d(FpT1S-MV{h78H~Ez_>87~p!&ijWkLT((R*`aoCl z;jQ5@fA1sJ>iknR~@KBi6I1zw7m&?`)40qWmElA4zk6_C7)iI+DjR3}egB zGJ0c-tCxmW-K$O{1Ynu=At6x%pI)SxUoPX|q=-bq_$8lsW1L(z&kq-V(WRBrR!ONa z)&_Gui%w`oXt}U_4KQ8L*;v@$WzW?$)E>BdX9|F(L<2v5btx#VlwNT?XJAVk|CR(0 z24@lEwW52oxMkYOeFtK(=$;7knR%Lz9^%eOn(XXCsuFQnn**s8?P$7P&zboT{>`?I zBcbWZ3^lPDVzn`b28T;1dMgo!wK-5|T3yc>+}yBCy9!ND>toGKO-$4FFP z-*G)>qGAAm>p7}S?}ets!O%)^mAb|_iwk+uxBvPZ&AXL~Zve`bFnIgu6OS6%nFU(f zo4N9H%180C>p7+E0LtHJrd=D3gpv)14^miM;*aaMSjrW?aXshP?TBybKx^HbIMyP= zRUxEdaMSyJv=VPZceP<$#0xbotu9cfY|NdmVW?>`exJJWg7ed O0000C zm0M_BMI6SzIoCaV$!<1jnrNhE172Ef+HI<7(pQL2cyf;Eao#M%d| zC}O2nbk&F@NTCEORci>gUeaB2Z6Y;kiKN!u#O(c?J$uf~_z(z%WSb!M$v@1~@c+K~ zee)lNaL(~xmQ-ki0OZhyrf##Tr8>X${!&R4ieyocWl12G&3K+Nn^8V%Q#z7o|I7ixIqWWb9#|OF86x_hm`yKS@fD^q|D=#0s|zO(95|94XyKEKQLxDAFcl zmd)8r+I)7;_SNq%Wk5do_MCCGPf|BsBjLN-@4|Fd4Tc+AadB41Y}$n1qoTs^M1@~N z@VZho+`JNzNdx24mi^?mfC6A%R9Gw?&LOx}5#6UR;^6wnAom`_WMml8xB<&%h{g>J zO#F?nPfua*7XvtYYH}`90=Aqx;4?|RdrB1^P`rK;Y}$ykzCCF8Ilht zA(ywYv*mge`@Q`8(L~?g)|$HIL<9gZZT@=CX!3A-Q@Q8VnHZ*1d1#6RS(-DjY=)8| z1$C=e;=qZhVKO|im`*_g0O{oB$8D<+`9rsUJ+B|# z_t4r07t<(6003Db*E%wVu|S!lqHSw6iHy%e&og)&BGw0r5zA0S&S#T3Q+%qB#$^cr z;JMJiIz=QWYp-=lw^n;pk0v2&Qv5uTw!-H!rp3|tR$EQ~zcv7X-5(8A5`}kA&Ufx^ zsTAHkcEJ`1zBEnx+S`u?$1mH=IbZhL73#NQ(=om))NjA~NsnVWJ&V5ND_Q>|gXcp- z_lg7{gg_PvO%vbUSIpqW&Y@>CnICT3QYMK4LEDxxMU_bB3!e?OFV%b5F>P*sT3xff z^+1tJ+tIqY%u(!?=l9}S3!xvPMk*P9ulLiAeWGP$!{P9PAFUukFj()Mo*k_aMQK~P zPnKsgCK9?0$~aOwMLNfD<5ezIQQeP7f^(G(sUjGx_b!W|wzgKyiK0(n#8(zrTXjR- zeeJHIk{}o56_krk5!3{=5;;9N{(Izj=+CjA&Tx(d6L`WwX(AjBn@dI%4Ay&@K)sxx zh;Z)V1a1y!1VjM<4xT4~K{zs;kTl^)QGq3f`}$H#5?n$eSeB|WiD?k2MmSdqL>VBA r6KaV-&SuO|0X+~1|/bj|/baijiu":"smileys/liquor.png"; +"bj|baijiu":"smileys/liquor.png"; "(L)|(l)":"smileys/love.png"; "(U)|(u)":"smileys/love-over.png"; "(S)":"smileys/moon.png"; @@ -34,5 +34,14 @@ "(O)|(o)":"smileys/clock.png"; "(um)":"smileys/umbrella.png"; "(6)":"smileys/face-devil-grin48.png"; - +"(st)":"smileys/rain.png" +"(li)":"smileys/thunder.png" +"(S)":"smileys/moon.png" +"<~>":"smileys/cloudy.png" +"*-:)":"smileys/lamp.png" +"(Y)|(y)":"smileys/good.png" +"(D)|(d)":"smileys/drink.png" +"(ap)":"smileys/airplane.png" +"(tu)":"smileys/turtle.png" +":-t|:-T":"smileys/time-out.png" } diff --git a/retroshare-gui/src/gui/smileys/good.png b/retroshare-gui/src/gui/smileys/good.png new file mode 100644 index 0000000000000000000000000000000000000000..127d07313db268573d39468940611007f2caddb0 GIT binary patch literal 1011 zcmVw}^~U%U|zW23Zz5H~hPb7|5h&2=}K+1=ThbN)W0rJJ}}Qf)nOn1M6=erLXq zGegXbTRFrnrT-rSwcSGT1U&{JPcvvnQ}}4|bsqaS0;<-5`yw4wPIAaP@^sYXE^;t* zX36-bBk>k5+^C>>L;}sIYb;YlLGErNb@2YQh^lY!JVkDbfHX#VdD>zl!0S^`ZCy&X z95_&@mtWvDx}n~xKJ1+2c|f1i;{zp1>;bQ4VIAs;Qo5zPP?qn2i2joR00L?H^yE3s zECG_>^}k@>`*@sE4Nnz&)dlZ3J+u=+)si<>h>E@9W7*pIh-&YQa(*0$H-VfxU}lC8 zjt#o(dkYNyh(q(a^9GOXSm5>2Q2}`x_04Ik<3UG671*5yNCL_MIW2&lgvnolo*xf* zW+X8F+GW=IIj4`mt0^e-%3g}4PFS4}$3?ms>|O#2a{!4A0ZBkefE3710agOAk}!)C z2!8$2=W=;({7t@mjkmdj7bpfHU$q~2CQh~iU-<>_X0PpKW75?t01iEHX$kDjLS$MY zcD49MVSgoZv*2wmf_0&=oWs=j{Q#RSfo|&Px)coPGN``M7N(W}07?00ZekMYy{*@& zM4N#m{`p3%LCJWOkTH;o19l1!5$MGUgyVyr zUcKbyeDU(T=YscM>F2Pfpu4+UEr((9v%}|~Y-_MiTK64`in`rkzW^@g!QKkOxpCjj zU7)o!^6W~C2!jw&J$-lzB+YyOdR_0{o@KI6B<)0u(g;g zs@VzG8u@T?-w(g%67!)jF0|5+VO37mh}wI4B9UCqk;cSrt)2auayq*d(V9pxGYKsW zh{`0iZ-Al!3ZZR#V*>*&Zvk%qu>;W6)n%1Rr3g|f8)0ZmArt^;V?u{0SRo1`u3O4x hv%yyIjs!Pj{0)Pnn!GlKRP_J=002ovPDHLkV1m)p+Km7J literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/smileys/lamp.png b/retroshare-gui/src/gui/smileys/lamp.png new file mode 100644 index 0000000000000000000000000000000000000000..0431d75bb4b560cfada7d94d4872fe31a9b0937a GIT binary patch literal 1259 zcmVIr z+4tC@n4fGit+u#fghH|DIiF9uK{Yq-GS1=S*x1aW{rfZF0|Q<;c8qpbmY-VM;VgZ2 zRT4|pK+ensv{(sr1k@rH3lkA0VwR4la}(<7q<1xXt+=Tkq;8A4Dl6V!l61PZ^)9Gf znV2h1muo}{aS`ooJuwsro*VTO&TVf4bUjKjFKXwSkkCg^0~_Uff!%AA~6a`b~J1e zDz)~ZcH8%PSfB(wjiOH}p;SpKDdmjPA|eQa$Tg~bLP#|TrFgg_5(g}-zuWJg1d3pH zGHwD7VUkf&Df{A@0yV1?%({N~htAN|HBvMfDKd?gY@L=uq4FJZLn1<|ApjJNdx5A% z3@S~Xl(`7=6GcClFV`*)j!ZAM3~l!J>!of>r>?D2SJz27YBOHrq6!MHH%_1+J2qA2 zO%di;2AQ*Uy<{`$o*katzJ5jP$+N?g+c!MYdcrm}*D*CWW-zxUs@peas#QdlZ3rL= ze>`(J-yO49S4-3q5rdW@7IP7SpSqlX84-Bj#feuV263Al-AzPwKWeZgeV6hpmBgPK z0uJw5J>dGH|MYM^Ova7ggrnDDj_v{ge9n0nrCPu=+i$`s_|pf$pFRkP6aWBpDU-yu+fu1i zYdW2_A2`AC<=c#S9BeR6M}`;$08jv6wSEA%&j0{Qh~`jIjhH5a5VEJIC(Pw?K|{bD zVgO#CoxgD6z#WUM}JSg&Ztoz@(If5F#POfNIKDh@SL3 zFOf);`uqF+2L=EDAR=Zm8KYb-8=P|k9fv6?k%ytM0r;G0)*`;|XR}%UuM_-N`Wpjs VAJiX>_0j+U002ovPDHLkV1hLSJU##b literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/smileys/time-out.png b/retroshare-gui/src/gui/smileys/time-out.png new file mode 100644 index 0000000000000000000000000000000000000000..1090b3077f722422efaa4ecf8b82a406c8e81682 GIT binary patch literal 1521 zcmV3~@_?#}R-#-agbGDMyigiY1h_?|RSFWkfB>nbLTW|JQ;ATKMQY>#vJ)k-JBb~q zvB#FLwKKkqJwE5mnZ0>%;@CKicVDmt=EWI@O->yv8OKt8E4# zSQy2h9@8t?A%AW3O3nm)>A^pkq5lu?f~ZR~oRCEFqOV7%Ws_t+8aeZ4y+$`rPTbii34RdcA@3mi`zy3w6iuSt# zv_AsBdn-!5WSngoTzEz@R%P;J{UeXYOEN~3Zb5t-vG2jC6ww2nSbuyM)M<<{U<@=i z!sA~?RP2th%?jRmO01UM4Bq#RXEU*SM`U6EcdiJc2pc|4(C{FlQn)i&+^KVbA#7~I z{Piu+2GO^j*lN*co9<6>JlWiqPNZ8!#`|$@c&vZsW!BqY!ue>P*xU&2>=4fERo2_P zSZ{v;XKn$d9Mt!I0)Tq%*G$&76|c_mL`9c530vpD;%KTp<3;OP+>ZkM%nyjF5A(_! zy}a1lf;%;cJK4vJz0JJxMlVtIVf@Tjh+S>#umrk#-NtH{p+dS;) zJr|xRf9i0rgccqoigZO$qxB;{9%L=m=(0YOfWtLW(mrRh{;2FkuW!kUSHg4 zNBl4=*&$y?^lt-*h`idzd#l&4j2Cks8n^N|=mKtCNa6ep`P0LMbJLXOrpcckpwK@? ztiFU%g7!zy{s_iW6m!?i>h&w*ulDhthzQ)AWD!y6blUBDc%h?Xk2%x&!=ER@)z>Kp z!(mzWShXW8HaUj92&U?VpI3Fxx4Xy%$9C?(H_y1iSn37{%=V}LXxm;+B(EnZ>T#6)5EF0y*1vWs z_xtY;w4QRJX!-Kx%RW%Pb;GKvs&Z}5Oa5!2daNm&NSKTNI8f32Su45sNfDJml!MU) zL@eyse(d-|#CCm^^~r+y@Hf8-v)2l5zdY3PS{bVt7K=eXpN{~23m^>*4OS%LBDT{r zzx(?9s>(KuzJDm3n20G=tL*q;@v5J|_P#*0T*cbxqM7}BcWJ!4d;aySjX(R-#J+Bg zEJs?exk~x-^Yam4wq>9zE8~@}TPeouGG$3Qwp2d7XZ-VfEBpfu6@GhCqJ02s#-5m2 z^|F(z-te1K_nj?8rXZGCF(ONaFf6D-VSO`$n*ae+I-Pb@O-(Ej1YTs@aii^+IL1|x z*h(qOXuZ*ON@=ZiS=%NuB?(1EfgMHb#aPVOH*N&ET&@IYV~nu@j4?(;bS{@GQBzai zyR;NmRaLF6IoRHsYlZQW@=BJ%Y_uLCCUnZ$UUPKdh2>OB~?8 Xl}o5Kp?xbD00000NkvXXu0mjfR7>4R literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/smileys/turtle.png b/retroshare-gui/src/gui/smileys/turtle.png new file mode 100644 index 0000000000000000000000000000000000000000..505d5b221a3af03adfa0eaafdfb89933c2ea77a2 GIT binary patch literal 1078 zcmV-61j+k}P)K zl}k*VRTRhn=icv|`DS2-0ft9PQ(D51I-n%Av_e}0JB$l;Au)i7CS9mWP2(foG!hqG zDr$ovsn#YcHL%d8E_}pvA#IwzkN~X%3P`cg2lHSC=J9>^9v2O!6{u0uL=*qpbMyP< z+>?_-%#8aPabM~G3;q=X0{{lvNM4iTHDS<8T5-9MbdGKH;>(}$=sy(@GvmEZ*%K%# zf4;gp+uW_MGL9e- z-f5S$_xz%jYpmO3OEIsoq3IrG->jREU7T000nQOduAGA$lXm(?88nYJMJj z7NG)~QUG4x-=~fk>(T+lBF&SpY#6k2A|~dqFYvJKB(Az?TCv^)06~Ulqcp5yMF^#w znXfK}YcGex>HhwHwZd2>sIRZjvrW_QlG5i_B406Y-0C**0D(5lD)&bh8+rt32?9SB zy3}1$VSxw~i903IonIH3no5Ot?Mm88#U{?4UA#-s($ZpBmSq939Ka)`&bzu)aEyOV zb}&OsEC#