Skip to content
Snippets Groups Projects
Commit ac784d66 authored by Mnikolenko Productengine's avatar Mnikolenko Productengine
Browse files

MAINT-7084 Add tally and limit values to Block list.

parent f573e779
No related branches found
No related tags found
No related merge requests found
...@@ -67,6 +67,8 @@ class LLBlockList: public LLFlatListViewEx, public LLMuteListObserver ...@@ -67,6 +67,8 @@ class LLBlockList: public LLFlatListViewEx, public LLMuteListObserver
void sortByType(); void sortByType();
void refresh(); void refresh();
U32 getMuteListSize() { return mMuteListSize; }
private: private:
void addNewItem(const LLMute* mute); void addNewItem(const LLMute* mute);
......
...@@ -141,6 +141,9 @@ void LLPanelBlockedList::updateButtons() ...@@ -141,6 +141,9 @@ void LLPanelBlockedList::updateButtons()
bool hasSelected = NULL != mBlockedList->getSelectedItem(); bool hasSelected = NULL != mBlockedList->getSelectedItem();
getChildView("unblock_btn")->setEnabled(hasSelected); getChildView("unblock_btn")->setEnabled(hasSelected);
getChildView("blocked_gear_btn")->setEnabled(hasSelected); getChildView("blocked_gear_btn")->setEnabled(hasSelected);
getChild<LLUICtrl>("block_limit")->setTextArg("[COUNT]", llformat("%d", mBlockedList->getMuteListSize()));
getChild<LLUICtrl>("block_limit")->setTextArg("[LIMIT]", llformat("%d", gSavedSettings.getS32("MuteListLimit")));
} }
void LLPanelBlockedList::unblockItem() void LLPanelBlockedList::unblockItem()
......
...@@ -90,6 +90,19 @@ ...@@ -90,6 +90,19 @@
top_delta="0" top_delta="0"
width="31"/> width="31"/>
</panel> </panel>
<text
type="string"
length="1"
follows="left|top|right"
height="14"
layout="topleft"
right="-10"
top_pad="4"
left="3"
use_ellipses="true"
name="block_limit">
[COUNT] entries in your block list, and the limit is [LIMIT].
</text>
<block_list <block_list
follows="all" follows="all"
height="273" height="273"
...@@ -97,6 +110,6 @@ ...@@ -97,6 +110,6 @@
left="3" left="3"
name="blocked" name="blocked"
tool_tip="List of currently blocked Residents" tool_tip="List of currently blocked Residents"
top="31" top_pad="4"
right="-1"/> right="-1"/>
</panel> </panel>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment