diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-05-19 15:23:51 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-05-19 15:23:51 +0300 |
| commit | 12d9aef217707ed866c0076107b0b935bd9f7fc7 (patch) | |
| tree | aba21a13977dbe1df1276434020f59ad42fa972d /indra/newview/skins/default | |
| parent | 5d4b48bbb4c20ad4fcbba31d92ebcf23ef5496a6 (diff) | |
EXT-7104 WIP Added "Sidebar" button (disabled until callback is set)
* Added widgets into xml, added setting and listener for context menu
* added menu item to show/hide the button
* button is made as may be hidden on resize
Additional improvements:
* Updated method to process buttons width when it is necessary to show any button via context menu
* Updated LLBottomTray::initButtonsVisibility to not show warning messages if it is impossible to show a button due to bottom tray width on startup.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/403/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_bottomtray.xml | 11 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_bottomtray.xml | 35 |
2 files changed, 46 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_bottomtray.xml b/indra/newview/skins/default/xui/en/menu_bottomtray.xml index 5beafef4e4..ccd5388621 100644 --- a/indra/newview/skins/default/xui/en/menu_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/menu_bottomtray.xml @@ -53,6 +53,17 @@ parameter="ShowSnapshotButton" /> </menu_item_check> <menu_item_check + label="Sidebar button" + layout="topleft" + name="ShowSidebarButton"> + <menu_item_check.on_click + function="ToggleControl" + parameter="ShowSidebarButton" /> + <menu_item_check.on_check + function="CheckControl" + parameter="ShowSidebarButton" /> + </menu_item_check> + <menu_item_check label="Build button" layout="topleft" name="ShowBuildButton"> diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 0840812826..dd813f5813 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -221,6 +221,41 @@ min_height="28" min_width="52" mouse_opaque="false" + name="sidebar_btn_panel" + user_resize="false" + width="83"> +<!--*TODO: Implement toggle of sidebar with buttons +Disabled for now. +--> + <button +enabled="false" + follows="left|right" + height="23" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" + image_selected="PushButton_Selected_Press" + is_toggle="true" + label="Sidebar" + layout="topleft" + left="0" + name="sidebar_btn" + tool_tip="Shows/hides Sidebar" + top="5" + use_ellipses="true" + width="80"> + <init_callback + function="" + parameter="" /> + </button> + </layout_panel> + <layout_panel + auto_resize="false" + follows="left|right" + height="28" + layout="topleft" + min_height="28" + min_width="52" + mouse_opaque="false" name="build_btn_panel" user_resize="false" width="83"> |