Skip to content
Snippets Groups Projects
Commit b2e36e52 authored by Merov Linden's avatar Merov Linden
Browse files

Sync with viewer-experience

parents 84499951 59f8a2e7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/skins/default/xui/en/panel_bottomtray.xml
+ 338
− 338
View file @ b2e36e52
...@@ -13,31 +13,31 @@ ...@@ -13,31 +13,31 @@
top="28" top="28"
width="1310"> width="1310">
<string <string
name="DragIndicationImageName" name="DragIndicationImageName"
value="Accordion_ArrowOpened_Off" /> value="Accordion_ArrowOpened_Off" />
<string <string
name="SpeakBtnToolTip" name="SpeakBtnToolTip"
value="Turns microphone on/off" /> value="Turns microphone on/off" />
<string <string
name="VoiceControlBtnToolTip" name="VoiceControlBtnToolTip"
value="Shows/hides voice control panel" /> value="Shows/hides voice control panel" />
<layout_stack <layout_stack
border_size="0" border_size="0"
clip="false" clip="false"
follows="all" follows="all"
height="28" height="28"
layout="topleft" layout="topleft"
left="0" left="0"
mouse_opaque="false" mouse_opaque="false"
name="toolbar_stack" name="toolbar_stack"
orientation="horizontal" orientation="horizontal"
top="0" top="0"
width="1310"> width="1310">
<layout_panel <layout_panel
auto_resize="false" auto_resize="false"
user_resize="false" user_resize="false"
min_width="2" min_width="2"
width="2" /> width="2" />
<layout_panel <layout_panel
auto_resize="false" auto_resize="false"
layout="topleft" layout="topleft"
...@@ -47,16 +47,16 @@ ...@@ -47,16 +47,16 @@
mouse_opaque="false" mouse_opaque="false"
name="chat_bar_layout_panel" name="chat_bar_layout_panel"
user_resize="true" user_resize="true"
width="250" > width="310" >
<panel <panel
name="chat_bar" name="chat_bar"
filename="panel_nearby_chat_bar.xml" filename="panel_nearby_chat_bar.xml"
left="0" left="0"
height="28" height="28"
width="248" width="308"
top="0" top="0"
mouse_opaque="false" mouse_opaque="false"
follows="left|right" follows="left|right"
/> />
</layout_panel> </layout_panel>
<!-- <!--
...@@ -82,17 +82,17 @@ ...@@ -82,17 +82,17 @@
width="5" /> width="5" />
</layout_panel> </layout_panel>
<layout_panel <layout_panel
auto_resize="false" auto_resize="false"
follows="left|right" follows="left|right"
height="28" height="28"
layout="topleft" layout="topleft"
min_height="28" min_height="28"
min_width="59" min_width="59"
mouse_opaque="false" mouse_opaque="false"
name="speak_panel" name="speak_panel"
top_delta="0" top_delta="0"
user_resize="false" user_resize="false"
width="108"> width="108">
<talk_button <talk_button
follows="left|right" follows="left|right"
height="23" height="23"
...@@ -120,36 +120,36 @@ ...@@ -120,36 +120,36 @@
</talk_button> </talk_button>
</layout_panel> </layout_panel>
<layout_panel <layout_panel
auto_resize="false" auto_resize="false"
follows="right" follows="right"
height="28" height="28"
layout="topleft" layout="topleft"
min_height="28" min_height="28"
min_width="65" min_width="65"
mouse_opaque="false" mouse_opaque="false"
name="gesture_panel" name="gesture_panel"
top_delta="0" top_delta="0"
user_resize="false" user_resize="false"
width="85"> width="85">
<gesture_combo_list <gesture_combo_list
follows="left|right" follows="left|right"
height="23" height="23"
label="Gesture" label="Gesture"
layout="topleft" layout="topleft"
left="0" left="0"
name="Gesture" name="Gesture"
tool_tip="Shows/hides gestures" tool_tip="Shows/hides gestures"
top="5" top="5"
width="82"> width="82">
<combo_button <combo_button
pad_right="10" pad_right="10"
use_ellipses="true" /> use_ellipses="true" />
<combo_list <combo_list
page_lines="17" /> page_lines="17" />
</gesture_combo_list> </gesture_combo_list>
</layout_panel> </layout_panel>
<layout_panel <layout_panel
auto_resize="false" auto_resize="false"
follows="right" follows="right"
height="28" height="28"
layout="topleft" layout="topleft"
...@@ -181,58 +181,58 @@ ...@@ -181,58 +181,58 @@
</layout_panel> </layout_panel>
<layout_panel <layout_panel
auto_resize="false" auto_resize="false"
follows="left|right" follows="left|right"
height="28" height="28"
layout="topleft" layout="topleft"
min_height="28" min_height="28"
min_width="52" min_width="52"
mouse_opaque="false" mouse_opaque="false"
name="cam_panel" name="cam_panel"
user_resize="false" user_resize="false"
width="83"> width="83">
<bottomtray_button <bottomtray_button
follows="left|right" follows="left|right"
height="23" height="23"
image_pressed="PushButton_Press" image_pressed="PushButton_Press"
image_pressed_selected="PushButton_Selected_Press" image_pressed_selected="PushButton_Selected_Press"
image_selected="PushButton_Selected_Press" image_selected="PushButton_Selected_Press"
is_toggle="true" is_toggle="true"
label="View" label="View"
layout="topleft" layout="topleft"
left="0" left="0"
name="camera_btn" name="camera_btn"
tool_tip="Shows/hides camera controls" tool_tip="Shows/hides camera controls"
top="5" top="5"
use_ellipses="true" use_ellipses="true"
width="80"> width="80">
<init_callback <init_callback
function="Button.SetDockableFloaterToggle" function="Button.SetDockableFloaterToggle"
parameter="camera" /> parameter="camera" />
</bottomtray_button> </bottomtray_button>
</layout_panel> </layout_panel>
<layout_panel <layout_panel
auto_resize="false" auto_resize="false"
follows="left|right" follows="left|right"
height="28" height="28"
layout="topleft" layout="topleft"
min_width="40" min_width="40"
mouse_opaque="false" mouse_opaque="false"
name="snapshot_panel" name="snapshot_panel"
user_resize="false" user_resize="false"
width="39"> width="39">
<bottomtray_button <bottomtray_button
follows="left|right" follows="left|right"
height="23" height="23"
image_overlay="Snapshot_Off" image_overlay="Snapshot_Off"
image_pressed="PushButton_Press" image_pressed="PushButton_Press"
image_pressed_selected="PushButton_Selected_Press" image_pressed_selected="PushButton_Selected_Press"
image_selected="PushButton_Selected_Press" image_selected="PushButton_Selected_Press"
is_toggle="true" is_toggle="true"
layout="topleft" layout="topleft"
left="0" left="0"
name="snapshots" name="snapshots"
tool_tip="Take snapshot" tool_tip="Take snapshot"
top="5" top="5"
width="36"> width="36">
<init_callback <init_callback
function="Button.SetFloaterToggle" function="Button.SetFloaterToggle"
...@@ -240,33 +240,33 @@ ...@@ -240,33 +240,33 @@
</bottomtray_button> </bottomtray_button>
</layout_panel> </layout_panel>
<layout_panel <layout_panel
auto_resize="false" auto_resize="false"
follows="left|right" follows="left|right"
height="28" height="28"
layout="topleft" layout="topleft"
min_height="28" min_height="28"
min_width="52" min_width="52"
mouse_opaque="false" mouse_opaque="false"
name="build_btn_panel" name="build_btn_panel"
user_resize="false" user_resize="false"
width="83"> width="83">
<!--*FIX: Build Floater is not opened with default registration. Will be fixed soon. <!--*FIX: Build Floater is not opened with default registration. Will be fixed soon.
Disabled for now. Disabled for now.
--> -->
<bottomtray_button <bottomtray_button
follows="left|right" follows="left|right"
height="23" height="23"
image_pressed="PushButton_Press" image_pressed="PushButton_Press"
image_pressed_selected="PushButton_Selected_Press" image_pressed_selected="PushButton_Selected_Press"
image_selected="PushButton_Selected_Press" image_selected="PushButton_Selected_Press"
is_toggle="true" is_toggle="true"
label="Build" label="Build"
layout="topleft" layout="topleft"
left="0" left="0"
name="build_btn" name="build_btn"
tool_tip="Shows/hides Build Tools" tool_tip="Shows/hides Build Tools"
top="5" top="5"
use_ellipses="true" use_ellipses="true"
width="80"> width="80">
<commit_callback <commit_callback
function="Build.Toggle" function="Build.Toggle"
...@@ -274,181 +274,181 @@ Disabled for now. ...@@ -274,181 +274,181 @@ Disabled for now.
</bottomtray_button> </bottomtray_button>
</layout_panel> </layout_panel>
<layout_panel <layout_panel
auto_resize="false" auto_resize="false"
follows="left|right" follows="left|right"
height="28" height="28"
layout="topleft" layout="topleft"
min_height="28" min_height="28"
min_width="52" min_width="52"
mouse_opaque="false" mouse_opaque="false"
name="search_btn_panel" name="search_btn_panel"
user_resize="false" user_resize="false"
width="83"> width="83">
<bottomtray_button <bottomtray_button
follows="left|right" follows="left|right"
height="23" height="23"
image_pressed="PushButton_Press" image_pressed="PushButton_Press"
image_pressed_selected="PushButton_Selected_Press" image_pressed_selected="PushButton_Selected_Press"
image_selected="PushButton_Selected_Press" image_selected="PushButton_Selected_Press"
is_toggle="true" is_toggle="true"
label="Search" label="Search"
layout="topleft" layout="topleft"
left="0" left="0"
name="search_btn" name="search_btn"
tool_tip="Shows/hides Search" tool_tip="Shows/hides Search"
top="5" top="5"
use_ellipses="true" use_ellipses="true"
width="80"> width="80">
<init_callback <init_callback
function="Button.SetFloaterToggle" function="Button.SetFloaterToggle"
parameter="search" /> parameter="search" />
</bottomtray_button> </bottomtray_button>
</layout_panel> </layout_panel>
<layout_panel <layout_panel
auto_resize="false" auto_resize="false"
follows="left|right" follows="left|right"
height="28" height="28"
layout="topleft" layout="topleft"
min_height="28" min_height="28"
min_width="52" min_width="52"
mouse_opaque="false" mouse_opaque="false"
name="world_map_btn_panel" name="world_map_btn_panel"
user_resize="false" user_resize="false"
width="83"> width="83">
<bottomtray_button <bottomtray_button
follows="left|right" follows="left|right"
height="23" height="23"
image_pressed="PushButton_Press" image_pressed="PushButton_Press"
image_pressed_selected="PushButton_Selected_Press" image_pressed_selected="PushButton_Selected_Press"
image_selected="PushButton_Selected_Press" image_selected="PushButton_Selected_Press"
is_toggle="true" is_toggle="true"
label="Map" label="Map"
layout="topleft" layout="topleft"
left="0" left="0"
name="world_map_btn" name="world_map_btn"
tool_tip="Shows/hides World Map" tool_tip="Shows/hides World Map"
top="5" top="5"
use_ellipses="true" use_ellipses="true"
width="80"> width="80">
<init_callback <init_callback
function="Button.SetFloaterToggle" function="Button.SetFloaterToggle"
parameter="world_map" /> parameter="world_map" />
</bottomtray_button> </bottomtray_button>
</layout_panel> </layout_panel>
<layout_panel <layout_panel
auto_resize="false" auto_resize="false"
follows="left|right" follows="left|right"
height="28" height="28"
layout="topleft" layout="topleft"
min_height="28" min_height="28"
min_width="62" min_width="52"
mouse_opaque="false" mouse_opaque="false"
name="mini_map_btn_panel" name="mini_map_btn_panel"
user_resize="false" user_resize="false"
width="83"> width="83">
<bottomtray_button <bottomtray_button
follows="left|right" follows="left|right"
height="23" height="23"
image_pressed="PushButton_Press" image_pressed="PushButton_Press"
image_pressed_selected="PushButton_Selected_Press" image_pressed_selected="PushButton_Selected_Press"
image_selected="PushButton_Selected_Press" image_selected="PushButton_Selected_Press"
is_toggle="true" is_toggle="true"
label="Mini-Map" label="Mini-Map"
layout="topleft" layout="topleft"
left="0" left="0"
name="mini_map_btn" name="mini_map_btn"
tool_tip="Shows/hides Mini-Map" tool_tip="Shows/hides Mini-Map"
top="5" top="5"
use_ellipses="true" use_ellipses="true"
width="80"> width="80">
<init_callback <init_callback
function="Button.SetFloaterToggle" function="Button.SetFloaterToggle"
parameter="mini_map" /> parameter="mini_map" />
</bottomtray_button> </bottomtray_button>
</layout_panel> </layout_panel>
<layout_panel <layout_panel
follows="left|right" follows="left|right"
height="30" height="30"
layout="topleft" layout="topleft"
min_width="95" min_width="95"
mouse_opaque="false" mouse_opaque="false"
name="chiclet_list_panel" name="chiclet_list_panel"
top="0" top="0"
user_resize="false" user_resize="false"
width="189"> width="189">
<!--*NOTE: min_width of the chiclet_panel (chiclet_list) must be the same <!--*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--> as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. EXT-991-->
<chiclet_panel <chiclet_panel
chiclet_padding="4" chiclet_padding="4"
follows="left|right" follows="left|right"
height="24" height="24"
layout="topleft" layout="topleft"
left="1" left="1"
min_width="95" min_width="95"
mouse_opaque="false" mouse_opaque="false"
name="chiclet_list" name="chiclet_list"
top="7" top="7"
width="189"> width="189">
<button <button
auto_resize="true" auto_resize="true"
follows="right" follows="right"
height="29" height="29"
image_hover_selected="SegmentedBtn_Left_Over" image_hover_selected="SegmentedBtn_Left_Over"
image_hover_unselected="SegmentedBtn_Left_Over" image_hover_unselected="SegmentedBtn_Left_Over"
image_overlay="Arrow_Small_Left" image_overlay="Arrow_Small_Left"
image_pressed="SegmentedBtn_Left_Press" image_pressed="SegmentedBtn_Left_Press"
image_pressed_selected="SegmentedBtn_Left_Press" image_pressed_selected="SegmentedBtn_Left_Press"
image_selected="SegmentedBtn_Left_Off" image_selected="SegmentedBtn_Left_Off"
image_unselected="SegmentedBtn_Left_Off" image_unselected="SegmentedBtn_Left_Off"
layout="topleft" layout="topleft"
name="chicklet_left_scroll_button" name="chicklet_left_scroll_button"
tab_stop="false" tab_stop="false"
top="-28" top="-28"
visible="false" visible="false"
width="7" /> width="7" />
<button <button
auto_resize="true" auto_resize="true"
follows="right" follows="right"
height="29" height="29"
image_hover_selected="SegmentedBtn_Right_Over" image_hover_selected="SegmentedBtn_Right_Over"
image_hover_unselected="SegmentedBtn_Right_Over" image_hover_unselected="SegmentedBtn_Right_Over"
image_overlay="Arrow_Small_Right" image_overlay="Arrow_Small_Right"
image_pressed="SegmentedBtn_Right_Press" image_pressed="SegmentedBtn_Right_Press"
image_pressed_selected="SegmentedBtn_Right_Press" image_pressed_selected="SegmentedBtn_Right_Press"
image_selected="SegmentedBtn_Right_Off" image_selected="SegmentedBtn_Right_Off"
image_unselected="SegmentedBtn_Right_Off" image_unselected="SegmentedBtn_Right_Off"
layout="topleft" layout="topleft"
name="chicklet_right_scroll_button" name="chicklet_right_scroll_button"
tab_stop="false" tab_stop="false"
top="-28" top="-28"
visible="false" visible="false"
width="7" /> width="7" />
</chiclet_panel> </chiclet_panel>
</layout_panel> </layout_panel>
<layout_panel auto_resize="false" <layout_panel auto_resize="false"
user_resize="false" user_resize="false"
width="4" width="4"
min_width="4"/> min_width="4"/>
<layout_panel <layout_panel
auto_resize="false" auto_resize="false"
follows="right" follows="right"
height="28" height="28"
layout="topleft" layout="topleft"
min_height="28" min_height="28"
min_width="37" min_width="37"
name="im_well_panel" name="im_well_panel"
top="0" top="0"
user_resize="false" user_resize="false"
width="37"> width="37">
<chiclet_im_well <chiclet_im_well
follows="right" follows="right"
height="28" height="28"
layout="topleft" layout="topleft"
left="0" left="0"
max_displayed_count="99" max_displayed_count="99"
name="im_well" name="im_well"
top="0" top="0"
width="35"> width="35">
<!-- <!--
Emulate 4 states of button by background images, see details 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 xml attribute Description
...@@ -458,73 +458,73 @@ image_pressed "Lit" - there are new messages ...@@ -458,73 +458,73 @@ image_pressed "Lit" - there are new messages
image_pressed_selected "Lit" + "Selected" - there are new messages and the Well is open image_pressed_selected "Lit" + "Selected" - there are new messages and the Well is open
--> -->
<button <button
auto_resize="true" auto_resize="true"
follows="right" follows="right"
halign="center" halign="center"
height="23" height="23"
image_overlay="Unread_IM" image_overlay="Unread_IM"
image_overlay_alignment="center" image_overlay_alignment="center"
image_pressed="WellButton_Lit" image_pressed="WellButton_Lit"
image_pressed_selected="WellButton_Lit_Selected" image_pressed_selected="WellButton_Lit_Selected"
image_selected="PushButton_Press" image_selected="PushButton_Press"
label_color="Black" label_color="Black"
left="0" left="0"
name="Unread IM messages" name="Unread IM messages"
tool_tip="Conversations" tool_tip="Conversations"
width="34"> width="34">
<init_callback <init_callback
function="Button.SetDockableFloaterToggle" function="Button.SetDockableFloaterToggle"
parameter="im_well_window" /> parameter="im_well_window" />
</button> </button>
</chiclet_im_well> </chiclet_im_well>
</layout_panel> </layout_panel>
<layout_panel <layout_panel
auto_resize="false" auto_resize="false"
follows="right" follows="right"
height="28" height="28"
layout="topleft" layout="topleft"
min_height="28" min_height="28"
min_width="37" min_width="37"
name="notification_well_panel" name="notification_well_panel"
top="0" top="0"
user_resize="false" user_resize="false"
width="37"> width="37">
<chiclet_notification <chiclet_notification
follows="right" follows="right"
height="23" height="23"
layout="topleft" layout="topleft"
left="0" left="0"
max_displayed_count="99" max_displayed_count="99"
name="notification_well" name="notification_well"
top="5" top="5"
width="35"> width="35">
<button <button
auto_resize="true" auto_resize="true"
bottom_pad="3" bottom_pad="3"
follows="right" follows="right"
halign="center" halign="center"
height="23" height="23"
image_overlay="Notices_Unread" image_overlay="Notices_Unread"
image_overlay_alignment="center" image_overlay_alignment="center"
image_pressed="WellButton_Lit" image_pressed="WellButton_Lit"
image_pressed_selected="WellButton_Lit_Selected" image_pressed_selected="WellButton_Lit_Selected"
image_selected="PushButton_Press" image_selected="PushButton_Press"
label_color="Black" label_color="Black"
left="0" left="0"
name="Unread" name="Unread"
tool_tip="Notifications" tool_tip="Notifications"
width="34"> width="34">
<init_callback <init_callback
function="Button.SetDockableFloaterToggle" function="Button.SetDockableFloaterToggle"
parameter="notification_well_window" /> parameter="notification_well_window" />
</button> </button>
</chiclet_notification> </chiclet_notification>
</layout_panel> </layout_panel>
<layout_panel <layout_panel
auto_resize="false" auto_resize="false"
user_resize="false" user_resize="false"
min_width="4" min_width="4"
name="DUMMY2" name="DUMMY2"
width="8" /> width="8" />
</layout_stack> </layout_stack>
</panel> </panel>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment