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

Fix for tabbing order on Friends list, new features were confusing or changing the expected usage by regular users

Browse Source 
Cleaned up the source file as well.

Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-09-14 22:38:02 -04:00
parent 6c78cca90b
commit e703ee3152
3 changed files with 56 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
indra/newview/ascentfloatercontactgroups.cpp
View File

@@ -11,29 +11,6 @@
*/ */
/*
__---__
_- _--______
__--( / \ )XXXXXXXXXXXXX_
--XXX( O O )XXXXXXXXXXXXXXX-
/XXX( U ) XXXXXXX\
/XXXXX( )--_ XXXXXXXXXXX\
/XXXXX/ ( O ) XXXXXX \XXXXX\
XXXXX/ / XXXXXX \__ \XXXXX----
XXXXXX__/ XXXXXX \__---- -
---___ XXX__/ XXXXXX \__ ---
-- --__/ ___/\ XXXXXX / ___---=
-_ ___/ XXXXXX '--- XXXXXX
--\/XXX\ XXXXXX /XXXXX
\XXXXXXXXX /XXXXX/
\XXXXXX _/XXXXX/
\XXXXX--__/ __-- XXXX/
--XXXXXXX--------------- XXXXX--
\XXXXXXXXXXXXXXXXXXXXXXXX-
--XXXXXXXXXXXXXXXXXX-
CODE GHOSTS OFFICIALLY BUSTED
*/
#include "llviewerprecompiledheaders.h" #include "llviewerprecompiledheaders.h"
#include "ascentfloatercontactgroups.h" #include "ascentfloatercontactgroups.h"
@@ -293,107 +270,4 @@ void ASFloaterContactGroups::populateGroupList()
LLChat msg("Null Scroller"); LLChat msg("Null Scroller");
LLFloaterChat::addChat(msg); LLFloaterChat::addChat(msg);
} }
} }
/*
* BATGIRL
*
*
* .//////..... I: .
* .////....///////........IA...... //
* XYt///////./.....////......$$$$$$$$$$$./I$
* .Y/XX//?//./....////////......$$$$$$$$$$$$$$/
* XYXXXXXXX///......//////.....$$$$$$$$$$$$$$$.
* XXXXXXXX////XX/....//.///./..$$$$$$$$$$$$$$$....
* ///////......////X...//.//./$$$$$$$$$$$$$$$...../..
* ////..////////..../X/X//////$$$-.$$$$$$$$$$./...///..
* ///////////////....//X/XX///$$ .'$$.$-..$$$.///..//?....
* ////////////X/////////XX/XX/$I .;;. .$$.//xX/XXXXX///////. .$$$$$$/
* /XX/XXX//////XXXXX////XXX/X/$$ .::- ..$//XXX/////////////$$$$$$$/
* ////XXX//XXXXXX//////XXXXX//$$ --- $/////X///XXXXXXXA$$$$$$../...
* /////XX/XX$$$$$X$$$$$$$////$$$$. .$$$$$X//$$$$$$X/X/$$$$(////..///.
* ///XXXXX$$$$$$$$$$$$$X$$///$$$$$$$$$$$$$$$XX$$$$$X//////$$$$$$////////
* ?$$$$$$$$$$$$$:''':.::'V$$$$$'$$$$$$XXX$$$$X''''$$XXXX/$A$$$I,X//XX/////
* $$$$$$$$$.... .. .:.::::V$$$$$$$$$$::.. .$$$:X//VA$H/X/XX////
* $$$$$$$$::. . . ..:I::. . .:..I:. ..$$$$XHAMMHIHA//XX/
* $$$$$$$:..:... ..I:. .::. . .$$$$VMMMMMWV'I:.XX
* $$$$$$$:. .:$$$$$$$$. .I:. .:.. .$$$VMMMMV/.//XXXX
* $$$$$$::. $$4$$$$. now .I. .:. with ..:$;.. .$$VMMMA/XXXXX
* $$$$$$A:. /$$$$$$:dynamic.I.. .:..:breast .:$$$$:. .AMMMM$XXXX//
* $$$$$IMMAAM$$$$$$:: .I.. ... .:$$$$$$$:. .AMMMMM'$$XX$
* $$$$$IMMHMV$$$$$$$. phys.:I...ics .$$$$$$$$$$:. ..VMMMMMX$$$:X
* $$$$$:MHHM$$$$$$$$$:.. ...:II... . ... :$$$$$$$$$$$$$:.:VMMMM'$$$$$
* $$$$$HMHMV$$$$$$$$$$;....:.:II:......- .$$$$$$$$$$$$$$$$:.:VM'$$$$$$
* $$$$4HMHMV$$$$$$$$$$;....:.:II:......- .$$$$$$$$$$$$$$$$:.:VM'A$$$$$
* $$$$$HMHM4$$$$$$$$$$$$;. .:::.::.. .:$$$$$$$$$$$$$$$$$$$$$$$V$$$$$$
* $$$$$MHHV$$$$$$$$$$$$:. .:. .:$MV'.VMM$$$$$$$$$$$$$$$$$$$$$
* $$$$$MMM$$MM$$$MM$$$$... .. :$$. .VM$$$$$$MMMM$M$$$$$$$$
* $$$$$MMHA$$MMMM$M4$V .. ... .:$: .VM$$$$MMMMV..VM$$M$M$
* $$$$$MMLMA$MMMMMM$$' ... ... :$$. .H$$$$MV' .VMM$M$$
* $$$$$MHAHH$V. .V$$. ... ... .:$$ V$$$MV VMM$MM
* $$$$$MMMMHA V$ :. . . ..'V. V$$V VMM$$
* $$$$$$VHMHA $ .:.. .: . $. .$$ VMM$
* $$$$$$VAA . .::.. .; :.. . $$ VMM$$
* $$$$$$$$$$ .::. . .. . . V. VM
* $$$$$M$$$$. ..:.:... . . .. I .V
* $$$$$$M$$$$ . .:. :... . .. .. . .
* $$$$$$$$$$$. . . .:.. . .::. .
* $$$V''$$M$$$ : .
* $$$ .VM$. .:. $$$$ .
* $$$ $$$ :. $$$$$$$$$
* $$$$ $$ .. $$$$$$$ .
* $$$$$ IV .. $$$$$
* $$$$$$. $ .. .$$$. .
* M$$$$$$$ . ... .: :...
* MM$$$$$$$ ... .. :... .
* .V$MM$$$4$ ... .: .::..
* .V$MM$$$$ .. .$.:... .
* .V$MM$$$$ ... :$$$::.. .
* V$:V$:$$ ... .$$$::.. .
* $ $$ ;$ .. .$$$$:.... .
* . V$ .$ ... .$$$$.:..
* V$ $ .. .$$$$$:.. . .
* V$ . .. . $$$::.. .
* V$ ... . $$$;:.
* $I .. . $$;:.. .
* $. ... .. $;;.. .
* $ ... ... $;:.. ..
* $ ... .. $$.::$
* I. ... .. $$$$
* . ... ...
* .:... .:.
* ::.. ...
* .:.. .:.
* :.. .::.
* :. .:..
* :. .$$$;.
* :. $$$$$$.
* :$$$$$$$$$
* $4$$$$$$$$
* $$$$$$$$$$
* ;$$$$$M$$;
* $$$$$IM$$$
* V$$$M$$$$$
* ;$$$$M$$$;
* $$$M$$$$;
* $$$$$$$$
* ;$$$$$$$
* $$$$$$$
* $$$$$$$
* $$$$$$$
* ;$$$$$$
* $$$$$$
* $$$$$$.
* $$$$$$$$
* $$$$$$$:
* $$$$$$$:
* :$$$$$$:
* $$$$$$$:
* $$$$$$$$
* $$$$$$$$
* $$$$$$
* $$$$
* $$
*
*
*/

1
indra/newview/skins/default/xui/en-us/floater_contact_groups.xml
View File

@@ -7,6 +7,7 @@
<floater <floater
name="floater_contact_groups" name="floater_contact_groups"
title="Manage Contact Groups" title="Manage Contact Groups"
rect_control="FloaterContactRect"
can_resize="true" can_resize="true"
can_minimize="false" can_minimize="false"
can_close="true" can_close="true"

106
indra/newview/skins/default/xui/en-us/panel_friends.xml
View File

@@ -3,76 +3,78 @@
<string name="Multiple"> <string name="Multiple">
Multiple friends... Multiple friends...
</string> </string>
<text bottom_delta="-30" follows="left|top" font="SansSerif" height="16" left_delta="10" name="friends" width="110">
Contact Group:
</text>
<text bottom_delta="-20" follows="left|top" font="SansSerif" height="16" left_delta="0" name="friends" width="110">
Contact Search:
</text>
<combo_box allow_text_entry="false" enabled="true" follows="right|top"
bottom_delta="20" height="18" hidden="false" left="-235" max_chars="20" mouse_opaque="true"
tool_tip="Buddy group"
name="buddy_group_combobox" width="130">
<combo_item type="string" length="20" enabled="true" name="All"
value="All">
All
</combo_item>
</combo_box>
<line_editor bottom_delta="-20" enabled="true" follows="right|top" font="SansSerif"
height="18" left="-235" name="buddy_search_lineedit"
tool_tip="The friend name you want to search for"
width="130" />
<scroll_list bottom="10" can_resize="true" column_padding="0" draw_heading="true" <scroll_list bottom="10" can_resize="true" column_padding="0" draw_heading="true"
follows="left|top|bottom|right" left="10" multi_select="true" follows="left|top|bottom|right" left="10" multi_select="true"
name="friend_list" right="-100" search_column="1" name="friend_list" right="-100" search_column="1"
tool_tip="Hold shift or control while clicking to select multiple friends" tool_tip="Hold shift or control while clicking to select multiple friends"
top="-60"> top="-60">
<column image="ff_online_status_button.tga" name="icon_online_status" <column image="ff_online_status_button.tga" name="icon_online_status"
tool_tip="Online status" width="20" /> tool_tip="Online status" width="20" />
<column dynamicwidth="true" label="Name" name="friend_name" tool_tip="Name" /> <column dynamicwidth="true" label="Name" name="friend_name" tool_tip="Name" />
<column image="ff_visible_online_button.tga" name="icon_visible_online" <column image="ff_visible_online_button.tga" name="icon_visible_online"
tool_tip="Friend can see when you&apos;re online" width="20" /> tool_tip="Friend can see when you&apos;re online" width="20" />
<column image="ff_visible_map_button.tga" name="icon_visible_map" <column image="ff_visible_map_button.tga" name="icon_visible_map"
tool_tip="Friend can locate you on the map" width="20" /> tool_tip="Friend can locate you on the map" width="20" />
<column image="ff_edit_mine_button.tga" name="icon_edit_mine" <column image="ff_edit_mine_button.tga" name="icon_edit_mine"
tool_tip="Friend can edit, delete or take objects" width="20" /> tool_tip="Friend can edit, delete or take objects" width="20" />
<column image="ff_visible_online_button.tga" name="icon_visible_online_theirs" <column image="ff_visible_online_button.tga" name="icon_visible_online_theirs"
tool_tip="You can see when they are online (only updates on login)" width="20" /> tool_tip="You can see when they are online (only updates on login)" width="20" />
<column image="ff_visible_map_button.tga" name="icon_visible_map_theirs" <column image="ff_visible_map_button.tga" name="icon_visible_map_theirs"
tool_tip="You can locate them on the map" width="20" /> tool_tip="You can locate them on the map" width="20" />
<column image="ff_edit_theirs_button.tga" name="icon_edit_theirs" <column image="ff_edit_theirs_button.tga" name="icon_edit_theirs"
tool_tip="You can edit this friend&apos;s objects" width="20" /> tool_tip="You can edit this friend&apos;s objects" width="20" />
<column name="friend_last_update_generation" width="0" /> <column name="friend_last_update_generation" width="0" />
</scroll_list> </scroll_list>
<text bottom_delta="-40" follows="left|top" font="SansSerif" height="16" left_delta="10"
name="friends" width="110">
Contact Group:
</text>
<text bottom_delta="-20" follows="left|top" font="SansSerif" height="16" left_delta="0"
name="friends" width="110">
Contact Search:
</text>
<combo_box allow_text_entry="false" enabled="true" follows="right|top"
bottom_delta="20" height="18" hidden="false" left="-235" max_chars="20" mouse_opaque="true"
tool_tip="Buddy group" name="buddy_group_combobox" width="130">
<combo_item type="string" length="20" enabled="true" name="All" value="All">
All
</combo_item>
</combo_box>
<line_editor bottom_delta="-20" enabled="true" follows="right|top" font="SansSerif"
height="18" left="-235" name="buddy_search_lineedit"
tool_tip="The friend name you want to search for" width="130" />
<pad bottom="-7" height="0" left="-90" width="1" /> <pad bottom="-7" height="0" left="-90" width="1" />
<!--<button bottom_delta="-25" follows="top|right" height="22" label="Set Contact" <button bottom_delta="-25" follows="top|right" height="22" label="Set Contact"
left_delta="0" name="assign_btn" tool_tip="Asign a friend to a Contact Group" left_delta="0" name="assign_btn" tool_tip="Asign a friend to a Contact Group"
width="80" />--> width="80" />
<button bottom_delta="-25" follows="top|right" height="22" label="IM/Call" <button bottom_delta="-25" follows="top|right" height="22" label="IM/Call"
left_delta="0" name="im_btn" tool_tip="Open Instant Message session" left_delta="0" name="im_btn" tool_tip="Open Instant Message session"
width="80" /> width="80" />
<button bottom_delta="-25" follows="top|right" height="22" label="Profile" <button bottom_delta="-25" follows="top|right" height="22" label="Profile"
left_delta="0" name="profile_btn" left_delta="0" name="profile_btn"
tool_tip="Show picture, groups, and other information" width="80" /> tool_tip="Show picture, groups, and other information" width="80" />
<button bottom_delta="-25" follows="top|right" height="22" label="Teleport..." <button bottom_delta="-25" follows="top|right" height="22" label="Teleport..."
left_delta="0" name="offer_teleport_btn" left_delta="0" name="offer_teleport_btn"
tool_tip="Offer this friend a teleport to your current location" width="80" /> tool_tip="Offer this friend a teleport to your current location" width="80" />
<button bottom_delta="-25" follows="top|right" height="22" label="Pay..." <button bottom_delta="-25" follows="top|right" height="22" label="Pay..."
left_delta="0" name="pay_btn" left_delta="0" name="pay_btn"
tool_tip="Give Linden dollars (L$) to this friend" width="80" /> tool_tip="Give Linden dollars (L$) to this friend" width="80" />
<button bottom_delta="-25" follows="top|right" height="22" label="Remove..." <button bottom_delta="-25" follows="top|right" height="22" label="Remove..."
left_delta="0" name="remove_btn" left_delta="0" name="remove_btn"
tool_tip="Remove this person from your friends list" width="80" /> tool_tip="Remove this person from your friends list" width="80" />
<button bottom_delta="-25" follows="top|right" height="22" label="Add..." <button bottom_delta="-25" follows="top|right" height="22" label="Add..."
left_delta="0" name="add_btn" tool_tip="Offer friendship to a resident" left_delta="0" name="add_btn" tool_tip="Offer friendship to a resident"
width="80" /> width="80" />
<text bottom_delta="-50" follows="right|top" font="SansSerif" height="32" left_delta="10" name="friends" width="95"> <text bottom_delta="-50" follows="right|top" font="SansSerif" height="32" left_delta="10" name="friends" width="95">
Online: Online:
</text> <text bottom_delta="-15" follows="right|top" font="SansSerif" height="32" left_delta="0" name="f_num" width="95"> </text>
0000 <text bottom_delta="-15" follows="right|top" font="SansSerif" height="32" left_delta="0" name="f_num" width="95">
</text> <text bottom_delta="-20" follows="right|top" font="SansSerif" height="32" left_delta="0" name="sel" width="95"> 0000
Selected: </text>
</text> <text bottom_delta="-15" follows="right|top" font="SansSerif" height="32" left_delta="0" name="s_num" width="95"> <text bottom_delta="-20" follows="right|top" font="SansSerif" height="32" left_delta="0" name="sel" width="95">
0000 Selected:
</text>
<text bottom_delta="-15" follows="right|top" font="SansSerif" height="32" left_delta="0" name="s_num" width="95">
0000
</text> </text>
</panel> </panel>