From e8fa07d6384c9eb2a0fb42b0e06abb6a0d5fdea9 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 28 Jun 2012 16:47:37 -0700 Subject: [PATCH] CHUI-82 : Fixed all icons to use the new Conv_*.png icons; please use those in the new UIs moving forward --- .../icons/Conv_toolbar_add_person.png | Bin 0 -> 322 bytes .../textures/icons/Conv_toolbar_arrow_ne.png | Bin 0 -> 301 bytes .../textures/icons/Conv_toolbar_arrow_sw.png | Bin 0 -> 293 bytes .../textures/icons/Conv_toolbar_call_log.png | Bin 0 -> 546 bytes .../textures/icons/Conv_toolbar_close.png | Bin 0 -> 262 bytes .../textures/icons/Conv_toolbar_collapse.png | Bin 0 -> 663 bytes .../textures/icons/Conv_toolbar_expand.png | Bin 0 -> 662 bytes .../textures/icons/Conv_toolbar_hang_up.png | Bin 0 -> 460 bytes .../textures/icons/Conv_toolbar_open_call.png | Bin 0 -> 485 bytes .../textures/icons/Conv_toolbar_plus.png | Bin 0 -> 195 bytes .../textures/icons/Conv_toolbar_sort.png | Bin 0 -> 196 bytes .../skins/default/textures/textures.xml | 14 +++++++ .../default/xui/en/floater_im_container.xml | 10 ++--- .../default/xui/en/floater_im_session.xml | 36 +++++++++--------- .../xui/en/panel_block_list_sidetray.xml | 2 +- .../skins/default/xui/en/panel_people.xml | 8 ++-- 16 files changed, 42 insertions(+), 28 deletions(-) create mode 100755 indra/newview/skins/default/textures/icons/Conv_toolbar_add_person.png create mode 100755 indra/newview/skins/default/textures/icons/Conv_toolbar_arrow_ne.png create mode 100755 indra/newview/skins/default/textures/icons/Conv_toolbar_arrow_sw.png create mode 100755 indra/newview/skins/default/textures/icons/Conv_toolbar_call_log.png create mode 100755 indra/newview/skins/default/textures/icons/Conv_toolbar_close.png create mode 100755 indra/newview/skins/default/textures/icons/Conv_toolbar_collapse.png create mode 100755 indra/newview/skins/default/textures/icons/Conv_toolbar_expand.png create mode 100755 indra/newview/skins/default/textures/icons/Conv_toolbar_hang_up.png create mode 100755 indra/newview/skins/default/textures/icons/Conv_toolbar_open_call.png create mode 100755 indra/newview/skins/default/textures/icons/Conv_toolbar_plus.png create mode 100755 indra/newview/skins/default/textures/icons/Conv_toolbar_sort.png diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_add_person.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_add_person.png new file mode 100755 index 0000000000000000000000000000000000000000..f024c733f34e1075e243b6cb64290b7407f3be6c GIT binary patch literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^;y^6K!3-qZEw?HHDajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_d9MNR=eA+C!SEn2v6VSj&rdV0FFwDi=eQ!_F$?CtH-($f0+ z`WhP>7cX8cBO_yFWo2Pu;qLD4?d?5l)~spMrWqR>r=+9+jWO>!SOKKON`m}?|6>CT zjF%2P0jenRba4!+xHad(YpwG(K#fxrDY4{1WpTX1B&t;ucLK6T10E^oI literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_arrow_ne.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_arrow_ne.png new file mode 100755 index 0000000000000000000000000000000000000000..a19e720d421a7f358234a8809ebd92f2d577825c GIT binary patch literal 301 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+3?vf;>QaG}WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!foj{u(#*E46%*x1-io;-Qpym=coY%nx5?CtIK^Ye3bbTlmj*iurbNJ*3g z`33*S4j9e~>%9W13HNky45_%a=7OhCg94AsMVBiLn=PLFGZ%ftpgH~5^!%$=53GNn zyf#|)wNS6Ihnk?!#SPkAp{ypenx-t#;JP)(#bSBzjc=EIr+;`ff8{#Sz}K?>J{?g! a!0?=3{6^ipAHF~<7(8A5T-G@yGywphBY%bf literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_arrow_sw.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_arrow_sw.png new file mode 100755 index 0000000000000000000000000000000000000000..7f3f42639d1582bda22dd1174973f79dd173063a GIT binary patch literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+3?vf;>QaG}WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!fo*8rao*E46%Or1J4FE7u~(9p)lCL|0#-)~`IQCeDRW@ff>F!Yc6<;IT#4AUc5e6;h#{-fA3PE-eVJ_?jul` Ro(MFa!PC{xWt~$(699YLd4vD} literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_call_log.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_call_log.png new file mode 100755 index 0000000000000000000000000000000000000000..2880eb766a286b1b1fd6f71f52500aed5544c3d0 GIT binary patch literal 546 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8T>(BJu9}*fXU?3NIC0{H2^0GI`qr&mH)+x&9UYzJ%a?a| zcQ0MKw7tE3)v8tf{r$_9E!(wg*Y4fBySlnouU>uX)Ty$vvbMIio}QlG-d;UDJx52! zg$oykg@tKpX$1!dJ2^QO6%}pSvL!q`+}751@7}#tRaH$*P1C1O*VWZ^adDYCb?W-{ z>-X*3w}1csy1Kd@J9f0Rv?M1dpFVwh-n@B1K|wor?zFSB)7I9WGG&UJn_EOg#N^47 zJ3Bi=LqmbiPgAUv15$P+L4LviDFF<-eixbnP1@q=;uunK%jG;f-ys7Y)(ih92W2dD zV87sWv--X7`+D6;BAnixbJZg^PF(rI%KFo#UoWIynVfJq#r5;t!y`|bZ?lP+-Ih8v zhe3lUNFmAi@J!>cZYu*qwx8vj_2%zGsaq>pPbgkpxr?o}F*JAGWaj`Wjo=q@^H+rP z9BEQwyTiLCIcbT;j^i3N3s3K6yt9nG;??al=`HbJUcS6|drI1rBa3G1Kc5h~`st)= m`L}a4UO%}}_v)AS0furXp)Wr(*%kxc&*16m=d#Wzp$Pzp+7t5t literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_close.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_close.png new file mode 100755 index 0000000000000000000000000000000000000000..25a939d7f5fd05a2b6bc035c5df7d17004284090 GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+3?vf;>QaG}WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!fog8-ip*8>L*Y}>XiEiG-$nl*)mh34kwGiT29^73+UaPaW( zC@Lzlv$N~(@9*pDi;ay1YVy~b*9fEpN`m}?|Dyti2gel^uD@cQp&l8s r(OPne$Uz;i? literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_collapse.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_collapse.png new file mode 100755 index 0000000000000000000000000000000000000000..82baabde471104747028481346d268a9b51bc8fc GIT binary patch literal 663 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+3?vf;>QaG}WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2v2cMvefV5Lb0|bqx&-LqkJjV`D8XEgc=5!-o&6sj1o7*_oJ_ z*xTFJ*Vk)mYU=6f85tR=sHhw}cI?E76DLoeJbwK6kt0X+_4PwTLysOkI%m$Dj*bpx zW#wJFcAY(YR#jDX!-fs>=FK~F=ul2h&eW+>_wV1|)YPP_t2=AftSM8btX{o(<;s=Y zw{Jgq@Zjmwrxz_+)Y8%t5)z`QsJL$3I%{idPfyRaYuCoc#)gN7hlPbXI5?a+bEdVm zRa;xTqM~BQjvedQueY(WDJd!0w{Kr(XQ!j1aCiWT$c&z~`41~A0l-nDuNq#{a!{DS|} z1~632KEwgEKWxa<_B=kI<9!MgtdJ`@Vd&>g1NDM%v*dHOyXDHCQ;TYx|nyjpn-qu4aSYKL2h=J z)UFuy9O$h{dFmuncuYN2NmpUZ%3~2M#TlzIms*|7S4ryI9ooD}Ew$yr!H~{{-hy8= zR_m;oxA;`8d`XyS_|^?uo*lWiM*P#x+wNBR`&}n0ysQ7Zuv*}P;;cskd`=?YzjV&8 cVU=JA?ezNn@}}cIpl297UHx3vIVCg!0GjJc3IG5A literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_expand.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_expand.png new file mode 100755 index 0000000000000000000000000000000000000000..7d64abb042b7a5bf99a67014d936038aa669fb83 GIT binary patch literal 662 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+3?vf;>QaG}WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2v2cMvefV5Lb0|bqx&-LqkJjV`D8XEgc=5!-o&6sj1o7*_oJ_ z*xTFJ*Vk)mYU=6f85tR=sHhw}cI?E76DLoeJbwK6kt0X+_4PwTLysOkI%m$Dj*bpx zW#wJFcAY(YR#jDX!-fs>=FK~F=ul2h&eW+>_wV1|)YPP_t2=AftSM8btX{o(<;s=Y zw{Jgq@Zjmwrxz_+)Y8%t5)z`QsJL$3I%{idPfyRaYuCoc#)gN7hlPbXI5?a+bEdVm zRa;xTqM~BQjvedQueY(WDJd!0w{Kr(XQ!j1aCiWT$c&z~`41~A0l-nDuNq#{a!{DS|} z1~632KEwgE zAj5YXq0^^lT33FRZtLCEqL>r1HN(Y2u;|e2L+LGBo}G*eysRe2%W?G8U}fi7AzZCsS>Jie?7*gt%V2cJ17`bN&7OhYlUOdi82%X6EVBr+4n$dFs@u z!-o&Y$H!MyRjpXDV%M%++qZ8wH#gt3X;VNzKvGiD!Gj08ySvNE%7TM~qobp@ZQC|+ z;zS=GA2&C*uCA`m&d$Y)7nhcn1_cFmbadF++3nrC*VWZ^&YU@C&Ybb{^E-R??6G6V zcI?)0V(5>Aiv=MBm;)Rd3*bS+Pgem z978H@B^eyzl9+JgjS5F`(ZCr)8ez?&N;;s`ztLr9+~in!t6cVHc|Jf_F?hQA KxvXQaG}WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8)d4;st_Kbr*tKid{{8#+?b{b0AHQeM9)ExTl`B`yojZ5O zjvagV?ky-NSg~S-ot@pmg9n?Nn;RM$($doU`};R-+B9X#l=}Mmty{Nxd3kkobgW;$ z-p0me_wL;l6&0&jubweu#-vG;wrtsAZf@S*-o9bOhRvHdCnqPjw6rW=zI@`uiB3*V zB_$bS+r=;(d%8G=RNTtBaGmdv0T1hi*-NT7pU&b=&DT)=|37t)f-2wF z$)zcg-&+4@XYB3X>=<^b-eOAIzceX9uE}?fPV{SC+PiV%JtjZ4r2?{Ezol}VGQ}2n zzn98Qj2Def(v*I%KrV{q^Vgt+rGH;^Iv%~aTf3;@qtKtfS0;5t9JBa6p&)PG{_g0{ ezpjQiFfvpKSxH5=ryc@2i^0>?&t;ucLK6V+ar93B literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_plus.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_plus.png new file mode 100755 index 0000000000000000000000000000000000000000..0cf7edc2d467712a380f3a9d4fc58a401598f94f GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+3?vf;>QaG}WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2z_v0G|-oMT-_mOG__YxNz~}#WFH7K;hLIuh@YUTS<^#@P80s z*t~zqexQh{r;B4q#jT`-qYOM-1dmD120mJ>htOv!#_pSjNz~JfX=d#Wzp$P!Jm^-fk literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/icons/Conv_toolbar_sort.png b/indra/newview/skins/default/textures/icons/Conv_toolbar_sort.png new file mode 100755 index 0000000000000000000000000000000000000000..a0c15a6d3e5785fe7f5b3311ca1a9e545b383667 GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^Vn8g!!3-obe&3S^Qj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS>JibMl^LR=RuS|lwk?cw2JWo6~*>A7&>LZHmaouMv3ioGPr zFZe$gFi3eby8(raJY5_^DsCku9OjZ(q13~(B8@|tBVk1v+iBxui9<{xsRthksfDSn j2{XEQ%UXq#nMH!Z{V)4T7v0G1K-~ + + + + + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml index ce40f44a64..8e434b5848 100644 --- a/indra/newview/skins/default/xui/en/floater_im_container.xml +++ b/indra/newview/skins/default/xui/en/floater_im_container.xml @@ -15,10 +15,10 @@ width="680"> + value="Conv_toolbar_collapse"/> + value="Conv_toolbar_expand"/> - VoicePTT_Off - VoicePTT_On + Conv_toolbar_open_call + Conv_toolbar_hang_up + value="Conv_toolbar_collapse"/> + value="Conv_toolbar_expand"/> + value="Conv_toolbar_arrow_ne"/> + value="Conv_toolbar_arrow_sw"/>