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

Refactor legacy friendlist and move out font name into the XML for per-skin customization

Ansariel 2014-05-16 12:08:00 +02:00
parent 39a6670935
commit 944ffe50ee
7 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/fsfloatercontacts.cpp
View File

@ -113,6 +113,7 @@ BOOL FSFloaterContacts::postBuild()
{
mTabContainer = getChild<LLTabContainer>("friends_and_groups");
mFriendsTab = getChild<LLPanel>(FRIENDS_TAB_NAME);
mFriendListFontName = mFriendsTab->getString("FontName");
mFriendsList = mFriendsTab->getChild<LLScrollListCtrl>("friend_list");
mFriendsList->setMaxSelectable(MAX_FRIEND_SELECT);
@ -584,7 +585,7 @@ void FSFloaterContacts::addFriend(const LLUUID& agent_id)
LLSD& friend_column = element["columns"][LIST_FRIEND_NAME];
friend_column["column"] = "full_name";
friend_column["value"] = av_name.getCompleteName();
friend_column["font"]["name"] = "SANSSERIF";
friend_column["font"]["name"] = mFriendListFontName;
friend_column["font"]["style"] = "NORMAL";
LLSD& online_status_column = element["columns"][LIST_ONLINE_STATUS];

2
indra/newview/fsfloatercontacts.h
View File

@ -140,6 +140,8 @@ private:
BOOL mAllowRightsChange;
S32 mNumRightsChanged;
LLCachedControl<bool> mSortByUserName;
std::string mFriendListFontName;
};

1
indra/newview/skins/ansastorm/xui/en/panel_fs_contacts_friends.xml
View File

@ -5,6 +5,7 @@
mouse_opaque="true"
name="friends"
width="355">
<panel.string name="FontName" value="SANSSERIF"/>
<panel.string name="FriendCount" value="Friends: [COUNT]"/>
<!--
<view_border

1
indra/newview/skins/default/xui/en/panel_fs_contacts_friends.xml
View File

@ -5,6 +5,7 @@
mouse_opaque="true"
name="friends"
width="355">
<panel.string name="FontName" value="SANSSERIF"/>
<panel.string name="FriendCount" value="Friends: [COUNT]"/>
<!--
<view_border

1
indra/newview/skins/firestorm/xui/en/panel_fs_contacts_friends.xml
View File

@ -5,6 +5,7 @@
mouse_opaque="true"
name="friends"
width="355">
<panel.string name="FontName" value="SANSSERIF"/>
<panel.string name="FriendCount" value="Friends: [COUNT]"/>
<!--
<view_border

1
indra/newview/skins/latency/xui/en/panel_fs_contacts_friends.xml
View File

@ -5,6 +5,7 @@
mouse_opaque="true"
name="friends"
width="355">
<panel.string name="FontName" value="SANSSERIF"/>
<panel.string name="FriendCount" value="Friends: [COUNT]"/>
<!--
<view_border

1
indra/newview/skins/vintage/xui/en/panel_fs_contacts_friends.xml
View File

@ -5,6 +5,7 @@
mouse_opaque="true"
name="friends"
width="355">
<panel.string name="FontName" value="SANSSERIF"/>
<panel.string name="FriendCount" value="Friends: [COUNT]"/>
<view_border
top="1"