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

Satisfy Issue 1932: Totalgroup member count

Browse Source
This commit is contained in:
Inusaito Sayori
2015-05-25 15:37:31 -04:00
parent 5be98205d4
commit dcb349d55d
8 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llpanelgroupgeneral.cpp
View File

@@ -60,6 +60,7 @@
#include "llviewerwindow.h" #include "llviewerwindow.h"
#include "hippogridmanager.h" #include "hippogridmanager.h"
#include <boost/lexical_cast.hpp>
// consts // consts
const S32 MATURE_CONTENT = 1; const S32 MATURE_CONTENT = 1;
@@ -267,6 +268,11 @@ BOOL LLPanelGroupGeneral::postBuild()
mGroupName->setVisible(FALSE); mGroupName->setVisible(FALSE);
} }
std::string member_count(LLTrans::getString("LoadingData"));
if (LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID))
member_count = boost::lexical_cast<std::string>(gdatap->mMembers.size());
getChild<LLUICtrl>("text_owners_and_visible_members")->setTextArg("[COUNT]", member_count);
return LLPanelGroupTab::postBuild(); return LLPanelGroupTab::postBuild();
} }
@@ -833,6 +839,8 @@ void LLPanelGroupGeneral::updateMembers()
} }
} }
getChild<LLUICtrl>("text_owners_and_visible_members")->setTextArg("[COUNT]", boost::lexical_cast<std::string>(gdatap->mMembers.size()));
if (mMemberProgress == gdatap->mMembers.end()) if (mMemberProgress == gdatap->mMembers.end())
{ {
lldebugs << " member list completed." << llendl; lldebugs << " member list completed." << llendl;

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

@@ -19,7 +19,7 @@ Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen.</s
<text_editor name="charter">Gruppencharta</text_editor> <text_editor name="charter">Gruppencharta</text_editor>
<button label="Beitreten (0 L$)" label_selected="Beitreten (0 L$)" name="join_button"/> <button label="Beitreten (0 L$)" label_selected="Beitreten (0 L$)" name="join_button"/>
<button label="Detailansicht" label_selected="Detailansicht" name="info_button"/> <button label="Detailansicht" label_selected="Detailansicht" name="info_button"/>
<text name="text_owners_and_visible_members">Eigentümer und sichtbare Mitglieder</text> <text name="text_owners_and_visible_members">Eigentümer und sichtbare Mitglieder ([COUNT])</text>
<text name="text_owners_are_shown_in_bold">(Eigentümer werden fettgedruckt angezeigt)</text> <text name="text_owners_are_shown_in_bold">(Eigentümer werden fettgedruckt angezeigt)</text>
<name_list name="visible_members"> <name_list name="visible_members">
<column label="Mitgliedsname" name="name"/> <column label="Mitgliedsname" name="name"/>

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

@@ -68,7 +68,7 @@ Hover your mouse over the options for more help.
left_delta="0" mouse_opaque="true" name="info_button" width="106" /> left_delta="0" mouse_opaque="true" name="info_button" width="106" />
<button bottom_delta="0" follows="left|top" height="22" label="" left_delta="106" width="22" scale_image="true" image_selected="tool_zoom.tga" image_unselected="tool_zoom.tga" image_hover_selected="tool_zoom_active.tga" image_hover_unselected="tool_zoom_active.tga" name="bigimg"/> <button bottom_delta="0" follows="left|top" height="22" label="" left_delta="106" width="22" scale_image="true" image_selected="tool_zoom.tga" image_unselected="tool_zoom.tga" image_hover_selected="tool_zoom_active.tga" image_hover_unselected="tool_zoom_active.tga" name="bigimg"/>
<text bottom_delta="-16" left_delta="-106" font="SansSerif" name="text_owners_and_visible_members"> <text bottom_delta="-16" left_delta="-106" font="SansSerif" name="text_owners_and_visible_members">
Owners &amp; Visible Members Owners &amp; Visible Members ([COUNT])
</text> </text>
<text bottom_delta="-16" font="SansSerifSmall" left_delta="0" <text bottom_delta="-16" font="SansSerifSmall" left_delta="0"
name="text_owners_are_shown_in_bold"> name="text_owners_are_shown_in_bold">

4
indra/newview/skins/default/xui/en-us/panel_group_roles.xml
View File

@@ -80,9 +80,7 @@ execute the Ability.
border_thickness="1" bottom="143" follows="left|top" font="SansSerifSmall" border_thickness="1" bottom="143" follows="left|top" font="SansSerifSmall"
height="16" is_unicode="false" left="4" max_length="63" mouse_opaque="true" height="16" is_unicode="false" left="4" max_length="63" mouse_opaque="true"
name="filter_input" width="100" /> name="filter_input" width="100" />
<button bottom_delta="-2" font="SansSerifSmall" halign="center" height="20" <name_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-123"
label="Search" left_delta="105" name="search_button" width="60" />
<name_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-121"
column_padding="0" draw_border="true" draw_heading="true" column_padding="0" draw_border="true" draw_heading="true"
heading_font="SansSerifSmall" menu_num="0" name_system="GroupMembersNameSystem" heading_font="SansSerifSmall" menu_num="0" name_system="GroupMembersNameSystem"
heading_height="14" height="120" left="4" multi_select="true" heading_height="14" height="120" left="4" multi_select="true"

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

@@ -34,7 +34,7 @@ Coloca el cursor sobre las opciones para más información.
<button label="Entrar ([CURRENCY]0)" label_selected="Entrar ([CURRENCY]0)" name="join_button"/> <button label="Entrar ([CURRENCY]0)" label_selected="Entrar ([CURRENCY]0)" name="join_button"/>
<button label="Ver Detalles" label_selected="Ver Detalles" name="info_button"/> <button label="Ver Detalles" label_selected="Ver Detalles" name="info_button"/>
<text name="text_owners_and_visible_members"> <text name="text_owners_and_visible_members">
Propietarios y Miembros Visibles Propietarios y Miembros Visibles ([COUNT])
</text> </text>
<text name="text_owners_are_shown_in_bold"> <text name="text_owners_are_shown_in_bold">
(Los Propietarios aparecen en Negrita) (Los Propietarios aparecen en Negrita)

2
indra/newview/skins/default/xui/fr/panel_group_general.xml
View File

@@ -52,7 +52,7 @@
height="22" label="Detailed View" label_selected="Detailed View" height="22" label="Detailed View" label_selected="Detailed View"
left_delta="0" mouse_opaque="true" name="info_button" width="128" /> left_delta="0" mouse_opaque="true" name="info_button" width="128" />
<text bottom_delta="-16" font="SansSerif" name="text_owners_and_visible_members"> <text bottom_delta="-16" font="SansSerif" name="text_owners_and_visible_members">
Propri&#xE9;taires et membres visibles Propri&#xE9;taires et membres visibles ([COUNT])
</text> </text>
<text bottom_delta="-16" font="SansSerifSmall" left_delta="0" <text bottom_delta="-16" font="SansSerifSmall" left_delta="0"
name="text_owners_are_shown_in_bold"> name="text_owners_are_shown_in_bold">

2
indra/newview/skins/default/xui/it/panel_group_general.xml
View File

@@ -31,7 +31,7 @@ Passa il mouse sulle opzioni per un aiuto aggiuntivo.
<button label="Unisciti (0 [CURRENCY])" label_selected="Unisciti (0 [CURRENCY])" name="join_button"/> <button label="Unisciti (0 [CURRENCY])" label_selected="Unisciti (0 [CURRENCY])" name="join_button"/>
<button label="Visualizza dettagli" label_selected="Visualizza dettagli" name="info_button"/> <button label="Visualizza dettagli" label_selected="Visualizza dettagli" name="info_button"/>
<text name="text_owners_and_visible_members"> <text name="text_owners_and_visible_members">
Proprietari &amp; Membri visibili Proprietari &amp; Membri visibili ([COUNT])
</text> </text>
<text name="text_owners_are_shown_in_bold"> <text name="text_owners_are_shown_in_bold">
(I proprietari sono scritti in neretto) (I proprietari sono scritti in neretto)

2
indra/newview/skins/default/xui/pt/panel_group_general.xml
View File

@@ -27,7 +27,7 @@
<button label="Unir ([CURRENCY]0)" label_selected="Unir ([CURRENCY]0)" name="join_button"/> <button label="Unir ([CURRENCY]0)" label_selected="Unir ([CURRENCY]0)" name="join_button"/>
<button label="Vista detalhada" label_selected="Vista detalhada" name="info_button"/> <button label="Vista detalhada" label_selected="Vista detalhada" name="info_button"/>
<text name="text_owners_and_visible_members"> <text name="text_owners_and_visible_members">
Proprietários &amp; Membros visíveis Proprietários &amp; Membros visíveis ([COUNT])
</text> </text>
<text name="text_owners_are_shown_in_bold"> <text name="text_owners_are_shown_in_bold">
(Proprietários são mostrados em negrito ) (Proprietários são mostrados em negrito )