summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_bottomtray.xml
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_bottomtray.xml')
-rw-r--r--indra/newview/skins/default/xui/en/panel_bottomtray.xml445
1 files changed, 267 insertions, 178 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 1196d788e4..c34a367c32 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -2,21 +2,24 @@
<panel
mouse_opaque="true"
background_visible="true"
- bg_alpha_color="0.25 0.25 0.25 1"
- bg_opaque_color="0.25 0.25 0.25 1"
+ bg_alpha_color="DkGray"
+ bg_opaque_color="DkGray"
follows="left|bottom|right"
- height="28"
+ height="33"
layout="topleft"
left="0"
name="bottom_tray"
top="28"
- border_visible="true"
+ chrome="true"
+ border_visible="false"
width="1000">
+ <string name="SpeakBtnToolTip">Turns microphone on/off</string>
+ <string name="VoiceControlBtnToolTip">Shows/hides voice control panel</string>
<layout_stack
- mouse_opaque="false"
+ mouse_opaque="false"
border_size="0"
- clip="false"
- follows="left|right|bottom|top"
+ clip="false"
+ follows="all"
height="28"
layout="topleft"
left="0"
@@ -26,39 +29,29 @@
width="1000">
<icon
auto_resize="false"
- color="0 0 0 0"
follows="left|right"
height="10"
image_name="spacer24.tga"
layout="topleft"
+ min_width="2"
left="0"
top="0"
- width="5"/>
+ width="2" />
<layout_panel
- mouse_opaque="false"
+ mouse_opaque="false"
auto_resize="false"
follows="left|right"
height="28"
layout="topleft"
- left="5"
- min_height="28"
+ left="0"
+ min_height="23"
width="310"
- top="0"
- min_width="300"
+ top="4"
+ max_width="320"
+ min_width="216"
name="chat_bar"
user_resize="false"
- filename="panel_nearby_chat_bar.xml"/>
- <icon
- auto_resize="false"
- color="0 0 0 0"
- follows="left|right"
- height="10"
- image_name="spacer24.tga"
- layout="topleft"
- left="0"
- name="DUMMY"
- top="0"
- width="3"/>
+ filename="panel_nearby_chat_bar.xml" />
<layout_panel
mouse_opaque="false"
auto_resize="false"
@@ -66,34 +59,49 @@
height="28"
layout="topleft"
min_height="28"
- width="100"
- top_delta="-10"
- min_width="100"
+ width="105"
+ top_delta="0"
+ min_width="54"
name="speak_panel"
user_resize="false">
- <chiclet_talk
- follows="right"
- height="20"
- speak_button.font="SansSerifMedium"
- speak_button.tab_stop="true"
- show_button.tab_stop="true"
- layout="topleft"
- left="0"
- name="talk"
- top="6"
- width="100" />
- </layout_panel>
- <icon
- auto_resize="false"
- color="0 0 0 0"
- follows="left|right"
- height="10"
- image_name="spacer24.tga"
- layout="topleft"
- left="0"
- name="DUMMY"
- top="0"
- width="5"/>
+ <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>
+ </layout_panel>
+ <icon
+ auto_resize="false"
+ follows="left|right"
+ height="10"
+ image_name="spacer24.tga"
+ layout="topleft"
+ left="0"
+ name="after_speak_panel"
+ min_width="3"
+ top="0"
+ width="3"/>
<layout_panel
mouse_opaque="false"
auto_resize="false"
@@ -101,20 +109,25 @@
height="28"
layout="topleft"
min_height="28"
- width="90"
- top_delta="-10"
- min_width="90"
+ width="82"
+ top_delta="0"
+ min_width="62"
name="gesture_panel"
user_resize="false">
- <gesture_combo_box
- follows="right"
- height="20"
- label="Gestures"
- layout="topleft"
- name="Gesture"
- left="0"
- top="6"
- width="90" />
+ <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>
</layout_panel>
<icon
auto_resize="false"
@@ -124,31 +137,35 @@
image_name="spacer24.tga"
layout="topleft"
left="0"
- name="DUMMY"
+ min_width="3"
+ name="after_gesture_panel"
top="0"
- width="5"/>
+ width="3"/>
<layout_panel
- mouse_opaque="false"
+ mouse_opaque="false"
auto_resize="false"
follows="right"
height="28"
layout="topleft"
min_height="28"
name="movement_panel"
- width="70"
- top_delta="-10"
- min_width="70">
+ user_resize="false"
+ width="80"
+ min_width="49">
<button
+ image_selected="PushButton_Selected_Press"
+ image_pressed="PushButton_Press"
+ image_pressed_selected="PushButton_Selected_Press"
follows="left|right"
- height="20"
+ height="23"
use_ellipses="true"
is_toggle="true"
label="Move"
layout="topleft"
name="movement_btn"
- tool_tip="Shows/hides movement controls"
- top="6"
- width="70">
+ tool_tip="Shows/hides movement controls"
+ top="5"
+ width="80">
<button.init_callback
function="Button.SetDockableFloaterToggle"
parameter="moveview" />
@@ -162,94 +179,145 @@
image_name="spacer24.tga"
layout="topleft"
left="0"
- name="DUMMY"
+ min_width="3"
+ name="after_movement_panel"
top="0"
- width="8"/>
+ width="3"/>
<layout_panel
- mouse_opaque="false"
+ mouse_opaque="false"
auto_resize="false"
follows="left|right"
height="28"
layout="topleft"
min_height="28"
- min_width="100"
+ min_width="49"
name="cam_panel"
- top_delta="-10"
- width="100">
+ user_resize="false"
+ width="80">
<button
+ image_selected="PushButton_Selected_Press"
+ image_pressed="PushButton_Press"
+ image_pressed_selected="PushButton_Selected_Press"
follows="left|right"
- height="20"
+ height="23"
use_ellipses="true"
is_toggle="true"
label="View"
layout="topleft"
left="0"
- tool_tip="Shows/hides camera controls"
- top="6"
+ tool_tip="Shows/hides camera controls"
+ top="5"
name="camera_btn"
- width="70">
+ width="80">
<button.init_callback
function="Button.SetDockableFloaterToggle"
parameter="camera" />
</button>
</layout_panel>
+ <icon
+ auto_resize="false"
+ color="0 0 0 0"
+ follows="left|right"
+ height="10"
+ image_name="spacer24.tga"
+ layout="topleft"
+ left="0"
+ min_width="3"
+ name="after_cam_panel"
+ top="0"
+ width="3"/>
<layout_panel
- mouse_opaque="false"
+ mouse_opaque="false"
auto_resize="false"
- follows="right"
+ follows="left|right"
height="28"
layout="topleft"
- min_height="28"
- min_width="35"
+ min_width="40"
name="snapshot_panel"
- top_delta="-10"
- width="35">
- <split_button
- arrow_position="right"
- follows="right"
- height="18"
+ width="40">
+ <button
+ follows="left|right"
+ height="23"
+ image_selected="PushButton_Selected_Press"
+ image_pressed="PushButton_Press"
+ image_pressed_selected="PushButton_Selected_Press"
left="0"
- layout="topleft"
+ label=""
+ layout="topleft"
name="snapshots"
- top="6"
- width="35">
- <split_button.arrow_button
- image_selected="camera_presets/camera_presets_arrow_right.png"
- image_unselected="camera_presets/camera_presets_arrow_right.png"
- image_disabled_selected="camera_presets/camera_presets_arrow_right.png"
- image_disabled="camera_presets/camera_presets_arrow_right.png"
- name="snapshot_settings"
- tool_tip="Snapshot settings" />
- <split_button.item
- image_selected="camera_presets/camera_presets_snapshot.png"
- image_unselected="camera_presets/camera_presets_snapshot.png"
- name="snapshot"
- tool_tip="Take snapshot" />
- </split_button>
- </layout_panel>
+ width="36"
+ top="5"
+ is_toggle="true"
+ image_overlay="Snapshot_Off"
+ tool_tip="Take snapshot">
+ <button.init_callback
+ function="Button.SetFloaterToggle"
+ parameter="snapshot" />
+ </button>
+ </layout_panel>
<layout_panel
mouse_opaque="false"
follows="left|right"
- height="28"
+ height="30"
layout="topleft"
- min_height="28"
top="0"
name="chiclet_list_panel"
width="189"
- min_width="189"
+ min_width="95"
user_resize="false"
auto_resize="true">
+<!--*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"
+ mouse_opaque="false"
follows="left|right"
- height="25"
+ height="24"
layout="topleft"
- left="0"
+ left="1"
+ min_width="95"
name="chiclet_list"
- top="1"
- chiclet_padding="3"
+ top="7"
+ chiclet_padding="4"
scrolling_offset="40"
- width="189" />
+ width="189">
+ <button
+ auto_resize="true"
+ follows="right"
+ height="29"
+ 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_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"
+ width="7" />
+ </chiclet_panel>
</layout_panel>
<icon
auto_resize="false"
@@ -259,38 +327,60 @@
image_name="spacer24.tga"
layout="topleft"
left="0"
+ min_width="4"
+ name="DUMMY"
top="0"
- width="5"/>
- <icon
- auto_resize="false"
- color="0 0 0 0"
- follows="left|right"
- height="10"
- image_name="spacer24.tga"
- layout="topleft"
- left="0"
- top="0"
- width="10"/>
- <view_border
+ width="4"/>
+ <layout_panel
auto_resize="false"
- bevel_style="in"
- follows="left|right"
+ follows="right"
height="28"
layout="topleft"
- left="270"
- name="well_separator"
- top="0"
- width="1" />
- <icon
- auto_resize="false"
- color="0 0 0 0"
- follows="left|right"
- height="10"
- image_name="spacer24.tga"
- layout="topleft"
- left="0"
+ min_height="28"
top="0"
- width="10"/>
+ name="im_well_panel"
+ width="37"
+ min_width="37"
+ user_resize="false">
+ <chiclet_im_well
+ max_displayed_count="99"
+ flash_period="0.3"
+ follows="right"
+ height="28"
+ layout="topleft"
+ left="0"
+ name="im_well"
+ top="0"
+ width="35">
+ <!--
+Emulate 4 states of button by background images, see details in EXT-3147. The same should be for notification_well button
+xml attribute Description
+image_unselected "Unlit" - there are no new messages
+image_selected "Unlit" + "Selected" - there are no new messages and the Well is open
+image_pressed "Lit" - there are new messages
+image_pressed_selected "Lit" + "Selected" - there are new messages and the Well is open
+ -->
+ <button
+ auto_resize="true"
+ follows="right"
+ halign="center"
+ height="23"
+ image_overlay="Unread_IM"
+ image_overlay_alignment="center"
+ image_pressed="WellButton_Lit"
+ image_pressed_selected="WellButton_Lit_Selected"
+ image_selected="PushButton_Press"
+ label_color="Black"
+ left="0"
+ name="Unread IM messages"
+ tool_tip="Conversations"
+ width="34" >
+ <button.init_callback
+ function="Button.SetDockableFloaterToggle"
+ parameter="im_well_window" />
+ </button>
+ </chiclet_im_well>
+ </layout_panel>
<layout_panel
auto_resize="false"
follows="right"
@@ -298,42 +388,41 @@
layout="topleft"
min_height="28"
top="0"
- name="sys_well_panel"
- width="48"
- min_width="48"
+ name="notification_well_panel"
+ width="37"
+ min_width="37"
user_resize="false">
<chiclet_notification
+ flash_period="0.25"
follows="right"
- height="25"
+ height="23"
layout="topleft"
left="0"
- name="sys_well"
- top="2"
- width="48">
+ max_displayed_count="99"
+ name="notification_well"
+ top="5"
+ width="35">
<button
- image_selected="bottom_tray_sys_notifications_selected.tga"
- image_unselected="bottom_tray_sys_notifications.tga"/>
- <unread_notifications
- width="20"
- height="20"
- left="22"
- top="23"/>
-<!--
- <chiclet_notification.commit_callback
- function="Notification.Show"
- parameter="ClickUnimplemented" />
- -->
- </chiclet_notification>
+ bottom_pad="3"
+ 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>
</layout_panel>
- <icon
- auto_resize="false"
- color="0 0 0 0"
- follows="left|right"
- height="10"
- image_name="spacer24.tga"
- layout="topleft"
- left="0"
- top="0"
- width="5"/>
</layout_stack>
-</panel> \ No newline at end of file
+</panel>
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-12 11:43:46 +0000