diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_bottomtray.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_bottomtray.xml | 123 |
1 files changed, 69 insertions, 54 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 1ade66f2dd..015a2e91ff 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -33,10 +33,10 @@ height="10" image_name="spacer24.tga" layout="topleft" - min_width="4" + min_width="2" left="0" top="0" - width="4" /> + width="2" /> <layout_panel mouse_opaque="false" auto_resize="false" @@ -47,7 +47,8 @@ min_height="23" width="310" top="4" - min_width="192" + max_width="320" + min_width="216" name="chat_bar" user_resize="false" filename="panel_nearby_chat_bar.xml" /> @@ -60,7 +61,7 @@ min_height="28" width="100" top_delta="0" - min_width="54" + min_width="100" name="speak_panel" user_resize="false"> <talk_button @@ -71,8 +72,13 @@ layout="topleft" left="0" name="talk" - top="4" + top="5" width="100"> + <speak_button + name="speak_btn" + label="Speak" + label_selected="Speak" + /> <show_button> <show_button.init_callback function="Button.SetDockableFloaterToggle" @@ -87,10 +93,10 @@ image_name="spacer24.tga" layout="topleft" left="0" - name="DUMMY" - min_width="4" + name="after_speak_panel" + min_width="3" top="0" - width="4"/> + width="3"/> <layout_panel mouse_opaque="false" auto_resize="false" @@ -100,23 +106,23 @@ min_height="28" width="82" top_delta="0" - min_width="52" + min_width="62" name="gesture_panel" user_resize="false"> - <gesture_combo_box + <gesture_combo_list follows="left|right" height="23" label="Gesture" layout="topleft" name="Gesture" left="0" - top="4" + top="5" width="82" tool_tip="Shows/hides gestures"> - <gesture_combo_box.drop_down_button + <gesture_combo_list.combo_button pad_right="10" use_ellipses="true" /> - </gesture_combo_box> + </gesture_combo_list> </layout_panel> <icon auto_resize="false" @@ -126,10 +132,10 @@ image_name="spacer24.tga" layout="topleft" left="0" - min_width="4" - name="DUMMY" + min_width="3" + name="after_gesture_panel" top="0" - width="4"/> + width="3"/> <layout_panel mouse_opaque="false" auto_resize="false" @@ -153,7 +159,7 @@ layout="topleft" name="movement_btn" tool_tip="Shows/hides movement controls" - top="4" + top="5" width="80"> <button.init_callback function="Button.SetDockableFloaterToggle" @@ -168,10 +174,10 @@ image_name="spacer24.tga" layout="topleft" left="0" - min_width="4" - name="DUMMY" + min_width="3" + name="after_movement_panel" top="0" - width="4"/> + width="3"/> <layout_panel mouse_opaque="false" auto_resize="false" @@ -195,7 +201,7 @@ layout="topleft" left="0" tool_tip="Shows/hides camera controls" - top="4" + top="5" name="camera_btn" width="80"> <button.init_callback @@ -211,10 +217,10 @@ image_name="spacer24.tga" layout="topleft" left="0" - min_width="4" - name="DUMMY" + min_width="3" + name="after_cam_panel" top="0" - width="4"/> + width="3"/> <layout_panel mouse_opaque="false" auto_resize="false" @@ -235,7 +241,7 @@ layout="topleft" name="snapshots" width="36" - top="4" + top="5" is_toggle="true" image_overlay="Snapshot_Off" tool_tip="Take snapshot"> @@ -247,12 +253,12 @@ <layout_panel mouse_opaque="false" follows="left|right" - height="29" + height="30" layout="topleft" top="0" name="chiclet_list_panel" width="189" - min_width="110" + min_width="60" user_resize="false" auto_resize="true"> <!--*NOTE: min_width of the chiclet_panel (chiclet_list) must be the same @@ -260,12 +266,12 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. <chiclet_panel mouse_opaque="false" follows="left|right" - height="23" + height="24" layout="topleft" left="1" - min_width="110" + min_width="60" name="chiclet_list" - top="6" + top="7" chiclet_padding="4" scrolling_offset="40" width="189"> @@ -284,7 +290,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. name="chicklet_left_scroll_button" scale_image="true" tab_stop="false" - top="-2" + top="-4" right_pad="2" visible="false" width="7" /> @@ -303,7 +309,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. name="chicklet_right_scroll_button" scale_image="true" tab_stop="false" - top="-2" + top="-4" visible="false" width="7" /> </chiclet_panel> @@ -317,6 +323,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. layout="topleft" left="0" min_width="4" + name="DUMMY" top="0" width="5"/> <layout_panel @@ -334,14 +341,14 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. max_displayed_count="99" flash_period="0.3" follows="right" - height="23" + height="28" layout="topleft" left="0" name="im_well" - top="4" + top="0" width="35"> <!-- -Emulate 4 states of button by background images, see detains in EXT-3147. The same should be for notification_well button +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 @@ -350,7 +357,6 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well --> <button auto_resize="true" - flash_color="Yellow" follows="right" halign="center" height="23" @@ -358,13 +364,12 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well image_overlay_alignment="center" image_pressed="WellButton_Lit" image_pressed_selected="WellButton_Lit_Selected" - image_selected="PushButton_Selected_Press" + image_selected="PushButton_Press" label_color="Black" left="0" name="Unread IM messages" - pad_left="0" - pad_right="0" - width="35" > + tool_tip="Conversations" + width="34" > <button.init_callback function="Button.SetDockableFloaterToggle" parameter="im_well_window" /> @@ -378,11 +383,22 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well layout="topleft" min_height="28" top="0" - left_pad="4" + left_pad="3" name="notification_well_panel" - width="35" - min_width="35" + width="40" + min_width="40" user_resize="false"> + <icon + auto_resize="false" + color="0 0 0 0" + follows="left|right" + height="10" + image_name="spacer24.tga" + layout="topleft" + left="0" + min_width="4" + top="0" + width="5" /> <chiclet_notification flash_period="0.25" follows="right" @@ -391,41 +407,40 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well left="0" max_displayed_count="99" name="notification_well" - top="4" + top="5" width="35"> <button bottom_pad="3" image_pressed="WellButton_Lit" image_pressed_selected="WellButton_Lit_Selected" - image_selected="PushButton_Selected_Press" + image_selected="PushButton_Press" auto_resize="true" halign="center" height="23" follows="right" - flash_color="Yellow" label_color="Black" - left="5" + left="0" name="Unread" image_overlay="Notices_Unread" image_overlay_alignment="center" - pad_right="5" - width="35" > + tool_tip="Notifications" + width="34" > <button.init_callback function="Button.SetDockableFloaterToggle" parameter="notification_well_window" /> </button> - </chiclet_notification> - </layout_panel> - <icon + <icon auto_resize="false" color="0 0 0 0" follows="left|right" height="10" image_name="spacer24.tga" layout="topleft" + left="0" min_width="4" - right="-1" top="0" - width="4"/> + width="5" /> + </chiclet_notification> + </layout_panel> </layout_stack> </panel> |