diff options
author | richard <none@none> | 2009-11-09 15:29:47 -0800 |
---|---|---|
committer | richard <none@none> | 2009-11-09 15:29:47 -0800 |
commit | 4eb72a12a2280d3be6ac556ad80eb953d249e8eb (patch) | |
tree | 9316784e58adc830d5cd893694698e38786af561 /indra/newview/skins/default/xui | |
parent | fac0b6836a59681443fb2bbd13e6b5eb9c07cef5 (diff) |
data driven layout of top-level UI elements
EXT-1219 Side tray slide-out animation
cleaned up some layout of bottom tray contents
reviewed by James
Diffstat (limited to 'indra/newview/skins/default/xui')
6 files changed, 150 insertions, 119 deletions
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index 2d69465b58..08f7ee456e 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -1,119 +1,130 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel follows="left|right|top|bottom" - height="768" + height="768" layout="topleft" left="0" mouse_opaque="false" - name="screen" + name="main_view" width="1024"> <layout_stack border_size="0" follows="all" - height="768" - mouse_opaque="false" + mouse_opaque="false" + height="772" name="menu_stack" - orientation="vertical"> - <!-- filename="panel_status_bar.xml"--> + orientation="vertical" + top="0"> <layout_panel auto_resize="false" + min_height="19" mouse_opaque="false" name="status_bar_container" + height="19" width="1024" visible="false"/> - <!--filename="panel_navigation_bar.xml"--> <layout_panel auto_resize="false" - height="65" - mouse_opaque="false" + height="65" + mouse_opaque="false" name="nav_bar_container" width="1024" visible="false"/> - <layout_stack auto_resize="true" - border_size="0" - follows="all" - height="500" + <panel auto_resize="true" + follows="all" + height="500" + layout="topleft" mouse_opaque="false" - name="hud_stack" - orientation="horizontal" + name="hud" width="1024"> - <panel auto_resize="true" - follows="all" - height="500" - layout="topleft" - mouse_opaque="false" - name="main_view" - user_resize="true" - width="500"> - <layout_stack bottom="500" - follows="all" - height="500" - mouse_opaque="false" - name="hud_stack" - orientation="vertical"> - <panel auto_resize="true" - follows="all" - height="500" - layout="topleft" - mouse_opaque="false" - name="hud container" - width="500"> - <debug_view follows="all" - left="0" - top="0" - mouse_opaque="false" + <layout_stack border_size="0" + follows="all" + height="500" + left="0" + mouse_opaque="false" + name="hud_stack" + orientation="horizontal" + top="0" + width="1024"> + <panel auto_resize="true" + follows="all" + height="500" + layout="topleft" + mouse_opaque="false" + name="main_view" + user_resize="true" + width="500"> + <layout_stack border_size="0" + bottom="500" + follows="all" height="500" - name="DebugView" - width="500"/> - - <panel follows="right|top|bottom" - height="500" + left="0" + mouse_opaque="false" + name="world_stack" + orientation="vertical"> + <panel auto_resize="true" + follows="all" + height="500" + layout="topleft" + mouse_opaque="false" + name="hud container" + width="500"> + <view bottom="500" + follows="all" + height="500" + left="0" + mouse_opaque="false" + name="world_view_rect" + width="500"/> + <panel follows="right|top|bottom" + height="500" mouse_opaque="false" - name="side_bar_tabs" - right="500" - top="0" + name="side_bar_tabs" + right="500" + top="0" width="32"/> - </panel> - <!--filename="panel_stand_stop_flying.xml"--> - <layout_panel auto_resize="false" - follows="all" - min_height="25" - mouse_opaque="false" - name="stand_stop_flying_container" - visible="false"/> - <!--filename="panel_bottomtray.xml"--> - <layout_panel auto_resize="false" - follows="all" - min_height="33" - mouse_opaque="false" - name="bottom_tray_container" - visible="false"/> - </layout_stack> - <floater_view follows="all" - height="500" - mouse_opaque="false" - name="Floater View" - tab_group="-1" - tab_stop="false" - top="0"/> - <snapshot_floater_view enabled="false" - follows="all" - height="500" - left="0" - mouse_opaque="false" - name="Snapshot Floater View" - tab_stop="false" - top="0" - visible="false"/> - </panel> - <!-- side tray --> - <layout_panel auto_resize="false" - follows="all" - height="500" - min_width="333" + <panel bottom="500" + follows="left|right|bottom" + height="25" + left="0" + mouse_opaque="false" + name="stand_stop_flying_container" + visible="false" + width="500"/> + </panel> + <layout_panel auto_resize="false" + follows="all" + min_height="33" + mouse_opaque="false" + name="bottom_tray_container" + visible="false"/> + </layout_stack> + </panel> + <!-- side tray --> + <layout_panel auto_resize="false" + follows="all" + height="500" + min_width="333" + mouse_opaque="false" + name="side_tray_container" + user_resize="true" + visible="false" + width="333"/> + </layout_stack> + <floater_view follows="all" + height="500" + left="0" mouse_opaque="false" - name="side_tray_container" - user_resize="true" - visible="false" - width="333"/> - </layout_stack> + name="Floater View" + tab_group="-1" + tab_stop="false" + top="0" + width="1024"/> + <debug_view follows="all" + left="0" + top="0" + mouse_opaque="false" + height="500" + name="DebugView" + width="1024"/> + </panel> </layout_stack> <notify_box_view top="0" follows="all" @@ -128,6 +139,16 @@ mouse_opaque="false" name="Menu Holder" width="1024"/> + <snapshot_floater_view enabled="false" + follows="all" + height="768" + left="0" + mouse_opaque="false" + name="Snapshot Floater View" + tab_stop="false" + top="0" + visible="false" + width="1024"/> <tooltip_view top="0" follows="all" height="768" diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index f833e0a1cb..faa38084f1 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -31,6 +31,7 @@ height="10" image_name="spacer24.tga" layout="topleft" + min_width="4" left="0" top="0" width="4" /> @@ -44,7 +45,7 @@ min_height="23" width="310" top="0" - min_width="300" + min_width="310" name="chat_bar" user_resize="false" filename="panel_nearby_chat_bar.xml" /> @@ -57,30 +58,31 @@ min_height="28" width="100" top_delta="0" - min_width="96" + min_width="100" name="speak_panel" user_resize="false"> - <talk_button - follows="right" - height="23" - speak_button.tab_stop="true" - show_button.tab_stop="true" - layout="topleft" - left="0" - name="talk" - top="3" - width="100" /> + <talk_button + follows="right" + height="23" + speak_button.tab_stop="true" + show_button.tab_stop="true" + layout="topleft" + left="0" + name="talk" + top="3" + width="100" /> </layout_panel> - <icon - auto_resize="false" - follows="left|right" - height="10" - image_name="spacer24.tga" - layout="topleft" - left="0" - name="DUMMY" - top="0" - width="4"/> + <icon + auto_resize="false" + follows="left|right" + height="10" + image_name="spacer24.tga" + layout="topleft" + left="0" + name="DUMMY" + min_width="4" + top="0" + width="4"/> <layout_panel mouse_opaque="false" auto_resize="false" @@ -112,6 +114,7 @@ image_name="spacer24.tga" layout="topleft" left="0" + min_width="4" name="DUMMY" top="0" width="4"/> @@ -149,6 +152,7 @@ image_name="spacer24.tga" layout="topleft" left="0" + min_width="4" name="DUMMY" top="0" width="4"/> @@ -188,6 +192,7 @@ image_name="spacer24.tga" layout="topleft" left="0" + min_width="4" name="DUMMY" top="0" width="4"/> @@ -243,6 +248,7 @@ image_name="spacer24.tga" layout="topleft" left="0" + min_width="4" top="0" width="5"/> <layout_panel @@ -288,6 +294,7 @@ height="10" image_name="spacer24.tga" layout="topleft" + min_width="4" right="-1" top="0" width="26"/> diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index 7b9c9f47a2..1171a8f0b5 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -3,7 +3,7 @@ background_opaque="true" background_visible="true" bg_opaque_color="MouseGray" - follows="top|left|right" + follows="all" height="19" layout="topleft" left="0" diff --git a/indra/newview/skins/default/xui/en/widgets/context_menu.xml b/indra/newview/skins/default/xui/en/widgets/context_menu.xml new file mode 100644 index 0000000000..459706c689 --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/context_menu.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu visible="false"/> diff --git a/indra/newview/skins/default/xui/en/widgets/side_tray.xml b/indra/newview/skins/default/xui/en/widgets/side_tray.xml index 8b4a5afbe9..022564c12f 100644 --- a/indra/newview/skins/default/xui/en/widgets/side_tray.xml +++ b/indra/newview/skins/default/xui/en/widgets/side_tray.xml @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <side_tray tab_btn_image="TaskPanel_Tab_Off" - tab_btn_image_selected="TaskPanel_Tab_Selected" - tab_btn_width="32" - tab_btn_height="40" - tab_btn_margin="1" - > + tab_btn_image_selected="TaskPanel_Tab_Selected" + tab_btn_width="32" + tab_btn_height="40" + tab_btn_margin="1"> </side_tray> diff --git a/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml b/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml new file mode 100644 index 0000000000..48950a98ad --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/toggleable_menu.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<toggleable_menu visible="false"/> |