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

Fix font and layout for list items, status bar, people panel tabs, system well EXT-2055

meow-7.2.2
Erica 2009-10-31 21:04:38 -07:00
parent caca1eae26
commit a10a19de56
9 changed files with 156 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
indra/newview/skins/default/textures/navbar/BuyArrow_Over.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
indra/newview/skins/default/textures/navbar/BuyArrow_Press.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 249 B

After

Width:  |  Height:  |  Size: 2.9 KiB

6
indra/newview/skins/default/textures/textures.xml
View File

@ -29,9 +29,9 @@
<texture name="BottomTray_BG" file_name="bottomtray/BottomTray_BG.png" preload="false" />
<texture name="BuyArrow_Off" file_name="navbar/BuyArrow_Off.png" preload="false" />
<texture name="BuyArrow_Over" file_name="navbar/BuyArrow_Over.png" preload="false" />
<texture name="BuyArrow_Press" file_name="navbar/BuyArrow_Press.png" preload="false" />
<texture name="BuyArrow_Off" file_name="navbar/BuyArrow_Off.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" />
<texture name="BuyArrow_Over" file_name="navbar/BuyArrow_Over.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" />
<texture name="BuyArrow_Press" file_name="navbar/BuyArrow_Press.png" preload="true" scale.left="1" scale.top="1" scale.right="0" scale.bottom="0" />
<texture name="Cam_Avatar_Disabled" file_name="bottomtray/Cam_Avatar_Disabled.png" preload="false" />
<texture name="Cam_Avatar_Over" file_name="bottomtray/Cam_Avatar_Over.png" preload="false" />

37
indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
View File

@ -39,7 +39,6 @@
<text
follows="left|right"
font="SansSerifSmall"
font.style="BOLD"
height="15"
layout="topleft"
left_pad="5"
@ -47,13 +46,13 @@
top="6"
use_ellipses="true"
value="Unknown"
width="196" />
width="182" />
<text
follows="right"
font="SansSerifSmall"
height="15"
layout="topleft"
left_pad="10"
left_pad="8"
name="last_interaction"
text_color="LtGray_50"
value="0s"
@ -69,28 +68,26 @@
name="speaking_indicator"
visible="true"
width="20" />
<button
follows="right"
height="16"
image_pressed="Info_Press"
image_hover="Info_Over"
image_unselected="Info_Off"
layout="topleft"
left_pad="3"
right="-25"
name="info_btn"
picture_style="true"
width="16" />
<button
follows="right"
height="16"
image_selected="BuyArrow_Press"
image_pressed="BuyArrow_Press"
image_unselected="BuyArrow_Press"
image_pressed="Info_Press"
image_unselected="Info_Over"
left_pad="3"
right="-31"
name="info_btn"
picture_style="true"
top_delta="-2"
width="16" />
<button
follows="right"
height="20"
image_overlay="ForwardArrow_Off"
layout="topleft"
left_pad="5"
right="-5"
right="-3"
name="profile_btn"
picture_style="true"
width="16" />
top_delta="-2"
width="20" />
</panel>

24
indra/newview/skins/default/xui/en/panel_group_list_item.xml
View File

@ -28,13 +28,11 @@
visible="false"
width="320" />
<icon
follows="top|left"
height="20"
image_name="Generic_Group"
name="group_icon"
layout="topleft"
left="5"
mouse_opaque="true"
left="5"
top="2"
width="20" />
<text
@ -47,28 +45,28 @@
top="6"
use_ellipses="true"
value="Unknown"
width="246" />
width="242" />
<button
follows="right"
height="16"
image_pressed="Info_Press"
image_hover="Info_Over"
image_unselected="Info_Off"
image_unselected="Info_Over"
left_pad="3"
right="-25"
right="-31"
name="info_btn"
picture_style="true"
top_delta="-2"
width="16" />
<!--*TODO: Should only appear on rollover-->
<button
follows="right"
height="16"
image_selected="BuyArrow_Press"
image_pressed="BuyArrow_Press"
image_unselected="BuyArrow_Press"
height="20"
image_overlay="ForwardArrow_Off"
layout="topleft"
left_pad="5"
right="-5"
right="-3"
name="profile_btn"
picture_style="true"
width="16" />
top_delta="-2"
width="20" />
</panel>

129
indra/newview/skins/default/xui/en/panel_people.xml
View File

@ -49,13 +49,12 @@ background_visible="true"
height="500"
layout="topleft"
left="10"
font="SansSerifBigBold"
name="tabs"
tab_min_width="70"
tab_height="30"
tab_position="top"
top_pad="10"
halign="center"
halign="center"
width="313">
<panel
follows="all"
@ -100,17 +99,30 @@ background_visible="true"
picture_style="true"
top="5"
width="18" />
<button
follows="bottom|left"
height="18"
image_selected="AddItem_Press"
image_unselected="AddItem_Off"
image_disabled="AddItem_Disabled"
layout="topleft"
left_pad="5"
name="add_friend_btn"
picture_style="true"
top_delta="0"
tool_tip="Add selected resident to your friends List"
width="18" />
</panel>
</panel>
<panel
follows="all"
height="500"
left="0"
top="0"
label="Friends"
layout="topleft"
left="0"
help_topic="people_friends_tab"
name="friends_panel"
top="0"
width="313">
<accordion
follows="all"
@ -123,14 +135,13 @@ background_visible="true"
<accordion_tab
can_resize="false"
layout="topleft"
height="230"
height="235"
min_height="150"
name="tab_online"
title="Online">
<avatar_list
allow_select="true"
follows="all"
height="150"
layout="topleft"
left="0"
multi_select="true"
@ -141,13 +152,12 @@ background_visible="true"
<accordion_tab
can_resize="false"
layout="topleft"
height="230"
height="235"
name="tab_all"
title="All">
<avatar_list
allow_select="true"
follows="all"
height="230"
layout="topleft"
left="0"
multi_select="true"
@ -210,10 +220,11 @@ background_visible="true"
follows="all"
height="500"
label="Groups"
top="0"
layout="topleft"
left="0"
help_topic="people_groups_tab"
name="groups_panel"
top="0"
width="313">
<group_list
follows="all"
@ -287,13 +298,14 @@ background_visible="true"
</panel>
</panel>
<panel
top="0"
follows="all"
height="500"
label="Recent"
layout="topleft"
left="0"
help_topic="people_recent_tab"
name="recent_panel"
top="0"
width="313">
<avatar_list
allow_select="true"
@ -304,11 +316,9 @@ background_visible="true"
multi_select="true"
name="avatar_list"
show_last_interaction_time="true"
top="2"
top="0"
width="313" />
<panel
background_visible="true"
bevel_style="none"
top_pad="0"
follows="left|right|bottom"
height="30"
@ -330,6 +340,19 @@ background_visible="true"
picture_style="true"
top="7"
width="18" />
<button
follows="bottom|left"
height="18"
image_selected="AddItem_Press"
image_unselected="AddItem_Off"
image_disabled="AddItem_Disabled"
layout="topleft"
left_pad="5"
name="add_friend_btn"
picture_style="true"
top_delta="0"
tool_tip="Add selected resident to your friends List"
width="18" />
</panel>
</panel>
</tab_container>
@ -345,104 +368,88 @@ background_visible="true"
width="313">
<layout_panel
default_tab_group="1"
follows="left|top|right"
follows="left|top"
height="25"
layout="topleft"
left="0"
name="view_profile_btn_panel"
top="-25"
width="65">
width="100">
<button
follows="top|left|right"
follows="top|left"
font="SansSerifSmall"
height="19"
label="Profile"
layout="topleft"
name="view_profile_btn"
tool_tip="Show picture, groups, and other residents information"
width="65" />
width="100" />
</layout_panel>
<layout_panel
default_tab_group="1"
follows="left|top|right"
height="25"
layout="topleft"
left_delta="0"
min_width="85"
name="add_friend_btn_panel"
top_delta="0"
width="50">
<button
follows="top|left|right"
font="SansSerifSmall"
height="19"
label="Add"
layout="topleft"
name="add_friend_btn"
tool_tip="Add selected resident to your friends List"
width="50" />
</layout_panel>
<layout_panel
default_tab_group="1"
follows="left|top|right"
follows="left|top"
height="19"
layout="topleft"
left="0"
min_width="80"
name="group_info_btn_panel"
width="80">
width="100">
<button
follows="top|left|right"
follows="top|left"
font="SansSerifSmall"
height="19"
label="Group Profile"
layout="topleft"
name="group_info_btn"
tool_tip="Show group information"
width="80" />
width="100" />
</layout_panel>
<layout_panel
default_tab_group="1"
follows="left|top|right"
follows="left|top"
height="25"
layout="topleft"
left_pad="5"
min_width="45"
name="chat_btn_panel"
top_delta="0"
width="45">
width="100">
<button
follows="top|left|right"
follows="top|left"
font="SansSerifSmall"
height="19"
label="Chat"
label="Group Chat"
layout="topleft"
name="chat_btn"
tool_tip="Open chat session"
width="45" />
width="100" />
</layout_panel>
<layout_panel
default_tab_group="1"
follows="left|top|right"
follows="left|top|"
height="25"
layout="topleft"
left_pad="5"
min_width="35"
name="im_btn_panel"
top_delta="0"
width="35">
width="50">
<button
follows="top|left|right"
follows="top|left"
font="SansSerifSmall"
height="19"
label="IM"
layout="topleft"
name="im_btn"
tool_tip="Open instant message session"
width="35" />
width="50" />
</layout_panel>
<layout_panel
default_tab_group="1"
follows="left|top|right"
height="25"
layout="topleft"
left_pad="5"
min_width="40"
name="call_btn_panel"
top_delta="0"
@ -450,53 +457,55 @@ background_visible="true"
width="40">
<button
enabled="false"
follows="top|left|right"
follows="top|left"
font="SansSerifSmall"
height="19"
label="Call"
layout="topleft"
name="call_btn"
width="40" />
width="50" />
</layout_panel>
<layout_panel
default_tab_group="1"
follows="left|top|right"
follows="left|top"
height="25"
layout="topleft"
left_pad="5"
min_width="65"
name="teleport_btn_panel"
top_delta="0"
width="65">
width="100">
<button
follows="left|top|right"
follows="left|top"
font="SansSerifSmall"
height="19"
label="Teleport"
layout="topleft"
name="teleport_btn"
tool_tip="Offer teleport"
width="65" />
width="100" />
</layout_panel>
<layout_panel
default_tab_group="1"
enabled="false"
follows="left|top|right"
follows="left|top"
height="25"
layout="topleft"
left_pad="5"
min_width="50"
name="share_btn_panel"
top_delta="0"
visible="false"
width="50">
width="80">
<button
enabled="false"
follows="top|left|right"
follows="top|left"
font="SansSerifSmall"
height="19"
label="Share"
layout="topleft"
name="share_btn"
width="50" />
width="80" />
</layout_panel>
</layout_stack>
</panel>

153
indra/newview/skins/default/xui/en/panel_status_bar.xml
View File

@ -41,20 +41,18 @@
</panel.string>
<button
auto_resize="true"
halign="right"
halign="right"
follows="right|bottom"
font="SansSerifSmall"
image_color="White_05"
flash_color="EmphasisColor"
image_overlay="BuyArrow_Over"
height="18"
layout="topleft"
left="-225"
image_selected="BuyArrow_Over"
image_unselected="BuyArrow_Off"
image_pressed="BuyArrow_Press"
height="16"
left="-220"
name="buycurrency"
pad_right="23px"
picture_style="true"
pad_right="22px"
tool_tip="My Balance: Click to buy more L$"
top="0"
top="1"
width="117" />
<text
type="string"
@ -65,148 +63,21 @@
height="16"
top="3"
layout="topleft"
left_pad="20"
left_pad="15"
name="TimeText"
text_color="TimeTextColor"
tool_tip="Current time (Pacific)"
width="80">
12:00 AM
</text>
<button
follows="right|bottom"
height="16"
layout="topleft"
left_delta="-537"
image_selected="Inv_DangerousScript"
image_unselected="Inv_DangerousScript"
name="scriptout"
picture_style="true"
scale_image="false"
tool_tip="Script warnings and errors"
top="0"
visible="false"
width="16" />
<button
follows="right|bottom"
height="16"
image_selected="Health"
image_unselected="Health"
layout="topleft"
left_pad="7"
name="health"
picture_style="true"
scale_image="false"
tool_tip="Health"
top="0"
visible="false"
width="16" />
<text
bg_visible="false"
text_readonly_color="HealthTextColor"
follows="rsight|bottom"
font_shadow="none"
height="16"
layout="topleft"
left_pad="18"
name="HealthText"
text_color="HealthTextColor"
tool_tip="Health"
top="0"
visible="false"
width="31">
100%
</text>
<button
follows="right|bottom"
height="16"
image_selected="Move_Fly_Disabled"
image_unselected="Move_Fly_Disabled"
layout="topleft"
left_pad="7"
name="no_fly"
picture_style="true"
scale_image="false"
tool_tip="Flying not allowed"
top="3"
visible="false"
width="16" />
<button
follows="right|bottom"
height="16"
image_selected="Tool_Create"
image_unselected="Tool_Create"
layout="topleft"
left_pad="7"
name="no_build"
picture_style="true"
scale_image="false"
tool_tip="Building/rezzing not allowed"
top="0"
visible="false"
width="16" />
<button
follows="right|bottom"
height="16"
image_selected="Inv_Script"
image_unselected="Inv_Script"
layout="topleft"
left_pad="7"
name="no_scripts"
picture_style="true"
scale_image="false"
tool_tip="Scripts not allowed"
top="0"
visible="false"
width="16" />
<button
follows="right|bottom"
height="16"
image_selected="Inv_Gesture"
image_unselected="Inv_Gesture"
layout="topleft"
left_pad="7"
name="restrictpush"
picture_style="true"
scale_image="false"
tool_tip="No pushing"
top="0"
visible="false"
width="16" />
<button
follows="right|bottom"
height="18"
image_selected="Microphone_Mute"
image_unselected="Microphone_Mute"
layout="topleft"
left_pad="7"
name="status_no_voice"
picture_style="true"
scale_image="false"
tool_tip="Voice not available here"
top="1"
visible="false"
width="16" />
<button
follows="right|bottom"
height="16"
image_selected="Icon_For_Sale"
image_unselected="Icon_For_Sale"
layout="topleft"
left_pad="7"
name="buyland"
picture_style="true"
tool_tip="Buy this parcel"
top="0"
visible="false"
width="16" />
<text
enabled="true"
follows="right|bottom"
halign="center"
height="12"
layout="topleft"
left_delta="-4"
left_delta="0"
name="stat_btn"
top_delta="3"
width="20" />
top_delta="0"
width="20"/>
</panel>

69
indra/newview/skins/default/xui/en/panel_sys_well_item.xml
View File

@ -1,65 +1,40 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<!-- All our XML is utf-8 encoded. -->
<panel
name="sys_well_item"
title="sys_well_item"
name="sys_well_item"
title="sys_well_item"
visible="true"
top="0"
left="0"
width="318"
height="35"
top="0"
left="0"
width="300"
height="35"
layout="topleft"
follows="left|right"
background_opaque="false"
background_visible="true"
bg_alpha_color="0.0 0.0 0.0 0.0" >
<icon
top="8"
left="8"
width="20"
height="20"
layout="topleft"
follows="left"
name="icon"
label=""
mouse_opaque="false"
image_name="lag_status_warning.tga"
/>
follows="left|right">
<text
top="2"
left_pad="8"
width="255"
height="28"
top="2"
left="10"
width="267"
height="28"
layout="topleft"
follows="right|left"
font="SansSerifBold"
text_color="white"
use_ellipses="true"
use_ellipses="true"
word_wrap="true"
mouse_opaque="false"
name="title" >
Select your streaming media preference. Select your streaming media preference.
</text>
Beware the trout. BEWARE! THE! TROUT!
</text>
<button
top="5"
left_pad="5"
width="15"
height="15"
top="5"
right="-5"
width="17"
height="17"
layout="topleft"
follows="right"
name="close_btn"
name="close_btn"
mouse_opaque="true"
label=""
tab_stop="false"
image_unselected="toast_hide_btn.tga"
image_disabled="toast_hide_btn.tga"
image_selected="toast_hide_btn.tga"
image_hover_selected="toast_hide_btn.tga"
image_disabled_selected="toast_hide_btn.tga"
image_unselected="Icon_Close_Toast"
image_selected="Icon_Close_Toast"
/>
</panel>
</panel>

37
indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
View File

@ -18,7 +18,7 @@
visible="false"
width="380" />
<icon
height="20"
height="24"
follows="top|right|left"
image_name="ListItem_Select"
layout="topleft"
@ -26,7 +26,7 @@
name="selected_icon"
top="0"
visible="false"
width="380" />
width="320" />
<icon
height="20"
follows="top|right|left"
@ -46,21 +46,28 @@
name="region"
text_color="white"
top="4"
value="Unknown"
width="330" />
value="..."
width="242" />
<button
follows="right"
height="18"
image_disabled="Info"
image_disabled_selected="Info"
image_hover_selected="Info"
image_selected="Info"
image_unselected="Info"
layout="topleft"
height="16"
image_pressed="Info_Press"
image_unselected="Info_Over"
left_pad="3"
right="-31"
name="info_btn"
picture_style="true"
visible="false"
right="-5"
top="2"
width="18" />
top_delta="-2"
width="16" />
<button
follows="right"
height="20"
image_overlay="ForwardArrow_Off"
layout="topleft"
left_pad="5"
right="-3"
name="profile_btn"
picture_style="true"
top_delta="-2"
width="20" />
</panel>