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

[Floater Flexibility] Part one: Refactor all floaters to work with the dictionary in one way or another.

Browse Source
This commit is contained in:
Inusaito Sayori
2014-03-25 00:23:56 -04:00
parent ee610ceb3f
commit f37d83abe1
22 changed files with 219 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
View File

@@ -55,7 +55,7 @@
</menu_item_call>
</pie_menu>
<menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
<on_click function="Object.Inspect" />
<on_click function="ShowFloater" userdata="inspect" />
<on_enable function="Object.EnableInspect"/>
</menu_item_call>
<menu_item_call enabled="false" label="Data" mouse_opaque="true" name="Data">

2
indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
View File

@@ -56,7 +56,7 @@
</menu_item_call>
<menu_item_separator />
<menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
<on_click function="Object.Inspect" />
<on_click function="ShowFloater" userdata="inspect" />
<on_enable function="Object.EnableInspect" />
</menu_item_call>
</pie_menu>

2
indra/newview/skins/default/xui/en-us/menu_pie_object.xml
View File

@@ -81,7 +81,7 @@
<on_enable function="Object.EnableMute" />
</menu_item_call>
<menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
<on_click function="Object.Inspect" />
<on_click function="ShowFloater" userdata="inspect" />
<on_enable function="Object.EnableInspect" />
</menu_item_call>
<menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender">

4
indra/newview/skins/default/xui/en-us/menu_pie_self.xml
View File

@@ -4,7 +4,7 @@
<on_click function="ShowAgentProfile" userdata="agent" />
</menu_item_call>
<menu_item_call enabled="true" label="Groups..." name="Groups...">
<on_click function="ShowAgentGroups" userdata="agent" />
<on_click function="ShowFloater" userdata="groups" />
</menu_item_call>
<pie_menu enabled="true" label="Take Off" name="Take Off">
<pie_menu enabled="true" label="Clothes" name="Clothes">
@@ -91,7 +91,7 @@
</menu_item_call>
<menu_item_call enabled="true" hidden="false" label="Anims..." mouse_opaque="true"
name="Anims...">
<on_click function="Avatar.Anims" />
<on_click function="ShowFloater" userdata="anims_explorer" />
</menu_item_call>
<menu_item_call enabled="false" hidden="false" label="S. Count" mouse_opaque="true" name="ScriptCount">
<on_click function="Object.ScriptCount" />

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

@@ -38,7 +38,7 @@
<on_enable function="Object.EnableImport" />
</menu_item_call>
<menu_item_call label="Change Local Textures" mouse_opaque="true" name="Change Local Textures">
<on_click function="File.LocalAssetBrowser"/>
<on_click function="ShowFloater" userdata="local assets"/>
</menu_item_call>
<menu_item_separator enabled="true" label="-----------" mouse_opaque="true" name="separator" />
<menu_item_call enabled="true" label="Set Default Permissions..."
@@ -77,7 +77,7 @@
<menu_item_call bottom="-167" enabled="true" height="19" label="Take Snapshot" left="0"
mouse_opaque="true" name="Take Snapshot" shortcut="control|shift|S"
width="243">
<on_click function="File.TakeSnapshot" userdata="" />
<on_click function="ShowFloater" userdata="snapshot"/>
</menu_item_call>
<menu_item_call bottom="-186" enabled="true" height="19" label="Snapshot to Disk" left="0"
mouse_opaque="true" name="Snapshot to Disk" shortcut="control|`"
@@ -269,7 +269,7 @@
</menu_item_check>
<menu_item_call bottom="-408" enabled="true" height="19" label="Groups..." left="0"
mouse_opaque="true" name="Groups..." shortcut="control|shift|G" width="153">
<on_click function="ShowAgentGroups" userdata="agent" />
<on_click function="ShowFloater" userdata="groups" />
</menu_item_call>
<menu_item_separator bottom="-416" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator8" width="153" />
@@ -331,8 +331,8 @@
</menu_item_check>
<menu_item_check bottom="-151" enabled="true" height="19" label="Communicate" left="0"
mouse_opaque="true" name="Instant Message" shortcut="control|T" width="211">
<on_click function="View.Communicate"/>
<on_check function="FloaterVisible" userdata="communicate" />
<on_click function="ShowFloater" userdata="im"/>
<on_check function="FloaterVisible" userdata="im"/>
</menu_item_check>
<menu_item_check bottom="-170" enabled="true" height="19" label="Inventory" left="0"
mouse_opaque="true" name="Inventory" shortcut="control|I" width="211">
@@ -383,7 +383,7 @@
</menu_item_check>
<menu_item_check bottom="-273" enabled="true" height="19" label="Radar" left="0"
mouse_opaque="true" name="Radar" shortcut="control|shift|A" width="211">
<on_click function="View.ToggleAvatarList" userdata="radar" />
<on_click function="ShowFloater" userdata="radar" />
<on_check control="ShowRadar" />
</menu_item_check>
<menu_item_separator bottom="-281" enabled="true" height="8" label="-----------" left="0"
@@ -635,15 +635,15 @@
mouse_opaque="true" name="separator" width="169" />
<menu_item_call bottom="-132" enabled="false" height="19" label="Environment Editor" left="0"
mouse_opaque="true" name="Environment Editor" width="169">
<on_click function="World.EnvSettings" userdata="editor" />
<on_click function="ShowFloater" userdata="EnvSettings" />
</menu_item_call>
<menu_item_call bottom="-151" enabled="false" height="19" label="Day Cycle Editor" left="0"
mouse_opaque="true" name="Day Cycle Editor" width="169">
<on_click function="World.DayCycle" userdata="editor" />
<on_click function="ShowFloater" userdata="DayCycle" />
</menu_item_call>
<menu_item_call bottom="-173" enabled="false" height="19" label="Post-Processing Effects" left="0"
mouse_opaque="true" name="Post-Processing Effects" width="169">
<on_click function="World.PostProcess" userdata="editor" />
<on_click function="ShowFloater" userdata="PostProcess" />
</menu_item_call>
</menu>
</menu>
@@ -1002,7 +1002,7 @@
</menu_item_call>
<menu_item_separator mouse_opaque="true" name="separators2"/>
<menu_item_call label="Animation Override..." mouse_opaque="true" name="Animation Override ...">
<on_click function="AnimationOverride"/>
<on_click function="ShowFloater" userdata="ao"/>
</menu_item_call>
<menu_item_check label="Nimble" mouse_opaque="true" name="Nimble">
<on_click function="Nimble"/>
@@ -1022,8 +1022,8 @@
<on_check function="FloaterVisible" userdata="asset_blacklist"/>
</menu_item_check>
<menu_item_check label="Streaming Audio Display" mouse_opaque="true" name="Streaming Audio Display">
<on_click function="StreamingAudioDisplay"/>
<on_check function="CheckStreamingAudioDisplay"/>
<on_click function="ShowFloater" userdata="media ticker"/>
<on_check function="FloaterVisible" userdata="media ticker"/>
<on_enable function="EnableStreamingAudioDisplay"/>
</menu_item_check>
<menu_item_check label="Pose Stand" mouse_opaque="true" name="Pose Stand">
@@ -1031,8 +1031,8 @@
<on_check function="CheckPoseStand"/>
</menu_item_check>
<menu_item_check label="Region Debug Console" mouse_opaque="true" name="Region Debug Console">
<on_click function="RegionDebugConsole"/>
<on_check function="CheckRegionDebugConsole"/>
<on_click function="ShowFloater" userdata="RegionDebugConsole"/>
<on_check function="FloaterVisible" userdata="RegionDebugConsole"/>
<on_visible function="VisibleRegionDebugConsole"/>
</menu_item_check>
<menu_item_separator mouse_opaque="true" name="separators3" />