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

ContextMenu Support!

Browse Source 
LLContextMenu functionality pulled out of LLPieMenu, PieMenu is now derived from LLContextMenu
- The more attribute boolean of pie_menu element determines whether or not to have an actual submenu if it's not a pie, defaults to false which means actual submenu..
-- in the future we may want to have more more="true" depending on feedback
- Pie menu labels now dynamically get " >" appended to them (avoids stupid looking context menus)
- Positioning logic combined in part, mostly conditional still, in the future we could probably combine it more.
- handleHoverOver function combines common functionality between context and pies given an item and hover mouse coords.

LiruUseContextMenus debug setting determines which to use, default is pie, of course
- Context(/Pie) Menus are rebuilt when the setting changes value
-- this is safe at any point because all startup states have been accounted for
- "Use context menus instead of pie menus" added to System->General preferences (it's close to the bottom)
This commit is contained in:
Inusaito Sayori
2013-11-06 18:47:02 -05:00
parent f41c4dd273
commit 511b0cfb9c
31 changed files with 656 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/skins/default/xui/fr/menu_pie_avatar.xml
View File

@@ -6,7 +6,7 @@
<menu_item_call label="Signaler" name="abuse"/>
<menu_item_call label="Devenir ami(e)s" name="Add Friend"/>
<menu_item_call label="Payer" name="Pay..."/>
<pie_menu label="Plus &gt;" name="More &gt;">
<pie_menu label="Plus" name="More">
<menu_item_call label="Geler" name="Freeze..."/>
<menu_item_call label="Donner une carte" name="Give Card"/>
<menu_item_call label="Inviter dans le groupe" name="Invite..."/>

10
indra/newview/skins/default/xui/fr/menu_pie_object.xml
View File

@@ -24,7 +24,7 @@
<on_click function="PayObject" />
<on_enable function="EnablePayObject" />
</menu_item_call>
<pie_menu label="Plus &gt;" name="More &gt;">
<pie_menu label="Plus" name="More">
<menu_item_call label="Supprimer" name="Delete">
<on_click function="Object.Delete" />
<on_enable function="Object.EnableDelete" />
@@ -37,15 +37,15 @@
<on_click function="Tools.TakeCopy" />
<on_enable function="Tools.EnableTakeCopy" />
</menu_item_call>
<pie_menu label="Attacher le HUD &gt;" name="Object Attach HUD" />
<pie_menu label="Attacher &gt;" name="Object Attach" />
<pie_menu label="Attacher le HUD" name="Object Attach HUD" />
<pie_menu label="Attacher" name="Object Attach" />
<menu_item_call label="Retourner" name="Return...">
<on_click function="Object.Return" />
<on_enable function="Object.EnableReturn" />
</menu_item_call>
<pie_menu label="Plus &gt;" name="Rate Menu">
<pie_menu label="Plus" name="Rate Menu">
<menu_item_separator />
<pie_menu label="Outils &gt;" name="Rate Menu">
<pie_menu label="Outils" name="Rate Menu">
<menu_item_call label="Detruire" name="Destroy">
<on_click function="Object.Destroy" />
<on_enable function="Object.EnableDestroy" />

12
indra/newview/skins/default/xui/fr/menu_pie_self.xml
View File

@@ -6,30 +6,30 @@
<menu_item_call label="Me lever" name="Stand Up" />
<menu_item_call label="Amis" name="Friends..." />
<menu_item_call label="Gestures" name="Gestures..." />
<pie_menu label="Outils &gt;" name="Tools &gt;">
<pie_menu label="Outils" name="Tools">
<menu_item_call label="Animations" name="Anims..."/>
<menu_item_call label="Script Compte" name="ScriptCount"/>
<menu_item_call label="Debug" name="Debug Layers"/>
<menu_item_call label="Copie UUID" name="CopyUUID"/>
</pie_menu>
<pie_menu label="Enlever &gt;" name="Take Off &gt;">
<pie_menu label="Habits &gt;" name="Clothes &gt;">
<pie_menu label="Enlever" name="Take Off">
<pie_menu label="Habits" name="Clothes">
<menu_item_call label="Chemise" name="Shirt" />
<menu_item_call label="Pantalon" name="Pants" />
<menu_item_call label="Chaussures" name="Shoes" />
<menu_item_call label="Chaussettes" name="Socks" />
<menu_item_call label="Veste" name="Jacket" />
<menu_item_call label="Gants" name="Gloves" />
<pie_menu label="Plus &gt;" name="More &gt;">
<pie_menu label="Plus" name="More">
<menu_item_call label="Tee Shirt" name="Self Undershirt" />
<menu_item_call label="Tous les habits" name="All Clothes" />
<menu_item_call label="Culotte" name="Self Underpants" />
</pie_menu>
<menu_item_call label="Jupe" name="Skirt" />
</pie_menu>
<pie_menu label="HUD &gt;" name="Object Detach HUD"/>
<pie_menu label="HUD" name="Object Detach HUD"/>
<menu_item_separator />
<pie_menu label="D&#xE9;tacher &gt;" name="Object Detach"/>
<pie_menu label="D&#xE9;tacher" name="Object Detach"/>
<menu_item_separator />
<menu_item_call label="D&#xE9;tacher Tout" name="Detach All"/>
</pie_menu>