livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHUI-78 WIP Re-combined view and sort menus in the People panel.

Vadim ProductEngine 2012-04-14 02:04:37 +03:00
parent cfb2803f1e
commit 33e78bfe64
8 changed files with 93 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/skins/default/xui/en/menu_people_friends_sort.xml
View File

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<toggleable_menu
name="menu_group_plus"
left="0" bottom="0" visible="false"
mouse_opaque="false">
<menu_item_check
label="Sort by Name"
name="sort_name">
<menu_item_check.on_click
function="People.Friends.ViewSort.Action"
parameter="sort_name" />
<menu_item_check.on_check
function="People.Friends.ViewSort.CheckItem"
parameter="sort_name" />
</menu_item_check>
<menu_item_check
label="Sort by Status"
name="sort_status">
<menu_item_check.on_click
function="People.Friends.ViewSort.Action"
parameter="sort_status" />
<menu_item_check.on_check
function="People.Friends.ViewSort.CheckItem"
parameter="sort_status" />
</menu_item_check>
</toggleable_menu>

21
indra/newview/skins/default/xui/en/menu_people_friends_view.xml
View File

@ -3,6 +3,27 @@
name="menu_group_plus"
left="0" bottom="0" visible="false"
mouse_opaque="false">
<menu_item_check
label="Sort by Name"
name="sort_name">
<menu_item_check.on_click
function="People.Friends.ViewSort.Action"
parameter="sort_name" />
<menu_item_check.on_check
function="People.Friends.ViewSort.CheckItem"
parameter="sort_name" />
</menu_item_check>
<menu_item_check
label="Sort by Status"
name="sort_status">
<menu_item_check.on_click
function="People.Friends.ViewSort.Action"
parameter="sort_status" />
<menu_item_check.on_check
function="People.Friends.ViewSort.CheckItem"
parameter="sort_status" />
</menu_item_check>
<menu_item_separator layout="topleft" />
<menu_item_check name="view_icons" label="View People Icons">
<menu_item_check.on_click
function="People.Friends.ViewSort.Action"

4
indra/newview/skins/default/xui/en/menu_people_groups.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<menu name="menu_group_plus"
<toggleable_menu name="menu_group_plus"
left="0" bottom="0" visible="false"
mouse_opaque="false" opaque="true" color="MenuDefaultBgColor">
<menu_item_call
@ -54,4 +54,4 @@
function="People.Groups.Enable"
parameter="leave" />
</menu_item_call>
</menu>
</toggleable_menu>

36
indra/newview/skins/default/xui/en/menu_people_nearby_sort.xml
View File

@ -1,36 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<toggleable_menu
name="menu_group_plus"
left="0" bottom="0" visible="false"
mouse_opaque="false">
<menu_item_check
label="Sort by Recent Speakers"
name="sort_by_recent_speakers">
<menu_item_check.on_click
function="People.Nearby.ViewSort.Action"
parameter="sort_by_recent_speakers"/>
<menu_item_check.on_check
function="People.Nearby.ViewSort.CheckItem"
parameter="sort_by_recent_speakers"/>
</menu_item_check>
<menu_item_check
label="Sort by Name"
name="sort_name">
<menu_item_check.on_click
function="People.Nearby.ViewSort.Action"
parameter="sort_name"/>
<menu_item_check.on_check
function="People.Nearby.ViewSort.CheckItem"
parameter="sort_name"/>
</menu_item_check>
<menu_item_check
label="Sort by Distance"
name="sort_distance">
<menu_item_check.on_click
function="People.Nearby.ViewSort.Action"
parameter="sort_distance"/>
<menu_item_check.on_check
function="People.Nearby.ViewSort.CheckItem"
parameter="sort_distance"/>
</menu_item_check>
</toggleable_menu>

31
indra/newview/skins/default/xui/en/menu_people_nearby_view.xml
View File

@ -3,6 +3,37 @@
name="menu_group_plus"
left="0" bottom="0" visible="false"
mouse_opaque="false">
<menu_item_check
label="Sort by Recent Speakers"
name="sort_by_recent_speakers">
<menu_item_check.on_click
function="People.Nearby.ViewSort.Action"
parameter="sort_by_recent_speakers"/>
<menu_item_check.on_check
function="People.Nearby.ViewSort.CheckItem"
parameter="sort_by_recent_speakers"/>
</menu_item_check>
<menu_item_check
label="Sort by Name"
name="sort_name">
<menu_item_check.on_click
function="People.Nearby.ViewSort.Action"
parameter="sort_name"/>
<menu_item_check.on_check
function="People.Nearby.ViewSort.CheckItem"
parameter="sort_name"/>
</menu_item_check>
<menu_item_check
label="Sort by Distance"
name="sort_distance">
<menu_item_check.on_click
function="People.Nearby.ViewSort.Action"
parameter="sort_distance"/>
<menu_item_check.on_check
function="People.Nearby.ViewSort.CheckItem"
parameter="sort_distance"/>
</menu_item_check>
<menu_item_separator layout="topleft" />
<menu_item_check name="view_icons" label="View People Icons">
<menu_item_check.on_click
function="People.Nearby.ViewSort.Action"

26
indra/newview/skins/default/xui/en/menu_people_recent_sort.xml
View File

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<toggleable_menu
name="menu_group_plus"
left="0" bottom="0" visible="false"
mouse_opaque="false">
<menu_item_check
label="Sort by Most Recent"
name="sort_most">
<menu_item_check.on_click
function="People.Recent.ViewSort.Action"
parameter="sort_recent" />
<menu_item_check.on_check
function="People.Recent.ViewSort.CheckItem"
parameter="sort_recent" />
</menu_item_check>
<menu_item_check
label="Sort by Name"
name="sort_name">
<menu_item_check.on_click
function="People.Recent.ViewSort.Action"
parameter="sort_name" />
<menu_item_check.on_check
function="People.Recent.ViewSort.CheckItem"
parameter="sort_name" />
</menu_item_check>
</toggleable_menu>

21
indra/newview/skins/default/xui/en/menu_people_recent_view.xml
View File

@ -3,6 +3,27 @@
name="menu_group_plus"
left="0" bottom="0" visible="false"
mouse_opaque="false">
<menu_item_check
label="Sort by Most Recent"
name="sort_most">
<menu_item_check.on_click
function="People.Recent.ViewSort.Action"
parameter="sort_recent" />
<menu_item_check.on_check
function="People.Recent.ViewSort.CheckItem"
parameter="sort_recent" />
</menu_item_check>
<menu_item_check
label="Sort by Name"
name="sort_name">
<menu_item_check.on_click
function="People.Recent.ViewSort.Action"
parameter="sort_name" />
<menu_item_check.on_check
function="People.Recent.ViewSort.CheckItem"
parameter="sort_name" />
</menu_item_check>
<menu_item_separator layout="topleft" />
<menu_item_check name="view_icons" label="View People Icons">
<menu_item_check.on_click
function="People.Recent.ViewSort.Action"

35
indra/newview/skins/default/xui/en/panel_people.xml
View File

@ -114,9 +114,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
image_unselected="Toolbar_Middle_Off"
layout="topleft"
left_pad="7"
menu_filename="menu_people_nearby_view.xml"
menu_filename="menu_people_nearby_gear.xml"
menu_position="bottomleft"
name="nearby_view_btn"
name="nearby_gear_btn"
top="3"
width="31" />
<menu_button
@ -128,9 +128,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
image_unselected="Toolbar_Middle_Off"
layout="topleft"
left_pad="2"
menu_filename="menu_people_nearby_sort.xml"
menu_filename="menu_people_nearby_view.xml"
menu_position="bottomleft"
name="nearby_sort_btn"
name="nearby_view_btn"
top_delta="0"
width="31" />
<button
@ -263,9 +263,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
image_unselected="Toolbar_Middle_Off"
layout="topleft"
left_pad="8"
menu_filename="menu_people_friends_view.xml"
menu_filename="menu_people_friends_gear.xml"
menu_position="bottomleft"
name="friends_view_btn"
name="friends_gear_btn"
top="3"
width="31" />
<menu_button
@ -277,9 +277,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
image_unselected="Toolbar_Middle_Off"
layout="topleft"
left_pad="2"
menu_filename="menu_people_friends_sort.xml"
menu_filename="menu_people_friends_view.xml"
menu_position="bottomleft"
name="friends_sort_btn"
name="friends_view_btn"
top_delta="0"
width="31" />
<button
@ -420,13 +420,12 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
image_unselected="Toolbar_Middle_Off"
layout="topleft"
left_pad="8"
menu_filename="menu_people_groups_view.xml"
menu_filename="menu_people_groups.xml"
menu_position="bottomleft"
name="groups_view_btn"
name="groups_gear_btn"
top="3"
width="31" />
<menu_button
enabled="false"
follows="right"
height="25"
image_hover_unselected="Toolbar_Middle_Over"
@ -435,7 +434,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
image_unselected="Toolbar_Middle_Off"
layout="topleft"
left_pad="2"
name="groups_sort_btn"
menu_filename="menu_people_groups_view.xml"
menu_position="bottomleft"
name="groups_view_btn"
top_delta="0"
width="31" />
<menu_button
@ -449,7 +450,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
left_pad="2"
menu_filename="menu_group_plus.xml"
menu_position="bottomleft"
name="minus_btn"
name="plus_btn"
top_delta="0"
width="31">
<validate_callback
@ -528,9 +529,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
image_unselected="Toolbar_Middle_Off"
layout="topleft"
left_pad="8"
menu_filename="menu_people_recent_view.xml"
menu_filename="menu_people_recent_gear.xml"
menu_position="bottomleft"
name="recent_view_btn"
name="recent_gear_btn"
top="3"
width="31" />
<menu_button
@ -542,9 +543,9 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
image_unselected="Toolbar_Middle_Off"
layout="topleft"
left_pad="2"
menu_filename="menu_people_recent_sort.xml"
menu_filename="menu_people_recent_view.xml"
menu_position="bottomleft"
name="recent_sort_btn"
name="recent_view_btn"
top_delta="0"
width="31" />
<button