summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/xui/en/panel_bottomtray.xml277
1 files changed, 136 insertions, 141 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 3beacd49e1..7b11538ccc 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -1,28 +1,30 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
- mouse_opaque="true"
background_visible="true"
bg_alpha_color="DkGray"
bg_opaque_color="DkGray"
+ chrome="true"
follows="left|bottom|right"
height="33"
layout="topleft"
left="0"
name="bottom_tray"
top="28"
- chrome="true"
- border_visible="false"
width="1000">
- <string name="SpeakBtnToolTip">Turns microphone on/off</string>
- <string name="VoiceControlBtnToolTip">Shows/hides voice control panel</string>
+ <string
+ name="SpeakBtnToolTip"
+ value="Turns microphone on/off" />
+ <string
+ name="VoiceControlBtnToolTip"
+ value="Shows/hides voice control panel" />
<layout_stack
- mouse_opaque="false"
border_size="0"
clip="false"
follows="all"
height="28"
layout="topleft"
left="0"
+ mouse_opaque="false"
name="toolbar_stack"
orientation="horizontal"
top="0"
@@ -33,241 +35,234 @@
height="10"
image_name="spacer24.tga"
layout="topleft"
- min_width="2"
left="0"
+ min_width="2"
top="0"
width="2" />
<layout_panel
- mouse_opaque="false"
auto_resize="false"
+ filename="panel_nearby_chat_bar.xml"
follows="left|right"
height="28"
layout="topleft"
left="0"
- min_height="23"
- width="310"
- top="4"
max_width="320"
+ min_height="23"
min_width="216"
+ mouse_opaque="false"
name="chat_bar"
+ top="4"
user_resize="false"
- filename="panel_nearby_chat_bar.xml" />
+ width="310" />
<layout_panel
- mouse_opaque="false"
auto_resize="false"
follows="right"
height="28"
layout="topleft"
min_height="28"
- width="108"
- top_delta="0"
min_width="57"
+ mouse_opaque="false"
name="speak_panel"
- user_resize="false">
- <talk_button
- follows="left|right"
- height="23"
- speak_button.tab_stop="true"
- show_button.tab_stop="true"
- layout="topleft"
- left="0"
- name="talk"
- top="5"
- width="105">
- <!-- do not remove halign attribute with default value. otherwise it can't be overridden in other locales.
- & pad_right is default value for long label which can be right aligned. See EXT-6318 -->
- <speak_button
- halign="center"
- name="speak_btn"
- label="Speak"
- label_selected="Speak"
- pad_right="22"
- use_ellipses="true"
- />
- <show_button>
- <show_button.init_callback
- function="Button.SetDockableFloaterToggle"
- parameter="voice_controls" />
- </show_button>
- </talk_button>
+ top_delta="0"
+ user_resize="false"
+ width="108">
+ <talk_button
+ follows="left|right"
+ height="23"
+ layout="topleft"
+ left="0"
+ name="talk"
+ top="5"
+ width="105">
+ <show_button
+ tab_stop="true">
+ <init_callback
+ function="Button.SetDockableFloaterToggle"
+ parameter="voice_controls" />
+ </show_button>
+ <!-- do not remove halign attribute with default value. otherwise it can't be overridden in other locales.
+ & pad_right is default value for long label which can be right aligned. See EXT-6318 -->
+ <speak_button
+ halign="center"
+ label="Speak"
+ label_selected="Speak"
+ name="speak_btn"
+ pad_right="22"
+ tab_stop="true"
+ use_ellipses="true" />
+ </talk_button>
</layout_panel>
<layout_panel
- mouse_opaque="false"
auto_resize="false"
follows="right"
height="28"
layout="topleft"
min_height="28"
- width="85"
- top_delta="0"
min_width="65"
+ mouse_opaque="false"
name="gesture_panel"
- user_resize="false">
- <gesture_combo_list
- follows="left|right"
- height="23"
- label="Gesture"
- layout="topleft"
- name="Gesture"
- left="0"
- top="5"
- width="82"
- tool_tip="Shows/hides gestures">
- <gesture_combo_list.combo_button
- pad_right="10"
- use_ellipses="true" />
- <gesture_combo_list.combo_list
- page_lines="17" />
- </gesture_combo_list>
+ top_delta="0"
+ user_resize="false"
+ width="85">
+ <gesture_combo_list
+ follows="left|right"
+ height="23"
+ label="Gesture"
+ layout="topleft"
+ left="0"
+ name="Gesture"
+ tool_tip="Shows/hides gestures"
+ top="5"
+ width="82">
+ <combo_button
+ pad_right="10"
+ use_ellipses="true" />
+ <combo_list
+ page_lines="17" />
+ </gesture_combo_list>
</layout_panel>
<layout_panel
- mouse_opaque="false"
auto_resize="false"
follows="right"
height="28"
layout="topleft"
min_height="28"
+ min_width="52"
+ mouse_opaque="false"
name="movement_panel"
user_resize="false"
- width="83"
- min_width="52">
+ width="83">
<button
- image_selected="PushButton_Selected_Press"
- image_pressed="PushButton_Press"
- image_pressed_selected="PushButton_Selected_Press"
follows="left|right"
height="23"
- use_ellipses="true"
+ image_pressed="PushButton_Press"
+ image_pressed_selected="PushButton_Selected_Press"
+ image_selected="PushButton_Selected_Press"
is_toggle="true"
label="Move"
layout="topleft"
name="movement_btn"
tool_tip="Shows/hides movement controls"
top="5"
+ use_ellipses="true"
width="80">
- <button.init_callback
+ <init_callback
function="Button.SetDockableFloaterToggle"
parameter="moveview" />
</button>
</layout_panel>
<layout_panel
- mouse_opaque="false"
auto_resize="false"
follows="left|right"
height="28"
layout="topleft"
min_height="28"
min_width="52"
+ mouse_opaque="false"
name="cam_panel"
user_resize="false"
width="83">
<button
- image_selected="PushButton_Selected_Press"
- image_pressed="PushButton_Press"
- image_pressed_selected="PushButton_Selected_Press"
follows="left|right"
height="23"
- use_ellipses="true"
+ image_pressed="PushButton_Press"
+ image_pressed_selected="PushButton_Selected_Press"
+ image_selected="PushButton_Selected_Press"
is_toggle="true"
label="View"
layout="topleft"
left="0"
+ name="camera_btn"
tool_tip="Shows/hides camera controls"
top="5"
- name="camera_btn"
+ use_ellipses="true"
width="80">
- <button.init_callback
+ <init_callback
function="Button.SetDockableFloaterToggle"
parameter="camera" />
</button>
</layout_panel>
<layout_panel
- mouse_opaque="false"
auto_resize="false"
follows="left|right"
height="28"
layout="topleft"
min_width="40"
+ mouse_opaque="false"
name="snapshot_panel"
width="40">
<button
- follows="left|right"
+ follows="left|right"
height="23"
- image_selected="PushButton_Selected_Press"
+ image_overlay="Snapshot_Off"
image_pressed="PushButton_Press"
image_pressed_selected="PushButton_Selected_Press"
- left="0"
- label=""
+ image_selected="PushButton_Selected_Press"
+ is_toggle="true"
layout="topleft"
+ left="0"
name="snapshots"
- width="36"
+ tool_tip="Take snapshot"
top="5"
- is_toggle="true"
- image_overlay="Snapshot_Off"
- tool_tip="Take snapshot">
- <button.init_callback
- function="Button.SetFloaterToggle"
- parameter="snapshot" />
- </button>
- </layout_panel>
+ width="36">
+ <init_callback
+ function="Button.SetFloaterToggle"
+ parameter="snapshot" />
+ </button>
+ </layout_panel>
<layout_panel
- mouse_opaque="false"
follows="left|right"
height="30"
layout="topleft"
- top="0"
- name="chiclet_list_panel"
- width="189"
min_width="95"
+ mouse_opaque="false"
+ name="chiclet_list_panel"
+ top="0"
user_resize="false"
- auto_resize="true">
+ width="189">
<!--*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"
+ chiclet_padding="4"
follows="left|right"
height="24"
layout="topleft"
left="1"
min_width="95"
+ mouse_opaque="false"
name="chiclet_list"
top="7"
- chiclet_padding="4"
- scrolling_offset="40"
width="189">
<button
auto_resize="true"
follows="right"
height="29"
+ image_hover_selected="SegmentedBtn_Left_Over"
+ image_hover_unselected="SegmentedBtn_Left_Over"
+ image_overlay="Arrow_Small_Left"
+ image_pressed="SegmentedBtn_Left_Press"
+ image_pressed_selected="SegmentedBtn_Left_Press"
image_selected="SegmentedBtn_Left_Off"
image_unselected="SegmentedBtn_Left_Off"
- image_hover_selected="SegmentedBtn_Left_Over"
- image_hover_unselected="SegmentedBtn_Left_Over"
- image_pressed="SegmentedBtn_Left_Press"
- image_pressed_selected="SegmentedBtn_Left_Press"
- image_overlay="Arrow_Small_Left"
layout="topleft"
name="chicklet_left_scroll_button"
- scale_image="true"
tab_stop="false"
top="-4"
- right_pad="2"
visible="false"
width="7" />
<button
auto_resize="true"
follows="right"
height="29"
+ image_hover_selected="SegmentedBtn_Right_Over"
+ image_hover_unselected="SegmentedBtn_Right_Over"
+ image_overlay="Arrow_Small_Right"
+ image_pressed="SegmentedBtn_Right_Press"
+ image_pressed_selected="SegmentedBtn_Right_Press"
image_selected="SegmentedBtn_Right_Off"
image_unselected="SegmentedBtn_Right_Off"
- image_hover_selected="SegmentedBtn_Right_Over"
- image_hover_unselected="SegmentedBtn_Right_Over"
- image_pressed="SegmentedBtn_Right_Press"
- image_pressed_selected="SegmentedBtn_Right_Press"
- image_overlay="Arrow_Small_Right"
layout="topleft"
name="chicklet_right_scroll_button"
- scale_image="true"
tab_stop="false"
top="-4"
visible="false"
@@ -285,24 +280,24 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
min_width="4"
name="DUMMY"
top="0"
- width="4"/>
+ width="4" />
<layout_panel
auto_resize="false"
follows="right"
height="28"
layout="topleft"
min_height="28"
- top="0"
- name="im_well_panel"
- width="37"
min_width="37"
- user_resize="false">
+ name="im_well_panel"
+ top="0"
+ user_resize="false"
+ width="37">
<chiclet_im_well
- max_displayed_count="99"
follows="right"
height="28"
layout="topleft"
left="0"
+ max_displayed_count="99"
name="im_well"
top="0"
width="35">
@@ -328,8 +323,8 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well
left="0"
name="Unread IM messages"
tool_tip="Conversations"
- width="34" >
- <button.init_callback
+ width="34">
+ <init_callback
function="Button.SetDockableFloaterToggle"
parameter="im_well_window" />
</button>
@@ -341,11 +336,11 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well
height="28"
layout="topleft"
min_height="28"
- top="0"
- name="notification_well_panel"
- width="37"
min_width="37"
- user_resize="false">
+ name="notification_well_panel"
+ top="0"
+ user_resize="false"
+ width="37">
<chiclet_notification
follows="right"
height="23"
@@ -355,27 +350,27 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well
name="notification_well"
top="5"
width="35">
- <button
+ <button
+ auto_resize="true"
bottom_pad="3"
+ 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_Press"
- auto_resize="true"
- halign="center"
- height="23"
- follows="right"
- label_color="Black"
- left="0"
- name="Unread"
- image_overlay="Notices_Unread"
- image_overlay_alignment="center"
- tool_tip="Notifications"
- width="34" >
- <button.init_callback
- function="Button.SetDockableFloaterToggle"
- parameter="notification_well_window" />
- </button>
- </chiclet_notification>
+ label_color="Black"
+ left="0"
+ name="Unread"
+ tool_tip="Notifications"
+ width="34">
+ <init_callback
+ function="Button.SetDockableFloaterToggle"
+ parameter="notification_well_window" />
+ </button>
+ </chiclet_notification>
</layout_panel>
</layout_stack>
</panel>