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

Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm

meow-7.2.2
Ansariel 2022-05-13 10:41:56 +02:00
parent 67caeafccb 8a8458ec51
commit 1f486a3441
4 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/llpanelgrouproles.cpp
View File

@ -3182,6 +3182,7 @@ BOOL LLPanelGroupBanListSubTab::postBuildSubTab(LLView* root)
mBanList->setCommitOnSelectionChange(TRUE);
mBanList->setCommitCallback(onBanEntrySelect, this);
mBanList->setFilterColumn(0); // <FS:Zi> FIRE-31653: add banlist filter editor
mCreateBanButton->setClickedCallback(onCreateBanEntry, this);
mCreateBanButton->setEnabled(FALSE);
@ -3260,6 +3261,13 @@ void LLPanelGroupBanListSubTab::onBanEntrySelect(LLUICtrl* ctrl, void* user_data
void LLPanelGroupBanListSubTab::handleBanEntrySelect()
{
// <FS:Zi> FIRE-31653: disable remove ban button when no entry is selected
if (!mBanList->getNumSelected())
{
mDeleteBanButton->setEnabled(false);
return;
}
// </FS:Zi>
if (gAgent.hasPowerInGroup(mGroupID, GP_GROUP_BAN_ACCESS))
{
mDeleteBanButton->setEnabled(TRUE);
@ -3434,3 +3442,13 @@ void LLPanelGroupBanListSubTab::setGroupID(const LLUUID& id)
setFooterEnabled(FALSE);
LLPanelGroupSubTab::setGroupID(id);
}
// <FS:Zi> FIRE-31653: add banlist filter editor
void LLPanelGroupBanListSubTab::onFilterChanged()
{
mBanList->setFilterString(mSearchFilter);
// disable remove ban button as a change of filter will deselect all entries
mDeleteBanButton->setEnabled(false);
}
// </FS:Zi> add banlist filter editor

1
indra/newview/llpanelgrouproles.h
View File

@ -357,6 +357,7 @@ public:
virtual void activate();
virtual void update(LLGroupChange gc);
virtual void onFilterChanged(); // <FS:Zi> FIRE-31653: add banlist filter editor
virtual void draw();
static void onBanEntrySelect(LLUICtrl* ctrl, void* user_data);

1
indra/newview/skins/default/xui/de/panel_group_roles.xml
View File

@ -74,6 +74,7 @@ Rechte in einer Gruppe. Es gibt viele verschiedene Fähigkeiten.
<panel.string name="ban_count_template">
Bann-Anzahl: [COUNT]/[LIMIT]
</panel.string>
<filter_editor label="Verbannte Einwohner filtern" name="filter_input"/>
<name_list name="ban_list">
<name_list.columns label="Einwohner" name="name"/>
<name_list.columns label="Bann-Datum" name="ban_date"/>

14
indra/newview/skins/default/xui/en/panel_group_roles.xml
View File

@ -360,10 +360,22 @@ things in this group. There&apos;s a broad variety of Abilities.
name="ban_count_template">
Ban count: [COUNT]/[LIMIT]
</panel.string>
<filter_editor
layout="topleft"
top="5"
left="5"
right="-5"
height="22"
search_button_visible="false"
follows="left|top|right"
label="Filter Ban List"
name="filter_input" />
<name_list
column_padding="0"
draw_heading="true"
height="136"
height="114"
follows="left|top|right"
layout="topleft"
left="0"