livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-562 Align title and Back button for panels to avoid "jumping" effects EXT-892 Me panel has unnecessary horizontal scroll bar EXT-869 Only top part of "Map" button is visible in Picks panel - Reviewed by Richard

meow-7.2.2
Erica Olsen 2009-09-12 01:18:44 +00:00
parent 245172949f
commit fc076dcfc8
5 changed files with 128 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
indra/newview/skins/default/xui/en/panel_pick_info.xml
View File

@ -2,111 +2,100 @@
<panel
bevel_style="in"
follows="left|top|right|bottom"
height="420"
height="570"
layout="topleft"
left="0"
name="panel_pick_info"
top="0"
width="255">
<text
follows="top"
font="SansSerifHugeBold"
height="15"
layout="topleft"
left="10"
name="title"
text_color="white"
top="5"
value="Pick Info"
width="150" />
width="333">
<button
follows="top|right"
height="20"
follows="top|left"
height="25"
width="25"
image_overlay="BackArrow_Off"
layout="topleft"
name="back_btn"
picture_style="true"
right="-20"
top="7"
width="20" />
left="10"
top="7" />
<text
follows="top|left"
font="SansSerifHugeBold"
height="22"
layout="topleft"
left_pad="15"
name="title"
text_color="white"
value="Pick Info"
width="270" />
<scroll_container
color="DkGray2"
follows="left|top|right|bottom"
height="300"
opaque="true"
follows="left|top|bottom"
height="490"
layout="topleft"
left="0"
left="10"
top_pad="10"
name="profile_scroll"
reserve_scroll_corner="true"
opaque="true"
width="255">
width="313">
<panel
name="scroll_content_panel"
follows="left|top|right"
layout="topleft"
top="0"
left="0"
width="240"
height="575">
<panel
background_visible="true"
bg_alpha_color="DkGray2"
follows="left|right|top|bottom"
height="550"
layout="topleft"
left="0"
follows="left|top|right|bottom"
min_height="300"
layout="topleft"
top="0"
width="220">
background_visible="false"
height="488"
left="0"
width="311">
<texture_picker
enabled="false"
follows="left|top|right"
height="190"
follows="left|top"
height="197"
layout="topleft"
left="10"
name="pick_snapshot"
top="20"
width="220" />
width="290" />
<text
follows="left|top|right"
height="20"
width="291"
layout="topleft"
font="SansSerif"
font="SansSerifBig"
font.style="BOLD"
left="10"
top_pad="10"
name="pick_name"
text_color="white"
value="[name]"
word_wrap="true" />
<text
follows="left|top"
height="30"
height="25"
layout="topleft"
left="10"
name="pick_location"
text_color="white"
top_pad="10"
width="255"
width="291"
word_wrap="true"
value="[loading...]" />
<text
follows="left|top|right"
height="150"
height="400"
layout="topleft"
left="10"
top_pad="20"
name="pick_desc"
text_color="white"
width="225"
width="290"
value="[description]"
word_wrap="true" />
</panel>
</panel>
</scroll_container>
<panel
follows="left|right|bottom"
height="30"
layout="topleft"
top_pad="2"
top_pad="5"
left="10"
name="buttons">
<button
@ -125,7 +114,7 @@
height="25"
label="Teleport"
layout="topleft"
left_pad="3"
left_pad="5"
name="teleport_btn"
top="0"
width="80" />
@ -135,7 +124,7 @@
height="25"
label="Map"
layout="topleft"
left_pad="3"
left_pad="5"
name="show_on_map_btn"
top="0"
width="80" />

25
indra/newview/skins/default/xui/en/panel_pick_list_item.xml
View File

@ -7,27 +7,27 @@
left="0"
name="picture_item"
top="0"
width="275">
width="305">
<icon
height="120"
height="120"
image_name="ListItem_Over"
left="0"
left="0"
mouse_opaque="false"
name="hovered_icon"
name="hovered_icon"
top="0"
scale_image="true"
scale_image="true"
visible="false"
width="270"/>
width="305"/>
<icon
height="120"
height="120"
image_name="ListItem_Select"
left="0"
left="0"
mouse_opaque="false"
name="selected_icon"
top="0"
scale_image="true"
visible="false"
width="270"/>
width="305"/>
<texture_picker
allow_no_texture="true"
default_image_name="None"
@ -40,6 +40,7 @@
name="picture"
tab_stop="false"
top="5"
top_pad="5"
width="120" />
<text
follows="top|left|right"
@ -50,7 +51,7 @@
text_color="white"
top="5"
use_ellipses="true"
width="120"
width="130"
word_wrap="true" />
<text
follows="top|left|right"
@ -70,8 +71,8 @@
layout="topleft"
name="info_chevron"
picture_style="true"
right="262"
right="290"
tab_stop="false"
top="3"
top="5"
width="16" />
</panel>

36
indra/newview/skins/default/xui/en/panel_picks.xml
View File

@ -1,40 +1,30 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
follows="left|top|right|bottom"
height="420"
height="515"
label="Picks"
layout="topleft"
left="0"
name="panel_picks"
top="0"
width="285">
<layout_stack
name="layout"
orientation="vertical"
follows="all"
layout="topleft"
left="0"
top="0"
height="420"
width="284"
border_size="0">
width="313">
<scroll_container
color="DkGray2"
follows="left|top|right|bottom"
height="350"
height="495"
layout="topleft"
left="2"
left="0"
name="profile_scroll"
opaque="true"
top="0"
width="284">
width="313">
<list
height="115"
height="120"
layout="topleft"
left="0"
name="picks_list"
top="0"
width="284" />
width="305" />
</scroll_container>
<panel
background_visible="true"
@ -42,12 +32,13 @@
enabled="false"
auto_resize="false"
follows="bottom"
height="30"
left="0"
height="23"
label="bottom_panel"
layout="topleft"
name="edit_panel"
top_pad="5"
width="284">
top_pad="0"
width="313">
<button
enabled="false"
follows="bottom|left"
@ -93,11 +84,11 @@
</panel>
<panel
follows="bottom"
height="30"
auto_resize="false"
layout="topleft"
height="30"
name="buttons_cucks"
width="284">
width="313">
<button
enabled="false"
follows="bottom|left"
@ -108,5 +99,4 @@
name="show_on_map_btn"
width="85" />
</panel>
</layout_stack>
</panel>

83
indra/newview/skins/default/xui/en/panel_profile.xml
View File

@ -1,14 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
bevel_style="out"
follows="left|top|right|bottom"
height="420"
height="515"
label="Profile"
layout="topleft"
left="0"
name="panel_profile"
top="0"
width="255">
width="313">
<string
name="CaptionTextAcctInfo">
[ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
@ -26,21 +25,22 @@
<scroll_container
color="DkGray2"
follows="left|top|right|bottom"
height="300"
height="515"
min_height="300"
layout="topleft"
left="0"
name="profile_scroll"
reserve_scroll_corner="true"
opaque="true"
width="255">
top="0"
width="313">
<panel
name="scroll_content_panel"
follows="left|top|right"
layout="topleft"
top="0"
left="0"
width="240"
height="780">
width="284"
height="700">
<panel
follows="left|top"
height="117"
@ -48,7 +48,7 @@
left="10"
name="second_life_image_panel"
top="10"
width="260">
width="280">
<texture_picker
allow_no_texture="true"
default_image_name="None"
@ -71,13 +71,13 @@
text_color="white"
top_delta="0"
value="[SECOND_LIFE]:"
width="130" />
width="170" />
<text
follows="left|top|right"
height="70"
height="90"
layout="topleft"
name="sl_description_edit"
width="130"
width="170"
word_wrap="true">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
</text>
@ -89,7 +89,7 @@
top_pad="10"
left="10"
name="first_life_image_panel"
width="260">
width="280">
<texture_picker
allow_no_texture="true"
default_image_name="None"
@ -111,13 +111,13 @@
text_color="white"
top_delta="0"
value="Real World:"
width="130" />
width="175" />
<text
follows="left|top|right"
height="70"
height="90"
layout="topleft"
name="fl_description_edit"
width="130"
width="180"
word_wrap="true">
Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
</text>
@ -133,18 +133,17 @@
name="me_homepage_text"
text_color="white"
top_pad="10"
width="255">
width="280">
Homepage:
</text>
<text
follows="left|top|right"
follows="left|top"
height="15"
layout="topleft"
left="10"
name="homepage_edit"
top_pad="5"
value="http://librarianavengers.org"
width="225"
width="280"
word_wrap="false" />
<text
follows="left|top"
@ -157,16 +156,16 @@
text_color="white"
top_pad="20"
value="Member Since:"
width="255" />
width="280" />
<text
follows="left|top|right"
follows="left|top"
height="15"
layout="topleft"
left="10"
name="register_date"
top_pad="5"
value="05/31/1976"
width="160"
width="280"
word_wrap="true" />
<text
follows="left|top"
@ -179,7 +178,7 @@
text_color="white"
top_pad="15"
value="Account Status:"
width="100" />
width="280" />
<!-- <text
type="string"
follows="left|top"
@ -192,14 +191,14 @@
value="Go to Dashboard"
width="100"/> -->
<text
follows="left|top|right"
follows="left|top"
height="15"
layout="topleft"
left="10"
name="acc_status_text"
top_pad="5"
value="Resident. No payment info on file."
width="255"
width="280"
word_wrap="true" />
<text
follows="left|top"
@ -212,24 +211,24 @@
text_color="white"
top_pad="15"
value="Partner:"
width="100" />
width="280" />
<panel
follows="left|top|right"
follows="left|top"
height="15"
layout="topleft"
left="10"
name="partner_data_panel"
top_pad="5"
width="255">
width="280">
<text
follows="left|top|right"
follows="left|top"
height="15"
layout="topleft"
left="0"
name="partner_text"
top="0"
value="[FIRST] [LAST]"
width="240"
width="280"
word_wrap="true" />
</panel>
<text
@ -243,28 +242,28 @@
text_color="white"
top_pad="15"
value="Groups:"
width="255" />
width="280" />
<text
follows="left|top|right|bottom"
follows="left|top|bottom"
height="160"
layout="topleft"
left="10"
name="sl_groups"
top_pad="5"
width="130"
width="280"
word_wrap="true">
Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
</text>
</panel>
</scroll_container>
<panel
follows="bottom|left"
height="30"
layout="topleft"
left="10"
left="0"
name="profile_buttons_panel"
top_pad="5"
width="280">
top_pad="0"
width="313">
<button
follows="bottom|left"
font="SansSerifSmallBold"
@ -309,13 +308,13 @@
width="75" />
</panel>
<panel
height="30"
follows="bottom|left"
layout="topleft"
left="10"
left="0"
name="profile_me_buttons_panel"
top_pad="5"
top_pad="0"
visible="false"
width="280">
width="313">
<button
follows="bottom|left"
font="SansSerifSmallBold"

39
indra/newview/skins/default/xui/en/panel_side_tray.xml
View File

@ -3,14 +3,14 @@
name="sidebar"
background_visible="false"
mouse_opaque="true"
width="305"
width="333"
collapsed="true"
>
<sidetray_tab
name="sidebar_home"
tab_title="Home"
description="Home."
image="icn_voice-groupfocus.tga"
image="BackArrow_Off"
mouse_opaque="false"
background_opaque="false"
background_visible="true"
@ -50,17 +50,17 @@
border="true"
font="SansSerifBold"
/>
<panel
class="panel_group_info_sidetray"
name="panel_group_info_sidetray"
filename="panel_group_info_sidetray.xml"
label="Group Info"
<panel
class="panel_group_info_sidetray"
name="panel_group_info_sidetray"
filename="panel_group_info_sidetray.xml"
label="Group Info"
border="true"
/>
<panel
<panel
class="panel_block_list_sidetray"
name="panel_block_list_sidetray"
filename="panel_block_list_sidetray.xml"
name="panel_block_list_sidetray"
filename="panel_block_list_sidetray.xml"
label="Blocked Residents &amp; Objects"
border="true"
/>
@ -87,7 +87,7 @@
<sidetray_tab
name="sidebar_me"
tab_title="My Profile"
tab_title="Me"
description="Change your profile, your look and quick links to your outfits."
image="TabIcon_Me_Off"
mouse_opaque="false"
@ -97,7 +97,7 @@
class="panel_me_profile_view"
name="panel_me_profile"
filename="panel_me_profile.xml"
label="My Profile"
label="Me"
border="true"
font="SansSerifBold"
/>
@ -108,16 +108,15 @@
tab_title="Appearance"
description="Change your looks and appearance."
image="TabIcon_Appearance_Off"
mouse_opaque="false"
background_opaque="false"
background_visible="true"
bg_opaque_color="0.5 0.5 0.5 1.0"
mouse_opaque="false"
background_opaque="false"
background_visible="true"
>
<panel
<panel
class="panel_appearance"
name="panel_appearance"
filename="panel_appearance.xml"
border="true"
name="panel_appearance"
filename="panel_appearance.xml"
border="true"
/>
</sidetray_tab>