diff options
Diffstat (limited to 'indra/newview/skins/default/xui')
6 files changed, 156 insertions, 81 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml index b58c006b3f..fbfbe51a69 100644 --- a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml +++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml @@ -16,14 +16,9 @@ min_button_width="0" max_button_width="100" side="top"> - <button auto_resize="true" - use_ellipses="true" - label="Button"/> - <button auto_resize="true" - label="Button with long label"/> - <button auto_resize="true" - use_ellipses="true" - label="Button with longest label of all"/> + <command name="avatar"/> + <command name="build"/> + <command name="chat"/> </toolbar> <toolbar name="test_toolbar_left" follows="left|bottom|top" @@ -33,12 +28,9 @@ top="70" min_button_width="100" side="left"> - <button height="30" - label="Button"/> - <button height="50" - label="Button with long label"/> - <button height="60" - label="Button with longest label of all"/> + <command name="avatar"/> + <command name="build"/> + <command name="chat"/> </toolbar> <toolbar name="test_toolbar_right" follows="right|bottom|top" @@ -47,12 +39,9 @@ right="500" top="70" side="right"> - <button auto_resize="true" - label="Button 1"/> - <button auto_resize="true" - label="Button with long label"/> - <button auto_resize="true" - label="Button with longest label of all"/> + <command name="avatar"/> + <command name="build"/> + <command name="chat"/> </toolbar> <toolbar name="test_toolbar_bottom" follows="left|right|bottom" @@ -62,11 +51,8 @@ bottom="500" min_button_width="100" side="bottom"> - <button auto_resize="true" - label="Button"/> - <button auto_resize="true" - label="Button with long label"/> - <button auto_resize="true" - label="Button with longest label of all"/> + <command name="avatar"/> + <command name="build"/> + <command name="chat"/> </toolbar> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml index 5f3a59d964..60a39b0bff 100644 --- a/indra/newview/skins/default/xui/en/floater_toybox.xml +++ b/indra/newview/skins/default/xui/en/floater_toybox.xml @@ -14,17 +14,17 @@ save_rect="true" single_instance="true" title="Customize toolbars" - width="658"> + width="650"> <text follows="left|top" font="SansSerifMedium" halign="left" height="20" layout="topleft" - left="40" + left="20" length="1" name="toybox label 1" - right="-40" + right="-20" top="35" type="string"> Add or remove buttons by dragging them to or from the toolbars. @@ -35,21 +35,28 @@ halign="left" height="20" layout="topleft" - left="40" + left="20" length="1" name="toybox label 2" - right="-40" + right="-20" top="55" type="string"> Buttons will appear as shown or as icon-only depending on each toolbar's settings. </text> <toolbar bottom="395" - left="40" + button_display_mode="icons_with_text" + left="20" max_button_width="140" - min_button_width="140" + min_button_width="70" name="toybox_toolbar" - right="-40" + pad_left="5" + pad_right="5" + pad_top="5" + pad_bottom="5" + pad_between="15" + read_only="true" + right="-20" side="top" top="85"> </toolbar> @@ -59,7 +66,7 @@ label="Restore defaults" label_selected="Restore defaults" layout="topleft" - left="40" + left="20" name="btn_restore_defaults" top="415" width="130"> diff --git a/indra/newview/skins/default/xui/en/menu_toolbars.xml b/indra/newview/skins/default/xui/en/menu_toolbars.xml new file mode 100644 index 0000000000..de13fec670 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_toolbars.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Toolbars Popup" + visible="false"> + <menu_item_call label="Choose buttons..." + layout="topleft" + name="Chose Buttons"> + <menu_item_call.on_click function="Floater.Show" + parameter="toybox" /> + </menu_item_call> + <menu_item_separator layout="topleft" /> + <menu_item_check label="Icons and labels" + layout="topleft" + name="icons_and_labels"> + <on_click function="Toolbars.EnableSetting" + parameter="icons_and_labels" /> + <on_check function="Toolbars.CheckSetting" + parameter="icons_and_labels" /> + </menu_item_check> + <menu_item_check label="Icons only" + layout="topleft" + name="icons_only"> + <on_click function="Toolbars.EnableSetting" + parameter="icons_only" /> + <on_check function="Toolbars.CheckSetting" + parameter="icons_only" /> + </menu_item_check> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml index 12c442d8f1..23ea516b86 100644 --- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml +++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml @@ -10,48 +10,96 @@ mouse_opaque="false" tab_stop="false" visible="true"> - <toolbar - follows="top|bottom|left" - layout="topleft" - name="toolbar_left" - height="500" - width="30" - left="0" - top="0" - side="left" - visible="true" /> - <toolbar - follows="right|bottom|left" - layout="topleft" - name="toolbar_bottom" - height="30" - width="964" - left="30" - top="470" - side="bottom" - visible="true" /> - <toolbar - follows="top|bottom|right" - layout="topleft" - name="toolbar_right" - height="500" - width="30" - left="994" - top="0" - side="right" - visible="true" /> - <panel - follows="top|bottom|left" - layout="topleft" - name="sizer_left" - height="500" - width="30" - left="0" - top="0" - background_opaque="false" - border_visible="false" - background_visible="true" - bg_opaque_image="Toast_Over" - bg_alpha_image="Toast_Background" - visible="true" /> + <layout_stack name="bottom_toolbar_stack" + orientation="vertical" + left="0" + top="0" + width="1024" + height="500" + follows="all" + mouse_opaque="false"> + <layout_panel name="vertical_toolbar_panel" + auto_resize="true" + user_resize="false" + width="1024" + height="500" + mouse_opaque="false"> + <layout_stack name="vertical_toolbar_stack" + orientation="horizontal" + left="0" + top="0" + width="1024" + height="500" + follows="all" + mouse_opaque="false"> + <layout_panel name="left_toolbar_panel" + fit_content="true" + auto_resize="false" + user_resize="false" + height="500" + width="30" + mouse_opaque="false"> + <toolbar follows="left|top|bottom" + name="toolbar_left" + height="500" + width="30" + left="0" + top="0" + side="left" + button_display_mode="icons_only"> + <command name="avatar"/> + <command name="build"/> + <command name="chat"/> + </toolbar> + </layout_panel> + <layout_panel name="non_toolbar_panel" + auto_resize="true" + user_resize="false" + mouse_opaque="false"/> + <layout_panel name="right_toolbar_panel" + fit_content="true" + auto_resize="false" + user_resize="false" + height="500" + width="30" + mouse_opaque="false"> + <toolbar + follows="right|top|bottom" + name="toolbar_right" + height="500" + width="30" + left="0" + top="0" + side="right" + button_display_mode="icons_only"> + <command name="avatar"/> + <command name="build"/> + <command name="chat"/> + </toolbar> + </layout_panel> + </layout_stack> + </layout_panel> + <layout_panel name="bottom_toolbar_panel" + fit_content="true" + auto_resize="false" + user_resize="false" + height="30" + width="1024" + mouse_opaque="false"> + <toolbar layout="topleft" + name="toolbar_bottom" + height="30" + width="1024" + left="0" + top="0" + side="bottom" + follows="left|right|bottom" + button_display_mode="icons_with_text" + visible="true"> + <command name="avatar"/> + <command name="build"/> + <command name="chat"/> + </toolbar> + </layout_panel> + </layout_stack> </toolbar_view> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index d4c2bc50ca..feea555fdc 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3668,6 +3668,8 @@ Try enclosing path to the editor with double quotes. <string name="Command_Landmarks_Tooltip"></string> <string name="Command_Map_Label">Map</string> <string name="Command_Map_Tooltip"></string> + <string name="Command_MiniMap_Label">Mini Map</string> + <string name="Command_MiniMap_Tooltip"></string> <string name="Command_Move_Label">Move</string> <string name="Command_Move_Tooltip"></string> <string name="Command_MyLand_Label">My Land</string> diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml index 45210277b2..32bc88cc9a 100644 --- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml +++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml @@ -4,17 +4,20 @@ pad_right="5" pad_top="5" pad_bottom="5" - pad_between="5"> - + pad_between="5" + mouse_opaque="false" + read_only="false"> <button_panel name="button_panel" bg_opaque_image="Rounded_Rect" background_visible="true" background_opaque="true"/> <button_icon_and_text follows="left|top" chrome="true" + image_overlay_alignment="left" use_ellipses="true" auto_resize="true"/> <button_icon follows="left|top" + label="" chrome="true" use_ellipses="true" auto_resize="true"/> |