From 6d444398e9054c2c3e3921c628c27476344df94d Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Sun, 13 Dec 2009 14:13:42 -0800
Subject: [PATCH] EXT-3422 Add IM/Notification pending button art, style and
layout of overflow arrows, align message well with bottom bar
---
indra/newview/skins/default/colors.xml | 2 +-
.../textures/bottomtray/Notices_Unread.png | Bin 331 -> 3693 bytes
.../default/textures/bottomtray/Unread_IM.png | Bin 416 -> 458 bytes
.../textures/bottomtray/WellButton_Lit.png | Bin 288 -> 553 bytes
.../bottomtray/WellButton_Lit_Selected.png | Bin 405 -> 687 bytes
.../skins/default/textures/textures.xml | 6 +-
.../skins/default/xui/en/menu_land.xml | 2 +-
.../skins/default/xui/en/panel_bottomtray.xml | 84 ++++++++++--------
8 files changed, 50 insertions(+), 44 deletions(-)
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 33dd7791dcf..b6995d2122d 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -67,7 +67,7 @@
value="0 0 1 1" />
<color
name="Yellow"
- value="1 1 0 1" />
+ value="0.114 0.65 0.1" />
<color
name="Unused?"
value="1 0.5 0 1" />
diff --git a/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png b/indra/newview/skins/default/textures/bottomtray/Notices_Unread.png
index aa3898ca99f816f86ecb763761d43d91a3d7420a..0ac5b72b8f70e67faef73d07f1ffcd483690c4c1 100644
GIT binary patch
delta 3620
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
delta 233
zcmaDWbDGJhGr-TCmrII^fq{Y7)59eQNJ{`Q9|tp#WKz@d0aA>`LGDfr>(0r%1adMb
zALPodSGwu^79>*=<QL4~@a#q!kkjnx;us=vIrj8Tv1SDx*FcV@ORLt-Ro8g(-+q&!
z2kZObYd5u>F8umjzWKXJIph3@^?M`O{@)4x%P4HHz<TPXxUary4%cO_*IoDe#p?C)
zd7tEk*4kH#!wx>?`f^yv>K*Ha^8$<C@ZIrVF#n+L^SH+H$KIwZ!yS~)UJ{o06Ku!R
e%zB6C4Zr$Pxzz1d{9!=%FnGH9xvX<aXaWGdPFYz1
diff --git a/indra/newview/skins/default/textures/bottomtray/Unread_IM.png b/indra/newview/skins/default/textures/bottomtray/Unread_IM.png
index 598342ea805b903d7e1b5bc9b25d86d41d2d9c96..5c0c85b864e4d3c76c17fe10e46994e191cddf6e 100644
GIT binary patch
delta 430
zcmV;f0a5;-1Ihy-iBL{Q4GJ0x0000DNk~Le0000O0000G2nGNE01PC*m60JRe{4xa
zK~#9!tdl=W!$25^)3kyPtxzZx2L~OBqM(D5T|_duWpE8-&6jc$L0tR_1qT&%=^zMF
zs1%VV5url<`CQ4>R1#ZEUU>Mu_vY^R-W``x6h%r#l%WM1umV-6#ot00fD3Q%2*Wg!
zQc8m+?8Yo9^T!L^Ll?ZX24csDf6!L)#XDTWYqEg~I&3S&ggC(|^wqeqSD?9w1vY*X
zhGDr97xwcyiklE%IwlB$WoXF;^#Tm1@O@usT{f`e*OS+9O2L&4ZsE89!z3S`=XGU+
z8_d>WGl!vqq0Buv*EB6CiDGQ1!Vw(&!!S9v;X>E-{`fy|9Ot*uD%wW3f95ol`6uf-
z=$&C0KYwzs*UQ@BB9qrpK?@oQ!x8zAbpxrUX+Ebtj*9ELSv&k<{Dcas<PD4h^a^>9
zb1lpI^Ep>++s-=j_+)4k-4Rzn{fxXXuTwB9CJhpX6Qy1w*U%1n4I_D-@}<p+Zvh4X
Y3vE{P@{sKj00000NkvXX1g=70f^pBfv;Y7A
delta 387
zcmV-}0et?-1E2#TiBL{Q4GJ0x0000DNk~Le0000D0000D2nGNE0CMZ(e32n2e?mz_
zK~#9!V*LOAKLe?N1w=41GBPZ=ew+u$3<P2~AT|eLMIgQp#3zAx7Z9(H(X{*mvV;*t
zEWL3;;m_~iwJfZxNw`c0%FhGJH%Dt&JYWI|ynX$;;2$GH(yu?i8E|2cJV+hfdB6Vt
z3IFl?Cqch})B&jiu%=I6K5{a0f3gtN1X2g0!OpvK?DV6rKff~&!XR~U=bhhqaOpp0
zhCFpUQz=}w+&pyp*+rl_hBm0C2j{LXeE;G#n}nfSJu@3CGguWcRKI=r{NvS~M<1VD
zxbg1Jk#kGFz5BQjZW9o^aBs-C_4EH9=D%Nl{JXm8!2NT}cYvJo3WzTOS@9VlJ`BX)
zku@>={QWca<E{H2PR?9+`NPBKlYv63afS#ea)TB(FzZITtp{=^0I@W_5CkVXXxamX
hq6abQ4x}C+zyL53!$ezvn`8h0002ovPDHLkV1j9dtAhXl
diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit.png
index 60676b43fd96e34c728bf71ab5fcfc0a442cb491..dd9133bcc463fe3303ae364bdd381ae3132f66a0 100644
GIT binary patch
literal 553
zcmeAS@N?(olHy`uVBq!ia0vp^ia;#R!3-ofNnU#kq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c75xeD32|);mn(4*oR(|Z5v2eGqN1WYIy!=af^u?lQc_Yv
zLPE;Q%7u>HItpTC?m{*GGD=EHC9Z<n+S-i~Y8750?NQ2&LDE_FLfKAY^#M|KfwJup
z@>O2KJ&8Jsii-Uyx}C8al|E7?T1tJ%dJRFc-3eL-1_rXSvi-^WUGbWoF{*75imegK
zjlptxjzaSC@~sJmnGV8+>hgMedeif)D?Ej};#50hl-r_I>toGZLglKxMTCWgyJFR(
zrKRhF<VxLyTEpc#l1!@oWC|U)%3XOH1H~Ks#hZd9YkfpYTzE>Hx!b~J%Urmty@Xmq
zqzw%X3+y?I9JvGp1iqwwQ3ZwrYe|q_@P8m+_`QuU7!-(}E{-7;w|Xue6=iZ1V7SPZ
zCK`R`E)XOpd_K==)$sDT{q>CvD<|b~X-qmLvEruZeXUFHwn=#0zH&m%=u2i<z$rt4
z=odyac3LmYDl!n(cVg&1G&A7vq9T=?4IcA3f_09GI|+3Enk;ZIsZ{mH#taz_W1Ua@
zPBPsudJPU7`m4C(pLSXGp<m$|GtCb!E}n3RukgW(3>mL;6I@rkoRXSw@@Y)PrfZMO
l63%=O+u4z`VLbyggW0FelX=oZ=L22O;OXk;vd$@?2>>VQz9Rqt
literal 288
zcmeAS@N?(olHy`uVBq!ia0vp^3P3E*!3HF=SbZM?DVB6cUq=Rpjs4tz5?O(Kwj^(N
z7l!{JxM1({$v_d#0*}aI1_o|n5N2eUHAey{$X?><>&kwUhm%K#r=nrDE>LK$r;B5V
z$MLrp75NT1h`3(7eQ8+}3s0t&z!D9fX`((i9KQ$H3iYme7j@#zqIoQhTB}lgF1Pe6
z+&z@=@9qKXlifeIuJSb#*l?{k`@vj>*|$>ki+wonT-ask|Lo&oP5wRinZFp;`!R9_
zG%$%QU|`iy_~shAE04?W%`VRPkW>|=?q!+VzTbW-D73*ozWmy)bQPt~qTUL;1>Fq7
c4;s&l2fxu&4PEFsALvj9Pgg&ebxsLQ06zj`*Z=?k
diff --git a/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png b/indra/newview/skins/default/textures/bottomtray/WellButton_Lit_Selected.png
index 98cde96aff13e42fc24f71d793613b32737e7b34..0080e71f4191729d2902dc07d49329c185833100 100644
GIT binary patch
literal 687
zcmV;g0#N;lP)<h;3K|Lk000e1NJLTq001EX000*V0{{R3vKiLx0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzP*6-%MQuSARxb-6ARq||2`nruRV@oh
zBLX@k6gMIh5D*X@9UW3B15qdgA|fIj92^xD6-FTfL?8kqBO?k53SBb{a6=YWD+Fvn
z7FRF}S~Cz=Ed*&l7Dq1~Q#BbL9v);l4_h(}Q!o=uC<<XU3nLsCSuzhoDjGyEB3(8V
zO*SQNL>p*45?M16XFL=wEiGCu24XoBXFL%~DGNt7Do8LNHX#ycKpQzD6jd$^HysHW
z5e#HF4ipp=LLUM|EgV!c7GgIHX+9QNF$_*TE?hJWY(W@QJ}pTxAW<p_NHQXALK#*s
z4Idd3Dk>^L9|UPW6hAU1OEe)uD;iNN3@jN7D=RBhDg+M?4^%7)8xsv?I}-~F3k(bl
zU^^KW78WotFmgo}RX{CYI2C6(3~oRZX*>^aK@?~^4QxIUTQ3DMF)>&y1X?ZxUNHq-
zFa-z*2+JL_;{X5v19VbOQ~&<}*UAk+0002yNkl<Zc-mrM;^K_X#{rnbxtN$3_*9IY
z-4byCO&>WX2F`#$dyOO<AXb)Nh=EyM(LkI52M{+CW?{(p)bSThzyU<H^0OH7-6gft
zZ~`xo3KLbs6r8{nq(a79J_9F^2C1;KuujDZ96>6AA{^3j0$q>_H4o)voFEFM!kkSi
z4<~Q|sbFWz&cz8th*TjUhT9eekO~fguuPo539LepI|nC_AW8+ZsVz@7PQWOf#lRWj
z$0LSIfxZ!c76YG^r4lPEBUZo~9O=u#z{C_6gEJ-D=w%53Rq%$!XW;@Yyi5QA1^~{p
V0jOh;?wtSt002ovPDHLkV1kK7z1#o*
literal 405
zcmeAS@N?(olHy`uVBq!ia0vp^3P3E*!N$PAD9cn^4&<<;JNh~@Fl_AS{*%ZG<g+Dt
zySp&_2f+n<mrn+Ya29w(7Bet#3xhBt!>l<HKtc8rPhVH|n>?I+TFPzxSLXl?6!LU&
z4DmSrcCxMaVF!tZ`Q4g+jO{62qJb9_&2OGv`ry&Lyu81{jQ^d?>KkXz{>vY^X@^?(
zf{q)Std5!;eCxYgw`_G=f5Ga`=DT-)f80|(M@X<KF8YVl&q59B=k1eC`HVH}`BJkU
zzj&6C_4xOcs*8~_QU%t@Yws6zxiS`qmAW-28l*=aKOKFR?=<_4xO-6*5oxZUUH=|g
z-xg8T_CMaClcRw>=bvGCLptk^I+-xFyQ^QTKP}VuTYdd8zw+M&*TsJKY-4DMPGc3k
zrLoiaT2yBTbB^SVJ<R%CH@-doVE8I4%yXt_58L6`@=JHV*v}MNsQK_<;@JpB?F80q
xdJ9}qlszZyJ-vJN?NGCK@8`=d$*lU%x!B+D`T@fm?|=cu;OXk;vd$@?2>@fEqbC3W
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index bab39b10ab2..0317d557681 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -593,9 +593,9 @@ with the same filename but different name
<texture name="Unread_IM" file_name="bottomtray/Unread_IM.png" preload="false" />
<texture name="Unread_Msg" file_name="bottomtray/Unread_Msg.png" preload="false" />
-
- <texture name="WellButton_Lit" file_name="bottomtray/WellButton_Lit.png" />
- <texture name="WellButton_Lit_Selected" file_name="bottomtray/WellButton_Lit_Selected.png" />
+
+ <texture name="WellButton_Lit" file_name="bottomtray/WellButton_Lit.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+ <texture name="WellButton_Lit_Selected" file_name="bottomtray/WellButton_Lit_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
<texture name="VoicePTT_Lvl1" file_name="bottomtray/VoicePTT_Lvl1.png" preload="false" />
<texture name="VoicePTT_Lvl2" file_name="bottomtray/VoicePTT_Lvl2.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/menu_land.xml b/indra/newview/skins/default/xui/en/menu_land.xml
index 54e2b7650e7..d88a2f8d25a 100644
--- a/indra/newview/skins/default/xui/en/menu_land.xml
+++ b/indra/newview/skins/default/xui/en/menu_land.xml
@@ -3,7 +3,7 @@
layout="topleft"
name="Land Pie">
<menu_item_call
- label="Place Information"
+ label="About Land"
name="Place Information...">
<menu_item_call.on_click
function="ShowFloater"
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index a41d492624b..034f685ee99 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -114,7 +114,7 @@
width="82"
tool_tip="Shows/hides gestures">
<gesture_combo_box.drop_down_button
- pad_right="10"
+ pad_right="10"
use_ellipses="true" />
</gesture_combo_box>
</layout_panel>
@@ -126,7 +126,7 @@
image_name="spacer24.tga"
layout="topleft"
left="0"
- min_width="4"
+ min_width="4"
name="DUMMY"
top="0"
width="4"/>
@@ -168,7 +168,7 @@
image_name="spacer24.tga"
layout="topleft"
left="0"
- min_width="4"
+ min_width="4"
name="DUMMY"
top="0"
width="4"/>
@@ -211,7 +211,7 @@
image_name="spacer24.tga"
layout="topleft"
left="0"
- min_width="4"
+ min_width="4"
name="DUMMY"
top="0"
width="4"/>
@@ -243,7 +243,7 @@
<layout_panel
mouse_opaque="false"
follows="left|right"
- height="28"
+ height="29"
layout="topleft"
top="0"
name="chiclet_list_panel"
@@ -251,24 +251,24 @@
min_width="180"
user_resize="false"
auto_resize="true">
-<!--*NOTE: min_width of the chiclet_panel (chiclet_list) must be the same
+<!--*NOTE: min_width of the chiclet_panel (chiclet_list) must be the same
as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. EXT-991-->
<chiclet_panel
mouse_opaque="false"
follows="left|right"
height="23"
layout="topleft"
- left="0"
+ left="1"
min_width="180"
name="chiclet_list"
- top="4"
+ top="6"
chiclet_padding="4"
scrolling_offset="40"
width="189">
<button
auto_resize="true"
follows="right"
- height="23"
+ height="29"
image_selected="SegmentedBtn_Left_Off"
image_unselected="SegmentedBtn_Left_Off"
image_hover_selected="SegmentedBtn_Left_Over"
@@ -278,14 +278,16 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
image_overlay="Arrow_Small_Left"
layout="topleft"
name="chicklet_left_scroll_button"
+ scale_image="true"
tab_stop="false"
- top="0"
+ top="-2"
+ right_pad="2"
visible="false"
- width="20" />
+ width="7" />
<button
auto_resize="true"
follows="right"
- height="23"
+ height="29"
image_selected="SegmentedBtn_Right_Off"
image_unselected="SegmentedBtn_Right_Off"
image_hover_selected="SegmentedBtn_Right_Over"
@@ -295,10 +297,11 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
image_overlay="Arrow_Small_Right"
layout="topleft"
name="chicklet_right_scroll_button"
+ scale_image="true"
tab_stop="false"
- top="0"
+ top="-2"
visible="false"
- width="20" />
+ width="7" />
</chiclet_panel>
</layout_panel>
<icon
@@ -309,7 +312,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
image_name="spacer24.tga"
layout="topleft"
left="0"
- min_width="4"
+ min_width="4"
top="0"
width="5"/>
<layout_panel
@@ -320,18 +323,18 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
min_height="28"
top="0"
name="im_well_panel"
- width="34"
- min_width="34"
+ width="35"
+ min_width="35"
user_resize="false">
<chiclet_im_well
- flash_period="0.3"
+ flash_period="0.3"
follows="right"
height="23"
layout="topleft"
left="0"
name="im_well"
top="4"
- width="34">
+ width="35">
<!--
Emulate 4 states of button by background images, see detains in EXT-3147. The same should be for notification_well button
xml attribute Description
@@ -342,21 +345,22 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well
-->
<button
auto_resize="true"
- flash_color="EmphasisColor"
+ flash_color="Yellow"
follows="right"
halign="center"
height="23"
- image_overlay="Notices_Unread"
- image_overlay_alignment="center"
- image_pressed="WellButton_Lit"
- image_pressed_selected="WellButton_Lit_Selected"
- image_selected="PushButton_Selected_Press"
+ image_overlay="Unread_IM"
+ image_overlay_alignment="center"
+ image_pressed="WellButton_Lit_Selected"
+ image_pressed_selected="WellButton_Lit"
+ image_selected="WellButton_Lit"
+ label_color="Black"
left="0"
max_displayed_count="99"
name="Unread IM messages"
pad_left="0"
pad_right="0"
- width="34" >
+ width="35" >
<button.init_callback
function="Button.SetDockableFloaterToggle"
parameter="im_well_window" />
@@ -370,9 +374,10 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well
layout="topleft"
min_height="28"
top="0"
+ left_pad="4"
name="notification_well_panel"
- width="34"
- min_width="34"
+ width="35"
+ min_width="35"
user_resize="false">
<chiclet_notification
flash_period="0.25"
@@ -383,23 +388,24 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well
max_displayed_count="99"
name="notification_well"
top="4"
- width="34">
+ width="35">
<button
- image_selected="PushButton_Selected_Press"
- image_pressed="WellButton_Lit"
- image_pressed_selected="WellButton_Lit_Selected"
+ bottom_pad="3"
+ image_selected="WellButton_Lit"
+ image_pressed="WellButton_Lit_Selected"
+ image_pressed_selected="WellButton_Lit "
auto_resize="true"
halign="center"
height="23"
follows="right"
- flash_color="EmphasisColor"
- left="0"
+ flash_color="Yellow"
+ label_color="Black"
+ left="5"
name="Unread"
image_overlay="Notices_Unread"
- image_overlay_alignment="center"
- pad_right="0"
- pad_left="0"
- width="34" >
+ image_overlay_alignment="center"
+ pad_right="5"
+ width="35" >
<button.init_callback
function="Button.SetDockableFloaterToggle"
parameter="notification_well_window" />
@@ -413,7 +419,7 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well
height="10"
image_name="spacer24.tga"
layout="topleft"
- min_width="4"
+ min_width="4"
right="-1"
top="0"
width="4"/>
--
GitLab