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

sync with viewer-development

meow-7.2.2
eli 2011-10-31 16:25:34 -07:00
parent e1023d614c
commit f76143a74e
10 changed files with 78 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
indra/newview/skins/default/xui/en/floater_chat_bar.xml
View File

@ -15,6 +15,7 @@
min_height="60"
min_width="150"
can_resize="true"
default_tab_group="1"
name="chat_bar"
width="380">
<panel
@ -26,50 +27,56 @@
visible="false"
filename="panel_nearby_chat.xml"
name="nearby_chat" />
<panel width="380" height="31" left="0" bottom="-1" follows="left|right|bottom">
<line_editor
border_style="line"
border_thickness="1"
follows="left|right"
height="23"
label="Click here to chat."
layout="topleft"
left_delta="7"
left="0"
max_length_bytes="1023"
name="chat_box"
text_pad_left="5"
text_pad_right="25"
tool_tip="Press Enter to say, Ctrl+Enter to shout"
top="2"
width="335" />
<output_monitor
auto_update="true"
follows="right"
draw_border="false"
height="16"
layout="topleft"
left_pad="-24"
mouse_opaque="true"
name="chat_zone_indicator"
top="6"
visible="true"
width="20" />
<button
follows="right"
is_toggle="true"
width="20"
top="2"
layout="topleft"
left_pad="12"
image_disabled="ComboButton_UpOff"
image_unselected="ComboButton_UpOff"
image_selected="ComboButton_On"
image_pressed="ComboButton_UpSelected"
image_pressed_selected="ComboButton_Selected"
height="23"
name="show_nearby_chat"
tool_tip="Shows/hides nearby chat log">
</button>
<panel width="380"
height="31"
left="0"
bottom="-1"
follows="left|right|bottom"
tab_group="1">
<line_editor
border_style="line"
border_thickness="1"
follows="left|right"
height="23"
label="Click here to chat."
layout="topleft"
left_delta="7"
left="0"
max_length_bytes="1023"
name="chat_box"
text_pad_left="5"
text_pad_right="25"
tool_tip="Press Enter to say, Ctrl+Enter to shout"
top="2"
width="335" />
<output_monitor
auto_update="true"
follows="right"
draw_border="false"
height="16"
layout="topleft"
left_pad="-24"
mouse_opaque="true"
name="chat_zone_indicator"
top="6"
visible="true"
width="20" />
<button
follows="right"
is_toggle="true"
width="20"
top="2"
layout="topleft"
left_pad="12"
image_disabled="ComboButton_UpOff"
image_unselected="ComboButton_UpOff"
image_selected="ComboButton_On"
image_pressed="ComboButton_UpSelected"
image_pressed_selected="ComboButton_Selected"
height="23"
chrome="true"
name="show_nearby_chat"
tool_tip="Shows/hides nearby chat log">
</button>
</panel>
</floater>

1
indra/newview/skins/default/xui/en/floater_outgoing_call.xml
View File

@ -8,6 +8,7 @@
layout="topleft"
name="outgoing call"
help_topic="outgoing_call"
save_dock_state="true"
title="CALLING"
width="410">
<floater.string

2
indra/newview/skins/default/xui/en/floater_toybox.xml
View File

@ -13,7 +13,7 @@
open_positioning="centered"
save_rect="true"
single_instance="true"
title="CUSTOMIZE TOOLBARS"
title="TOOLBAR BUTTONS"
width="650">
<text
follows="left|top"

2
indra/newview/skins/default/xui/en/floater_voice_controls.xml
View File

@ -89,7 +89,7 @@
visible="true"
width="20" />
</layout_panel>
<layout_panel name="leave_call_panel" height="26" auto_resize="false">
<layout_panel name="leave_call_panel" height="26" min_height="26" user_resize="false" auto_resize="false">
<layout_stack
clip="true"
follows="left|top|right"

2
indra/newview/skins/default/xui/en/menu_toolbars.xml
View File

@ -3,7 +3,7 @@
layout="topleft"
name="Toolbars Popup"
visible="false">
<menu_item_call label="Choose buttons..."
<menu_item_call label="Toolbar buttons..."
layout="topleft"
name="Chose Buttons">
<menu_item_call.on_click function="Floater.Show"

11
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -43,6 +43,15 @@
function="Floater.Toggle"
parameter="inventory" />
</menu_item_check>
<menu_item_call
label="New Inventory Window"
name="NewInventoryWindow"
shortcut="control|shift|I"
visible="false">
<menu_item_call.on_click
function="Inventory.NewWindow"
parameter="" />
</menu_item_call>
<menu_item_check
label="Gestures..."
name="Gestures"
@ -166,7 +175,7 @@
parameter="preferences" />
</menu_item_call>
<menu_item_call
label="Toolbars..."
label="Toolbar buttons..."
name="Toolbars"
shortcut="control|T">
<menu_item_call.on_click

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

@ -2,7 +2,7 @@
<panel
background_opaque="true"
background_visible="true"
bg_opaque_color="MouseGray"
bg_opaque_color="DkGray"
chrome="true"
follows="top|right"
height="19"
@ -39,10 +39,7 @@
width="160"
top="1"
follows="right|top"
name="balance_bg"
bg_visible="true"
background_opaque="true"
bg_opaque_image="bevel_background">
name="balance_bg">
<text
halign="center"
font="SansSerifSmall"

2
indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
View File

@ -4,7 +4,7 @@
background_opaque="false"
bg_opaque_color="Black_50"
bg_alpha_color="Black_50"
follows="left|top|right"
follows="left|top"
height="19"
layout="topleft"
name="topinfo_bar"

6
indra/newview/skins/default/xui/en/strings.xml
View File

@ -2271,7 +2271,7 @@ Returns a string with the requested data about the region
<string name="NextStipendDay" value="The next stipend day is " />
<string name="GroupPlanningDate">[mthnum,datetime,utc]/[day,datetime,utc]/[year,datetime,utc]</string>
<string name="GroupIndividualShare" value=" Group Individual Share" />
<string name="GroupColumn" value=" Group" />
<string name="GroupColumn" value=" Group" />
<string name="Balance">Balance</string>
<string name="Credits">Credits</string>
<string name="Debits">Debits</string>
@ -3711,6 +3711,10 @@ Try enclosing path to the editor with double quotes.
<string name="Command_View_Tooltip">Changing camera angle</string>
<string name="Command_Voice_Tooltip">Volume controls for calls and people near you in world</string>
<string name="Toolbar_Bottom_Tooltip">currently in your bottom toolbar</string>
<string name="Toolbar_Left_Tooltip" >currently in your left toolbar</string>
<string name="Toolbar_Right_Tooltip" >currently in your right toolbar</string>
<!-- Mesh UI terms -->
<string name="Retain%">Retain%</string>
<string name="Detail">Detail</string>

4
indra/newview/skins/default/xui/en/widgets/toolbar.xml
View File

@ -30,6 +30,8 @@
image_overlay_alignment="left"
use_ellipses="true"
auto_resize="true"
button_flash_count="99999"
button_flash_rate="1.0"
flash_color="EmphasisColor"/>
<button_icon pad_left="10"
pad_right="10"
@ -49,5 +51,7 @@
chrome="true"
use_ellipses="true"
auto_resize="true"
button_flash_count="99999"
button_flash_rate="1.0"
flash_color="EmphasisColor"/>
</toolbar>