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

Clean up in the friends list code, fixing things~

Browse Source 
The entire list should no longer lock up when changing friend rights for just some people
Visual changes:
Muted people's names in friends list are now displayed in the muted color (this still needs testing)
The collapse and expand button now uses icons instead of < and > characters.

Complex stuff devs may read:
Remove pointless classes, definitions, and functions.
Replace static callbacks with bound ones.
Cleanup commented stuff
Fix styling and spacing stuffs
Comment out unexecuted code paths
Optimizes updating uncached names so full refresh is not required, just a single name update.
Comment out unused voice stuff, since SIP buddylist was removed in Voice Update.
Switch to Params for list building~
This commit is contained in:
Inusaito Sayori
2014-10-14 00:35:26 -04:00
parent d0f265f6d9
commit 65c613fb3e
9 changed files with 306 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

811
indra/newview/llfloaterfriends.cpp
View File

File diff suppressed because it is too large Load Diff

60
indra/newview/llfloaterfriends.h
View File

@@ -38,15 +38,14 @@
#include "llpanel.h" #include "llpanel.h"
#include "llstring.h" #include "llstring.h"
#include "lluuid.h" #include "lluuid.h"
#include "lleventtimer.h"
#include "llcallingcard.h" #include "llcallingcard.h"
class LLAvatarName; class LLAvatarName;
class LLFriendObserver; class LLFriendObserver;
class LLRelationship; class LLRelationship;
class LLScrollListItem;
class LLScrollListCtrl; class LLScrollListCtrl;
class AIFilePicker; class LLScrollListItem;
/** /**
* @class LLPanelFriends * @class LLPanelFriends
@@ -55,19 +54,12 @@ class AIFilePicker;
* *
* @sa LLFloater * @sa LLFloater
*/ */
class LLPanelFriends : public LLPanel, public LLEventTimer class LLPanelFriends : public LLPanel
{ {
public: public:
LLPanelFriends(); LLPanelFriends();
virtual ~LLPanelFriends(); virtual ~LLPanelFriends();
/**
* @brief This method either creates or brings to the front the
* current instantiation of this floater. There is only once since
* you can currently only look at your local friends.
*/
virtual BOOL tick();
/** /**
* @brief This method is called in response to the LLAvatarTracker * @brief This method is called in response to the LLAvatarTracker
* sending out a changed() message. * sending out a changed() message.
@@ -99,16 +91,16 @@ private:
// <dogmode> Contacts search and group system // <dogmode> Contacts search and group system
void filterContacts(const std::string& search_name); void filterContacts(const std::string& search_name);
void categorizeContacts(); void categorizeContacts();
void setContactGroup(std::string contact_grp); void setContactGroup(const std::string& contact_grp);
std::string cleanFileName(std::string filename); //std::string cleanFileName(std::string filename);
// -- // --
BOOL refreshNamesSync(const LLAvatarTracker::buddy_map_t & all_buddies); void refreshNamesSync(const LLAvatarTracker::buddy_map_t & all_buddies);
BOOL refreshNamesPresence(const LLAvatarTracker::buddy_map_t & all_buddies); void refreshNamesPresence(const LLAvatarTracker::buddy_map_t & all_buddies);
void refreshUI(); void refreshUI();
void refreshRightsChangeList(); void refreshRightsChangeList();
void applyRightsToFriends(); void applyRightsToFriends();
BOOL addFriend(const LLUUID& agent_id); void addFriend(const LLUUID& agent_id);
BOOL updateFriendItem(const LLUUID& agent_id, const LLRelationship* relationship); void updateFriendItem(const LLUUID& agent_id, const LLRelationship* relationship);
typedef enum typedef enum
{ {
@@ -119,27 +111,22 @@ private:
void sendRightsGrant(rights_map_t& ids); void sendRightsGrant(rights_map_t& ids);
// callback methods // callback methods
static void onSelectName(LLUICtrl* ctrl, void* user_data); void onSelectName();
static void onChangeContactGroup(LLUICtrl* ctrl, void* user_data); static void onPickAvatar(const uuid_vec_t& ids, const std::vector<LLAvatarName>& names);
static void onPickAvatar(const uuid_vec_t& ids, const std::vector<LLAvatarName>& names ); void onClickIM(const uuid_vec_t& ids);
void onContactFilterEdit(const std::string& search_string); void updateColumns(bool collapsed);
static void onClickIM(void* user_data); void onClickAddFriend();
static void onClickAssign(void* user_data); /*
static void onClickExpand(void* user_data); void onClickExport();
static void updateColumns(void* user_data); void onClickExport_continued(class AIFilePicker* filepicker);
static void onClickProfile(void* user_data); void onClickImport();
static void onClickAddFriend(void* user_data); void onClickImport_filepicker_continued(AIFilePicker* filepicker);
static void onClickExport(void* user_data); */
static void onClickExport_continued(void* user_data, AIFilePicker* filepicker);
static void onClickImport(void* user_data);
static void onClickImport_filepicker_continued(AIFilePicker* filepicker);
public: public:
static void FriendImportState(LLUUID id, bool accepted); static void FriendImportState(LLUUID id, bool accepted);
private: private:
static void onClickPay(void* user_data);
static void onClickModifyStatus(LLUICtrl* ctrl, void* user_data); bool modifyRightsConfirmation(const LLSD& notification, const LLSD& response, rights_map_t rights);
bool modifyRightsConfirmation(const LLSD& notification, const LLSD& response, rights_map_t* rights);
private: private:
// member data // member data
@@ -147,13 +134,8 @@ private:
LLUUID mAddFriendID; LLUUID mAddFriendID;
std::string mAddFriendName; std::string mAddFriendName;
LLScrollListCtrl* mFriendsList; LLScrollListCtrl* mFriendsList;
std::string mContactFilter;
BOOL mShowMaxSelectWarning;
BOOL mAllowRightsChange;
S32 mNumRightsChanged;
S32 mNumOnline; S32 mNumOnline;
std::string mLastContactSearch; std::string mLastContactSearch;
}; };
#endif // LL_LLFLOATERFRIENDS_H #endif // LL_LLFLOATERFRIENDS_H

2
indra/newview/llvoicevivox.cpp
View File

@@ -533,7 +533,7 @@ void LLVivoxVoiceClient::connectorCreate()
stream stream
<< "<Logging>" << "<Logging>"
<< "<Folder>" << logpath << "</Folder>" << "<Folder>" << logpath << "</Folder>"
<< "<FileNamePrefix>Connector</FileNamePrefix>" << "<FileNamePrefix>Connector</FileNamePrefix>"
<< "<FileNameSuffix>.log</FileNameSuffix>" << "<FileNameSuffix>.log</FileNameSuffix>"
<< "<LogLevel>" << loglevel << "</LogLevel>" << "<LogLevel>" << loglevel << "</LogLevel>"
<< "</Logging>" << "</Logging>"

2
indra/newview/skins/default/xui/de/panel_friends.xml
View File

@@ -18,7 +18,7 @@
</combo_box--> </combo_box-->
<!--text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" name="Contact Search:" width="110">Contact Search:</text--> <!--text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" name="Contact Search:" width="110">Contact Search:</text-->
<filter_editor name="buddy_search_lineedit" label="Kontakt suche" tool_tip="Der Name des Freundes den du suchen möchtest"/> <filter_editor name="buddy_search_lineedit" label="Kontakt suche" tool_tip="Der Name des Freundes den du suchen möchtest"/>
<button label="0" name="expand_collapse_btn" tool_tip="Ein und Ausklappen von mehr Informationen"/> <button name="expand_collapse_btn" tool_tip="Ein und Ausklappen von mehr Informationen"/>
<!--button bottom_delta="-25" follows="top|right" height="22" label="Set Contact" name="assign_btn" tool_tip="Assign a friend to a Contact Group" width="80"/--> <!--button bottom_delta="-25" follows="top|right" height="22" label="Set Contact" name="assign_btn" tool_tip="Assign a friend to a Contact Group" width="80"/-->
<button label="IM/Anruf" name="im_btn" tool_tip="Öffnet eine Instant-Message-Sitzung"/> <button label="IM/Anruf" name="im_btn" tool_tip="Öffnet eine Instant-Message-Sitzung"/>

2
indra/newview/skins/default/xui/de/panel_friends_horiz.xml
View File

@@ -18,7 +18,7 @@
</combo_box--> </combo_box-->
<!--text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" name="Contact Search:" width="110">Contact Search:</text--> <!--text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" name="Contact Search:" width="110">Contact Search:</text-->
<filter_editor name="buddy_search_lineedit" label="Kontakt suche" tool_tip="Der Name des Freundes den du suchen möchtest"/> <filter_editor name="buddy_search_lineedit" label="Kontakt suche" tool_tip="Der Name des Freundes den du suchen möchtest"/>
<button label="0" name="expand_collapse_btn" tool_tip="Ein und Ausklappen von mehr Informationen"/> <button name="expand_collapse_btn" tool_tip="Ein und Ausklappen von mehr Informationen"/>
<!--button bottom_delta="-25" follows="top|right" height="22" label="Set Contact" name="assign_btn" tool_tip="Assign a friend to a Contact Group" width="80"/--> <!--button bottom_delta="-25" follows="top|right" height="22" label="Set Contact" name="assign_btn" tool_tip="Assign a friend to a Contact Group" width="80"/-->
<text name="friends">Online</text> <text name="friends">Online</text>
<text name="f_num">0000</text> <text name="f_num">0000</text>

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

@@ -19,7 +19,7 @@
</combo_box--> </combo_box-->
<!--text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" name="Contact Search:" width="110">Contact Search:</text--> <!--text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" name="Contact Search:" width="110">Contact Search:</text-->
<filter_editor bottom_delta="-40" enabled="true" follows="left|top" font="SansSerif" height="18" name="buddy_search_lineedit" label="Contact Search" tool_tip="The friend name you want to search for" width="160"/> <filter_editor bottom_delta="-40" enabled="true" follows="left|top" font="SansSerif" height="18" name="buddy_search_lineedit" label="Contact Search" tool_tip="The friend name you want to search for" width="160"/>
<button bottom_delta="0" follows="top|right" height="22" label="0" left="-120" name="expand_collapse_btn" tool_tip="Expand/Collapse extra info" width="22"/> <button bottom_delta="0" follows="top|right" height="22" left="-120" control_name="ContactListCollapsed" label="" image_selected="arrow_left.tga" image_unselected="arrow_right.tga" toggle="true" name="expand_collapse_btn" tool_tip="Expand/Collapse extra info" width="22"/>
<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" name="assign_btn" tool_tip="Assign a friend to a Contact Group" width="80"/--> <!--button bottom_delta="-25" follows="top|right" height="22" label="Set Contact" name="assign_btn" tool_tip="Assign a friend to a Contact Group" width="80"/-->
<button bottom_delta="-25" follows="top|right" height="22" label="IM/Call" name="im_btn" tool_tip="Open Instant Message session" width="80"/> <button bottom_delta="-25" follows="top|right" height="22" label="IM/Call" name="im_btn" tool_tip="Open Instant Message session" width="80"/>

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

@@ -19,7 +19,7 @@
</combo_box--> </combo_box-->
<!--text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" name="Contact Search:" width="110">Contact Search:</text--> <!--text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" name="Contact Search:" width="110">Contact Search:</text-->
<filter_editor bottom_delta="-100" enabled="true" follows="left|top" font="SansSerif" height="18" name="buddy_search_lineedit" label="Contact Search" tool_tip="The friend name you want to search for" width="160"/> <filter_editor bottom_delta="-100" enabled="true" follows="left|top" font="SansSerif" height="18" name="buddy_search_lineedit" label="Contact Search" tool_tip="The friend name you want to search for" width="160"/>
<button bottom_delta="0" follows="top|right" height="22" label="0" left="-25" name="expand_collapse_btn" tool_tip="Expand/Collapse extra info" width="22"/> <button bottom_delta="0" follows="top|right" height="22" left="-25" control_name="ContactListCollapsed" label="" image_selected="arrow_left.tga" image_unselected="arrow_right.tga" toggle="true" name="expand_collapse_btn" tool_tip="Expand/Collapse extra info" width="22"/>
<!--button bottom_delta="-25" follows="top|right" height="22" label="Set Contact" name="assign_btn" tool_tip="Assign a friend to a Contact Group" width="80"/--> <!--button bottom_delta="-25" follows="top|right" height="22" label="Set Contact" name="assign_btn" tool_tip="Assign a friend to a Contact Group" width="80"/-->
<text bottom="38" left="12" follows="left|bottom" height="32" name="friends" width="95">Online:</text> <text bottom="38" left="12" follows="left|bottom" height="32" name="friends" width="95">Online:</text>
<text bottom_delta="0" left_delta="60" follows="left|bottom" height="32" name="f_num" width="95">0000</text> <text bottom_delta="0" left_delta="60" follows="left|bottom" height="32" name="f_num" width="95">0000</text>

2
indra/newview/skins/default/xui/es/panel_friends.xml
View File

@@ -15,7 +15,7 @@
<column name="friend_last_update_generation"/> <column name="friend_last_update_generation"/>
</scroll_list> </scroll_list>
<filter_editor name="buddy_search_lineedit" label="Buscar Contactos" tool_tip="Nombre del amigo que estás buscando"/> <filter_editor name="buddy_search_lineedit" label="Buscar Contactos" tool_tip="Nombre del amigo que estás buscando"/>
<button label="0" name="expand_collapse_btn" tool_tip="Ampliar/Contraer información extra"/> <button name="expand_collapse_btn" tool_tip="Ampliar/Contraer información extra"/>
<button label="MI/Llamada" name="im_btn" tool_tip="Abrir sesión de Mensajes Instantáneos"/> <button label="MI/Llamada" name="im_btn" tool_tip="Abrir sesión de Mensajes Instantáneos"/>
<button label="Perfil" name="profile_btn" tool_tip="Mostrar foto, grupos e información adicional"/> <button label="Perfil" name="profile_btn" tool_tip="Mostrar foto, grupos e información adicional"/>
<button label="Teleportar..." name="offer_teleport_btn" tool_tip="Ofrecer Teleporte a tu ubicación a este amigo" /> <button label="Teleportar..." name="offer_teleport_btn" tool_tip="Ofrecer Teleporte a tu ubicación a este amigo" />

2
indra/newview/skins/default/xui/es/panel_friends_horiz.xml
View File

@@ -18,7 +18,7 @@
</combo_box--> </combo_box-->
<!--text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" name="Contact Search:" width="110">Contact Search:</text--> <!--text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" name="Contact Search:" width="110">Contact Search:</text-->
<filter_editor name="buddy_search_lineedit" label="Buscar Contactos" tool_tip="El nombre del contacto que estás buscando"/> <filter_editor name="buddy_search_lineedit" label="Buscar Contactos" tool_tip="El nombre del contacto que estás buscando"/>
<button label="0" name="expand_collapse_btn" tool_tip="Expandir/Retraer información extra"/> <button name="expand_collapse_btn" tool_tip="Expandir/Retraer información extra"/>
<!--button bottom_delta="-25" follows="top|right" height="22" label="Set Contact" name="assign_btn" tool_tip="Assign a friend to a Contact Group" width="80"/--> <!--button bottom_delta="-25" follows="top|right" height="22" label="Set Contact" name="assign_btn" tool_tip="Assign a friend to a Contact Group" width="80"/-->
<text name="friends">Conectados:</text> <text name="friends">Conectados:</text>
<text name="f_num" width="95">0000</text> <text name="f_num" width="95">0000</text>