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

Add the Avatar submenu to the agent menus and create parity between them

Browse Source 
A little mouse hover to open a submenu is better than an unwieldy menu
Moves Focus into the avatar section
This commit is contained in:
Liru Færs
2019-08-30 15:39:23 -04:00
parent 4b97f76aa7
commit 293820747f
4 changed files with 117 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
indra/newview/skins/default/xui/en-us/menu_avs_list.xml
View File

@@ -4,81 +4,83 @@
<on_click function="List.ShowProfile"/> <on_click function="List.ShowProfile"/>
<on_enable function="List.EnableAnySelected"/> <on_enable function="List.EnableAnySelected"/>
</menu_item_call> </menu_item_call>
<menu_item_call label="Web Profile" name="Web Profile"> <menu label="Avatar" name="Avatar" create_jump_keys="true">
<on_click function="List.ShowWebProfile"/> <menu_item_call label="Web Profile" name="Web Profile">
<on_visible function="List.VisibleWebProfile"/> <on_click function="List.ShowWebProfile"/>
</menu_item_call> <on_visible function="List.VisibleWebProfile"/>
<menu_item_call label="Pay" name="Pay"> </menu_item_call>
<on_click function="List.Pay"/> <menu_item_call label="Pay" name="Pay">
<on_enable function="List.EnableSingleSelected"/> <on_click function="List.Pay"/>
</menu_item_call> <on_enable function="List.EnableSingleSelected"/>
<menu_item_call label="Instant Message" name="Instant Message"> </menu_item_call>
<on_click function="List.StartIM"/> <menu_item_call label="Instant Message" name="Instant Message">
<on_visible function="List.EnableSingleSelected"/> <on_click function="List.StartIM"/>
</menu_item_call> <on_visible function="List.EnableSingleSelected"/>
<menu_item_call label="Conference Chat" name="Conference Chat"> </menu_item_call>
<on_click function="List.StartConference"/> <menu_item_call label="Conference Chat" name="Conference Chat">
<on_visible function="List.EnableMultipleSelected"/> <on_click function="List.StartConference"/>
</menu_item_call> <on_visible function="List.EnableMultipleSelected"/>
<menu_item_call label="Call" name="Call"> </menu_item_call>
<on_click function="List.StartCall"/> <menu_item_call label="Call" name="Call">
<on_enable function="List.EnableCall"/> <on_click function="List.StartCall"/>
<on_visible function="List.EnableSingleSelected"/> <on_enable function="List.EnableCall"/>
</menu_item_call> <on_visible function="List.EnableSingleSelected"/>
<menu_item_call label="Conference Call" name="Conference Call"> </menu_item_call>
<on_click function="List.StartAdhocCall"/> <menu_item_call label="Conference Call" name="Conference Call">
<on_enable function="List.EnableCall"/> <on_click function="List.StartAdhocCall"/>
<on_visible function="List.EnableMultipleSelected"/> <on_enable function="List.EnableCall"/>
</menu_item_call> <on_visible function="List.EnableMultipleSelected"/>
<menu_item_call label="Add Friend" name="Add Friend"> </menu_item_call>
<on_click function="List.RequestFriendship"/> <menu_item_call label="Add Friend" name="Add Friend">
<on_enable function="List.EnableSingleSelected"/> <on_click function="List.RequestFriendship"/>
<on_visible function="List.EnableIsNotFriend"/> <on_enable function="List.EnableSingleSelected"/>
</menu_item_call> <on_visible function="List.EnableIsNotFriend"/>
<menu_item_call label="Remove Friend" name="Remove Friend"> </menu_item_call>
<on_click function="List.RemoveFriend"/> <menu_item_call label="Remove Friend" name="Remove Friend">
<on_enable function="List.EnableSingleSelected"/> <on_click function="List.RemoveFriend"/>
<on_visible function="List.EnableIsFriend"/> <on_enable function="List.EnableSingleSelected"/>
</menu_item_call> <on_visible function="List.EnableIsFriend"/>
<menu_item_call label="Invite To Group" name="Invite To Group"> </menu_item_call>
<on_click function="List.InviteToGroup"/> <menu_item_call label="Invite To Group" name="Invite To Group">
<on_visible function="List.EnableAnySelected"/> <on_click function="List.InviteToGroup"/>
</menu_item_call> <on_visible function="List.EnableAnySelected"/>
<menu_item_call label="Offer Teleport" name="Offer Teleport"> </menu_item_call>
<on_click function="List.OfferTeleport"/> <menu_item_call label="Offer Teleport" name="Offer Teleport">
<on_enable function="List.EnableAnySelected"/> <on_click function="List.OfferTeleport"/>
</menu_item_call> <on_enable function="List.EnableAnySelected"/>
<menu_item_call label="Teleport To" name="Teleport To"> </menu_item_call>
<on_click function="Radar.TeleportTo"/> <menu_item_call label="Teleport To" name="Teleport To">
<on_enable function="List.EnableSingleSelected"/> <on_click function="Radar.TeleportTo"/>
<on_visible function="List.IsNearby"/> <on_enable function="List.EnableSingleSelected"/>
</menu_item_call> <on_visible function="List.IsNearby"/>
<menu_item_call label="Request Teleport" name="Request Teleport"> </menu_item_call>
<on_click function="List.RequestTeleport"/> <menu_item_call label="Request Teleport" name="Request Teleport">
<on_visible function="List.EnableSingleSelected"/> <on_click function="List.RequestTeleport"/>
</menu_item_call> <on_visible function="List.EnableSingleSelected"/>
<menu_item_call label="Share" name="Share"> </menu_item_call>
<on_click function="List.Share"/> <menu_item_call label="Share" name="Share">
<on_visible function="List.EnableSingleSelected"/> <on_click function="List.Share"/>
</menu_item_call> <on_visible function="List.EnableSingleSelected"/>
<menu_item_call label="Chat History" name="Chat History"> </menu_item_call>
<on_click function="List.ShowLog"/> <menu_item_call label="Chat History" name="Chat History">
<on_enable function="List.EnableAnySelected"/> <on_click function="List.ShowLog"/>
</menu_item_call> <on_enable function="List.EnableAnySelected"/>
<menu_item_call label="Track/Untrack" name="Track/Untrack"> </menu_item_call>
<on_click function="List.Track"/> <menu_item_call label="Track/Untrack" name="Track/Untrack">
<on_enable function="List.EnableSingleSelected"/> <on_click function="List.Track"/>
<on_visible function="List.IsNearby"/> <on_enable function="List.EnableSingleSelected"/>
</menu_item_call> <on_visible function="List.IsNearby"/>
<menu_item_separator/> </menu_item_call>
<menu_item_call label="Copy Key" name="Copy Key"> <menu_item_separator/>
<on_click function="List.CopyUUIDs"/> <menu_item_call label="Copy Key" name="Copy Key">
<on_enable function="List.EnableAnySelected"/> <on_click function="List.CopyUUIDs"/>
</menu_item_call> <on_enable function="List.EnableAnySelected"/>
<menu_item_call label="Copy SLURL" name="Copy SLURL"> </menu_item_call>
<on_click function="List.CopySLURL"/> <menu_item_call label="Copy SLURL" name="Copy SLURL">
<on_visible function="List.EnableSingleSelected"/> <on_click function="List.CopySLURL"/>
</menu_item_call> <on_visible function="List.EnableSingleSelected"/>
</menu_item_call>
</menu>
<menu_item_call label="Focus" name="Focus"> <menu_item_call label="Focus" name="Focus">
<on_click function="Radar.Focus"/> <on_click function="Radar.Focus"/>
<on_enable function="List.EnableSingleSelected"/> <on_enable function="List.EnableSingleSelected"/>

9
indra/newview/skins/default/xui/en-us/menu_local_avs.xml
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<menu name="Local Avs Menu" create_jump_keys="true"> <menu name="Local Avs Menu" create_jump_keys="true">
<menu_item_call label="Profile" name="Profile">
<on_click function="List.ShowProfile"/>
<on_enable function="List.EnableAnySelected"/>
</menu_item_call>
<menu label="Avatar" name="Avatar" create_jump_keys="true"> <menu label="Avatar" name="Avatar" create_jump_keys="true">
<menu_item_call label="Profile" name="Profile">
<on_click function="List.ShowProfile"/>
<on_enable function="List.EnableAnySelected"/>
</menu_item_call>
<menu_item_call label="Web Profile" name="Web Profile"> <menu_item_call label="Web Profile" name="Web Profile">
<on_click function="List.ShowWebProfile"/> <on_click function="List.ShowWebProfile"/>
<on_visible function="List.VisibleWebProfile"/> <on_visible function="List.VisibleWebProfile"/>
@@ -69,6 +69,7 @@
<on_click function="List.Track"/> <on_click function="List.Track"/>
<on_enable function="List.EnableSingleSelected"/> <on_enable function="List.EnableSingleSelected"/>
</menu_item_call> </menu_item_call>
<menu_item_separator/>
<menu_item_call label="Copy Key" name="Copy Key"> <menu_item_call label="Copy Key" name="Copy Key">
<on_click function="List.CopyUUIDs"/> <on_click function="List.CopyUUIDs"/>
<on_enable function="List.EnableAnySelected"/> <on_enable function="List.EnableAnySelected"/>

56
indra/newview/skins/default/xui/en-us/menu_url_agent.xml
View File

@@ -3,13 +3,14 @@
layout="topleft" layout="topleft"
label="User" label="User"
name="Url Popup"> name="Url Popup">
<menu_item_call <menu_item_call
label="View Profile" label="Profile"
layout="topleft" layout="topleft"
name="show_agent"> name="show_agent">
<menu_item_call.on_click <menu_item_call.on_click
function="Text.Url" userdata="ShowProfile" /> function="Text.Url" userdata="ShowProfile" />
</menu_item_call> </menu_item_call>
<menu name="Avatar" label="Avatar">
<menu_item_call label="Web Profile" name="Web Profile"> <menu_item_call label="Web Profile" name="Web Profile">
<on_click function="Text.Url.Ext" userdata="ShowWebProfile"/> <on_click function="Text.Url.Ext" userdata="ShowWebProfile"/>
<on_visible function="Text.Url.ExtVisible" userdata="ShowWebProfile"/> <on_visible function="Text.Url.ExtVisible" userdata="ShowWebProfile"/>
@@ -71,32 +72,33 @@
<on_click function="Text.Url.Ext" userdata="Track"/> <on_click function="Text.Url.Ext" userdata="Track"/>
<on_visible function="Text.Url.ExtVisible" userdata="Track"/> <on_visible function="Text.Url.ExtVisible" userdata="Track"/>
</menu_item_call> </menu_item_call>
<menu_item_separator <menu_item_call label="Focus" name="Focus">
layout="topleft" /> <on_click function="Text.Url.Ext" userdata="Focus"/>
<menu_item_call <on_visible function="Text.Url.ExtVisible" userdata="Focus"/>
label="Copy Name to clipboard" </menu_item_call>
layout="topleft" </menu>
name="url_copy_label"> <menu_item_separator
<menu_item_call.on_click layout="topleft" />
function="Text.Url" userdata="CopyLabel" /> <menu_item_call
</menu_item_call> label="Copy Name to clipboard"
<menu_item_call layout="topleft"
label="Copy SLURL to clipboard" name="url_copy_label">
layout="topleft" <menu_item_call.on_click
name="url_copy"> function="Text.Url" userdata="CopyLabel" />
<menu_item_call.on_click </menu_item_call>
function="Text.Url" userdata="CopyUrl" /> <menu_item_call
</menu_item_call> label="Copy SLURL to clipboard"
layout="topleft"
name="url_copy">
<menu_item_call.on_click
function="Text.Url" userdata="CopyUrl" />
</menu_item_call>
<menu_item_call label="Copy Key to clipboard" name="key_copy"> <menu_item_call label="Copy Key to clipboard" name="key_copy">
<menu_item_call.on_click function="Text.Url.CopyUUID" /> <menu_item_call.on_click function="Text.Url.CopyUUID" />
</menu_item_call> </menu_item_call>
<menu_item_call label="Select All" name="Select All"> <menu_item_call label="Select All" name="Select All">
<on_click function="Text" userdata="SelectAll"/> <on_click function="Text" userdata="SelectAll"/>
</menu_item_call> </menu_item_call>
<menu_item_call label="Focus" name="Focus">
<on_click function="Text.Url.Ext" userdata="Focus"/>
<on_visible function="Text.Url.ExtVisible" userdata="Focus"/>
</menu_item_call>
<menu label="Moderation" name="Moderation" create_jump_keys="true"> <menu label="Moderation" name="Moderation" create_jump_keys="true">
<menu_item_call label="Mute" name="Mute"> <menu_item_call label="Mute" name="Mute">
<on_click function="Text.Url.Ext" userdata="Mute"/> <on_click function="Text.Url.Ext" userdata="Mute"/>

8
indra/newview/skins/default/xui/en-us/menu_url_agent_mini.xml
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu <context_menu
layout="topleft" layout="topleft"
label="User" label="User"
name="Url Mini Popup"> name="Url Mini Popup">
<menu_item_call <menu_item_call
label="View Profile" label="Profile"
layout="topleft" layout="topleft"
name="show_agent"> name="show_agent">
<menu_item_call.on_click <menu_item_call.on_click