Skip to content
Snippets Groups Projects
Commit ec43b68b authored by Leyla Farazha's avatar Leyla Farazha
Browse files

fixing bottomtray for advanced viewer

parent 4bb82732
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
indra/newview/skins/default/xui/en/panel_bottomtray.xml
+ 530
− 521
View file @ ec43b68b
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
bg_opaque_color="DkGray" bg_opaque_color="DkGray"
chrome="true" chrome="true"
follows="left|bottom|right" follows="left|bottom|right"
focus_root="true"
height="33" height="33"
layout="topleft" layout="topleft"
left="0" left="0"
name="bottom_tray" name="bottom_tray"
focus_root="true"
top="28" top="28"
width="1310"> width="1310">
<string <string
...@@ -47,18 +47,40 @@ ...@@ -47,18 +47,40 @@
mouse_opaque="false" mouse_opaque="false"
name="chat_bar_layout_panel" name="chat_bar_layout_panel"
user_resize="true" user_resize="true"
width="308" > 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="306" width="308"
top="0" top="0"
mouse_opaque="false" mouse_opaque="false"
follows="left|right" follows="left|right"
/> />
</layout_panel> </layout_panel>
<!--
This 5px Panel is an indicator of where the resize handle is.
The panel provides a gap between the resize handle icon and a button to the right.
-->
<layout_panel
auto_resize="false"
layout="topleft"
max_width="5"
min_width="5"
name="chat_bar_resize_handle_panel"
user_resize="false"
width="5">
<icon
follows="top|right"
height="25"
image_name="ChatBarHandle"
layout="topleft"
left="-7"
name="resize_handle"
top="4"
width="5" />
</layout_panel>
<layout_panel <layout_panel
auto_resize="false" auto_resize="false"
follows="left|right" follows="left|right"
...@@ -114,8 +136,6 @@ ...@@ -114,8 +136,6 @@
height="23" height="23"
label="Gesture" label="Gesture"
layout="topleft" layout="topleft"
get_more="false"
view_all="false"
left="0" left="0"
name="Gesture" name="Gesture"
tool_tip="Shows/hides gestures" tool_tip="Shows/hides gestures"
...@@ -123,7 +143,6 @@ ...@@ -123,7 +143,6 @@
width="82"> width="82">
<combo_button <combo_button
pad_right="10" pad_right="10"
can_drag="false"
use_ellipses="true" /> use_ellipses="true" />
<combo_list <combo_list
page_lines="17" /> page_lines="17" />
...@@ -131,83 +150,93 @@ ...@@ -131,83 +150,93 @@
</layout_panel> </layout_panel>
<layout_panel <layout_panel
auto_resize="false" auto_resize="false"
follows="left|right" follows="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="movement_panel"
user_resize="false" user_resize="false"
width="83"> width="83">
<bottomtray_button <bottomtray_button
can_drag="false"
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="Move"
layout="topleft" layout="topleft"
left="0" name="movement_btn"
name="camera_btn" tool_tip="Shows/hides movement 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="moveview" />
</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="17" min_height="28"
name="splitter_panel" min_width="52"
mouse_opaque="false"
name="cam_panel"
user_resize="false" user_resize="false"
width="17"> width="83">
<icon <bottomtray_button
follows="left|bottom" follows="left|right"
height="18" height="23"
width="2" image_pressed="PushButton_Press"
left="6" image_pressed_selected="PushButton_Selected_Press"
image_name="Button_Separator" image_selected="PushButton_Selected_Press"
name="separator" is_toggle="true"
top="7"/> label="View"
layout="topleft"
left="0"
name="camera_btn"
tool_tip="Shows/hides camera controls"
top="5"
use_ellipses="true"
width="80">
<init_callback
function="Button.SetDockableFloaterToggle"
parameter="camera" />
</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_width="40"
min_width="83"
mouse_opaque="false" mouse_opaque="false"
name="avatar_and_destinations_panel" name="snapshot_panel"
user_resize="false" user_resize="false"
width="103"> width="39">
<bottomtray_button <bottomtray_button
can_drag="false"
follows="left|right" follows="left|right"
height="23" height="23"
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"
label="Destinations" is_toggle="true"
layout="topleft" layout="topleft"
left="0" left="0"
name="destination_btn" name="snapshots"
tool_tip="Shows destinations window" tool_tip="Take snapshot"
top="5" top="5"
is_toggle="true" width="36">
use_ellipses="true" <init_callback
width="100"> function="Button.SetFloaterToggle"
<bottomtray_button.commit_callback parameter="snapshot" />
function="Destination.show" />
</bottomtray_button> </bottomtray_button>
</layout_panel> </layout_panel>
<layout_panel <layout_panel
...@@ -216,28 +245,32 @@ ...@@ -216,28 +245,32 @@
height="28" height="28"
layout="topleft" layout="topleft"
min_height="28" min_height="28"
min_width="73" min_width="52"
mouse_opaque="false" mouse_opaque="false"
name="avatar_and_destinations_panel" name="build_btn_panel"
user_resize="false" user_resize="false"
width="103"> width="83">
<!--*FIX: Build Floater is not opened with default registration. Will be fixed soon.
Disabled for now.
-->
<bottomtray_button <bottomtray_button
can_drag="false"
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"
label="My Avatar" is_toggle="true"
label="Build"
layout="topleft" layout="topleft"
left="0" left="0"
name="avatar_btn" name="build_btn"
tool_tip="Shows/hides Build Tools"
top="5" top="5"
is_toggle="true"
use_ellipses="true" use_ellipses="true"
width="100"> width="80">
<bottomtray_button.commit_callback <commit_callback
function="Avatar.show" /> function="Build.Toggle"
parameter="build" />
</bottomtray_button> </bottomtray_button>
</layout_panel> </layout_panel>
<layout_panel <layout_panel
...@@ -245,116 +278,92 @@ ...@@ -245,116 +278,92 @@
follows="left|right" follows="left|right"
height="28" height="28"
layout="topleft" layout="topleft"
min_width="17"
name="splitter_panel"
user_resize="false"
width="17">
<icon
follows="left|bottom"
height="18"
width="2"
left="6"
image_name="Button_Separator"
name="separator"
top="7"/>
</layout_panel>
<layout_panel
auto_resize="false"
follows="right"
height="28"
layout="topleft"
min_height="28" min_height="28"
min_width="65" min_width="52"
mouse_opaque="false" mouse_opaque="false"
name="people_panel" name="search_btn_panel"
top_delta="0"
user_resize="false" user_resize="false"
width="105"> width="83">
<bottomtray_button <bottomtray_button
can_drag="false"
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"
label="People" is_toggle="true"
label="Search"
layout="topleft" layout="topleft"
left="0" left="0"
name="show_people_button" name="search_btn"
tool_tip="Shows people window" tool_tip="Shows/hides Search"
top="5" top="5"
is_toggle="true"
use_ellipses="true" use_ellipses="true"
width="100"> width="80">
<bottomtray_button.commit_callback <init_callback
function="ShowSidetrayPanel" function="Button.SetFloaterToggle"
parameter="panel_people" /> parameter="search" />
</bottomtray_button> </bottomtray_button>
</layout_panel> </layout_panel>
<layout_panel <layout_panel
auto_resize="false" auto_resize="false"
follows="right" follows="left|right"
height="28" height="28"
layout="topleft" layout="topleft"
min_height="28" min_height="28"
min_width="65" min_width="52"
mouse_opaque="false" mouse_opaque="false"
name="profile_panel" name="world_map_btn_panel"
top_delta="0"
user_resize="false" user_resize="false"
width="105"> width="83">
<bottomtray_button <bottomtray_button
can_drag="false"
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"
label="Profile" is_toggle="true"
label="Map"
layout="topleft" layout="topleft"
left="0" left="0"
name="show_profile_btn" name="world_map_btn"
tool_tip="Shows profile window" tool_tip="Shows/hides World Map"
is_toggle="true"
top="5" top="5"
use_ellipses="true" use_ellipses="true"
width="100"> width="80">
<bottomtray_button.commit_callback <init_callback
function="ToggleAgentProfile" function="Button.SetFloaterToggle"
parameter="agent"/> parameter="world_map" />
</bottomtray_button> </bottomtray_button>
</layout_panel> </layout_panel>
<layout_panel <layout_panel
auto_resize="false" auto_resize="false"
follows="right" follows="left|right"
height="28" height="28"
layout="topleft" layout="topleft"
min_height="28" min_height="28"
min_width="65" min_width="52"
mouse_opaque="false" mouse_opaque="false"
name="howto_panel" name="mini_map_btn_panel"
top_delta="0"
user_resize="false" user_resize="false"
width="105"> width="83">
<bottomtray_button <bottomtray_button
can_drag="false"
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"
label="How To" is_toggle="true"
label="Mini-Map"
layout="topleft" layout="topleft"
left="0" left="0"
name="show_help_btn" name="mini_map_btn"
tool_tip="Open Second Life How To topics" tool_tip="Shows/hides Mini-Map"
is_toggle="true"
top="5" top="5"
use_ellipses="true" use_ellipses="true"
width="100"> width="80">
<bottomtray_button.commit_callback <init_callback
function="ToggleHelp" function="Button.SetFloaterToggle"
parameter="f1_help" /> parameter="mini_map" />
</bottomtray_button> </bottomtray_button>
</layout_panel> </layout_panel>
<layout_panel <layout_panel
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment