Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Floater Flexibility] Part two: Move floater dictionary into menu commands and use a common function to ShowFloaters between LLToolBar and menus.

Browse Source
This commit is contained in:
Inusaito Sayori
2014-03-27 00:31:32 -04:00
parent 361b8852df
commit a6559b1e51
16 changed files with 377 additions and 730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/skins/default/xui/en-us/menu_viewer.xml
View File

@@ -134,7 +134,7 @@
mouse_opaque="true" name="separator2" width="153" />
<menu_item_call bottom="-159" enabled="true" height="19" label="Search..." left="0"
mouse_opaque="true" name="Search..." shortcut="control|F" width="153">
<on_click function="Edit.Search" userdata="" />
<on_click function="ShowFloater" userdata="search"/>
</menu_item_call>
<menu_item_separator bottom="-167" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator3" width="153" />
@@ -285,12 +285,12 @@
mouse_opaque="true" name="~~~~~~~~~~~" width="211" />
<menu_item_call bottom="-29" enabled="true" height="19" label="Mouselook" left="0"
mouse_opaque="true" name="Mouselook" shortcut="M" width="211">
<on_click function="View.Mouselook" userdata="" />
<on_click function="ShowFloater" userdata="mouselook"/>
<on_enable function="View.EnableMouselook" />
</menu_item_call>
<menu_item_check bottom="-48" enabled="true" height="19" label="Build" left="0"
mouse_opaque="true" name="Build" shortcut="B" width="211">
<on_click function="View.BuildMode" userdata="" />
<on_click function="ShowFloater" userdata="build" />
<on_check function="View.CheckBuildMode" />
</menu_item_check>
<menu_item_check bottom="-48" enabled="true" height="19" label="Joystick Flycam" left="0"
@@ -495,12 +495,12 @@
opaque="true" tear_off="true" width="185">
<menu_item_call bottom="-29" enabled="true" height="19" label="Chat" left="0"
mouse_opaque="true" name="Chat" shortcut="" width="185">
<on_click function="World.Chat" userdata="" />
<on_click function="FloaterShow" userdata="chatbar" />
</menu_item_call>
<menu_item_check bottom="-67" enabled="true" height="19" label="Always Run" left="0"
mouse_opaque="true" name="Always Run" shortcut="control|R" width="185">
<on_click function="World.AlwaysRun" userdata="" />
<on_check function="World.CheckAlwaysRun" userdata="" />
<on_click function="ShowFloater" userdata="always run" />
<on_check function="FloaterVisible" userdata="always run" />
</menu_item_check>
<menu_item_call bottom="-67" enabled="true" height="19" label="Sit on Ground" left="0"
mouse_opaque="true" name="Sit on Ground" shortcut="control|alt|S" width="185">
@@ -509,7 +509,7 @@
</menu_item_call>
<menu_item_check bottom="-86" enabled="true" height="19" label="Fly" left="0"
mouse_opaque="true" name="Fly" shortcut="Home" width="185">
<on_click function="World.Fly" userdata="" />
<on_click function="ShowFloater" userdata="fly"/>
<on_enable function="World.EnableFly" />
<on_check control="FlyBtnState" />
</menu_item_check>
@@ -917,8 +917,7 @@
<on_click function="PromptShowURL" name="ScriptingPortal_url"
userdata="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal" />
</menu_item_call>
<menu_item_separator bottom="-148" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator3" width="166" />
<menu_item_separator name="separator3"/>
<menu_item_call bottom="-194" enabled="true" height="19" label="Report Abuse..." left="0"
mouse_opaque="true" name="Report Abuse..." width="166">
<on_click function="ShowFloater" userdata="complaint reporter" />
@@ -931,8 +930,7 @@
<menu_item_call label="Lag Meter" name="Lag Meter">
<on_click function="ShowFloater" userdata="lag meter" />
</menu_item_call>
<menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator7" width="250" />
<menu_item_separator name="separator7"/>
<menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
height="109" label="Bug Reporting" left="0" mouse_opaque="false"
name="Bug Reporting" opaque="true" tear_off="true" width="118">
@@ -951,8 +949,7 @@
<on_click function="PromptShowURL" name="SinguIssueTracker_url"
userdata="WebLaunchSinguIssue,http://links.singularityviewer.org/?to=issues" />
</menu_item_call>
<menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator7" width="250" />
<menu_item_separator name="separator7" />
<menu_item_call bottom="-94" enabled="true" height="19" label="Bug Reporting 101..." left="0"
mouse_opaque="true" name="Bug Reporting 101..." width="166">
<on_click function="PromptShowURL" name="BugReporting101_url"
@@ -968,8 +965,7 @@
<on_click function="PromptShowURL" name="QAWiki_url"
userdata="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" />
</menu_item_call>
<menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator9" width="250" />
<menu_item_separator name="separator9"/>
<menu_item_call bottom="-240" enabled="true" height="19" label="Report Bug..." left="0"
mouse_opaque="true" name="Report Bug..." width="166">
<on_click function="PromptShowURL" name="ReportBug_url"

88
indra/newview/skins/default/xui/en-us/panel_toolbar.xml
View File

@@ -9,40 +9,58 @@
<icon image_name="spacer24.tga" width="2" height="2" follows="left|right" color="0,0,0,0" left="0" />
</layout_panel>
<layout_panel name="panel2" height="24" width="50" auto_resize="false" user_resize="false">
<button bottom="0" height="24" image_selected="btn_chatbar_selected.tga" scale_image="true" image_unselected="btn_chatbar.tga" label="" left="2" name="chat_btn" image_overlay="icn_chatbar.tga" tool_tip="Show Chat Bar. (Enter)" width="50" follows="left|right" />
</layout_panel>
<layout_panel name="panel3" height="2" width="2" auto_resize="false" user_resize="false">
<icon image_name="spacer24.tga" width="2" height="2" follows="left|right" color="0,0,0,0"/>
</layout_panel>
<layout_panel name="panel4" height="24" width="50" user_resize="false">
<flyout_button bottom="0" font="SansSerif" height="24" label="Communicate" left="0" name="communicate_btn" tool_tip="Communicate with your Friends and Groups.(Ctrl-T)" list_position="above" width="50" follows="left|right"/>
</layout_panel>
<layout_panel name="panel5" height="2" width="2" auto_resize="false" user_resize="false">
<icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
</layout_panel>
<layout_panel name="panel6" height="24" width="50" user_resize="false">
<button bottom="0" height="24" label="Radar" image_overlay="icn_toolbar_radar.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" label_selected="Radar" name="radar_list_btn" tool_tip="View a list of nearby avatars.(Ctrl-Shift-A)" width="50" follows="left|right"/>
</layout_panel>
<layout_panel name="panel7" height="24" width="50" user_resize="false">
<button bottom="0" height="24" label="Fly" image_overlay="icn_toolbar_fly.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" label_selected="Stop Flying" name="fly_btn" tool_tip="Start flying(F or Home). Use E/C or PgUp/PgDn to fly up and down." width="50" follows="left|right"/>
</layout_panel>
<layout_panel name="panel8" height="24" width="50" user_resize="false">
<button bottom="0" height="24" label="Snapshot" image_overlay="icn_toolbar_snapshot.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="snapshot_btn" tool_tip="Save a screen shot to disk or inventory.(Ctrl-Shift-S for floater, Ctrl-`(~) takes snapshot w/o floater)" width="50" follows="left|right"/>
</layout_panel>
<layout_panel name="panel9" height="24" width="50" user_resize="false">
<button bottom="0" height="24" label="Search" image_overlay="icn_toolbar_search.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="directory_btn" tool_tip="Search for places, events, people, and more.(Ctrl-F)" width="50" follows="left|right"/>
</layout_panel>
<layout_panel name="panel10" height="24" width="50" user_resize="false">
<button bottom="0" height="24" label="Build" name="build_btn" image_overlay="icn_toolbar_build.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" tool_tip="Create new objects. (B)" width="50" follows="left|right"/>
</layout_panel>
<layout_panel name="panel11" height="24" width="50" user_resize="false">
<button bottom="0" height="24" label="Map" name="map_btn" image_overlay="icn_toolbar_map.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" tool_tip="Map of the world. (Ctrl-M)" width="50" follows="left|right"/>
</layout_panel>
<layout_panel name="panel12" height="24" width="50" user_resize="false">
<button bottom="0" height="24" label="Mini-Map" image_overlay="icn_toolbar_minimap.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="radar_btn" tool_tip="Map of the area around you. (Ctrl-Shift-M)" width="50" follows="left|right"/>
</layout_panel>
<layout_panel name="panel13" height="24" width="50" user_resize="false">
<button bottom="0" height="24" label="Inventory" image_overlay="icn_toolbar_inventory.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="inventory_btn" tool_tip="Your items. (Ctrl-I)" width="50" follows="left|right"/>
</layout_panel>
<button bottom="0" height="24" image_selected="btn_chatbar_selected.tga" scale_image="true" image_unselected="btn_chatbar.tga" label="" left="2" name="chat_btn" image_overlay="icn_chatbar.tga" tool_tip="Show Chat Bar. (Enter)" width="50" follows="left|right" control_name="ChatVisible">
<button.commit_callback function="ShowFloater" parameter="chatbar"/>
</button>
</layout_panel>
<layout_panel name="panel3" height="2" width="2" auto_resize="false" user_resize="false">
<icon image_name="spacer24.tga" width="2" height="2" follows="left|right" color="0,0,0,0"/>
</layout_panel>
<layout_panel name="panel4" height="24" width="50" user_resize="false">
<flyout_button bottom="0" font="SansSerif" height="24" label="Communicate" left="0" name="communicate_btn" tool_tip="Communicate with your Friends and Groups.(Ctrl-T)" list_position="above" width="50" follows="left|right"/>
</layout_panel>
<layout_panel name="panel5" height="2" width="2" auto_resize="false" user_resize="false">
<icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
</layout_panel>
<layout_panel name="panel6" height="24" width="50" user_resize="false">
<button bottom="0" height="24" label="Radar" image_overlay="icn_toolbar_radar.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" label_selected="Radar" name="radar_list_btn" tool_tip="View a list of nearby avatars.(Ctrl-Shift-A)" width="50" follows="left|right" control_name="ShowRadar">
<button.commit_callback function="ShowFloater" parameter="radar"/>
</button>
</layout_panel>
<layout_panel name="panel7" height="24" width="50" user_resize="false">
<button bottom="0" height="24" label="Fly" image_overlay="icn_toolbar_fly.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" label_selected="Stop Flying" name="fly_btn" tool_tip="Start flying(F or Home). Use E/C or PgUp/PgDn to fly up and down." width="50" follows="left|right" control_name="FlyBtnState">
<button.commit_callback function="ShowFloater" parameter="fly"/>
</button>
</layout_panel>
<layout_panel name="panel8" height="24" width="50" user_resize="false">
<button bottom="0" height="24" label="Snapshot" image_overlay="icn_toolbar_snapshot.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="snapshot_btn" tool_tip="Save a screen shot to disk or inventory.(Ctrl-Shift-S for floater, Ctrl-`(~) takes snapshot w/o floater)" width="50" follows="left|right" control_name="SnapshotBtnState">
<button.commit_callback function="ShowFloater" parameter="snapshot"/>
</button>
</layout_panel>
<layout_panel name="panel9" height="24" width="50" user_resize="false">
<button bottom="0" height="24" label="Search" image_overlay="icn_toolbar_search.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="directory_btn" tool_tip="Search for places, events, people, and more.(Ctrl-F)" width="50" follows="left|right" control_name="ShowDirectory">
<button.commit_callback function="ShowFloater" parameter="search"/>
</button>
</layout_panel>
<layout_panel name="panel10" height="24" width="50" user_resize="false">
<button bottom="0" height="24" label="Build" name="build_btn" image_overlay="icn_toolbar_build.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" tool_tip="Create new objects. (B)" width="50" follows="left|right" control_name="BuildBtnState">
<button.commit_callback function="ShowFloater" parameter="build"/>
</button>
</layout_panel>
<layout_panel name="panel11" height="24" width="50" user_resize="false">
<button bottom="0" height="24" label="Map" name="map_btn" image_overlay="icn_toolbar_map.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" tool_tip="Map of the world. (Ctrl-M)" width="50" follows="left|right" control_name="ShowWorldMap">
<button.commit_callback function="ShowFloater" parameter="world map"/>
</button>
</layout_panel>
<layout_panel name="panel12" height="24" width="50" user_resize="false">
<button bottom="0" height="24" label="Mini-Map" image_overlay="icn_toolbar_minimap.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="radar_btn" tool_tip="Map of the area around you. (Ctrl-Shift-M)" width="50" follows="left|right" control_name="ShowMiniMap">
<button.commit_callback function="ShowFloater" parameter="mini map"/>
</button>
</layout_panel>
<layout_panel name="panel13" height="24" width="50" user_resize="false">
<button bottom="0" height="24" label="Inventory" image_overlay="icn_toolbar_inventory.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="inventory_btn" tool_tip="Your items. (Ctrl-I)" width="50" follows="left|right" control_name="ShowInventory">
<button.commit_callback function="ShowFloater" parameter="inventory"/>
</button>
</layout_panel>
</layout_stack>
</panel>