Show inventory count composition in tool tip

Fri, 01 Dec 2017 20:08:02 +0100

author
Ansariel
date
Fri, 01 Dec 2017 20:08:02 +0100
changeset 53527
8f3077e4d580
parent 53526
1f39e8e1b942
child 53528
a62cfa41efa7

Show inventory count composition in tool tip

indra/newview/llpanelmaininventory.cpp file | annotate | diff | revisions
indra/newview/skins/ansastorm/xui/de/panel_main_inventory.xml file | annotate | diff | revisions
indra/newview/skins/ansastorm/xui/en/panel_main_inventory.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/de/panel_main_inventory.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/en/panel_main_inventory.xml file | annotate | diff | revisions
indra/newview/skins/starlight/xui/en/panel_main_inventory.xml file | annotate | diff | revisions
indra/newview/skins/starlightcui/xui/en/panel_main_inventory.xml file | annotate | diff | revisions
indra/newview/skins/vintage/xui/de/panel_main_inventory.xml file | annotate | diff | revisions
indra/newview/skins/vintage/xui/en/panel_main_inventory.xml file | annotate | diff | revisions
     1.1 --- a/indra/newview/llpanelmaininventory.cpp	Fri Dec 01 20:07:05 2017 +0100
     1.2 +++ b/indra/newview/llpanelmaininventory.cpp	Fri Dec 01 20:08:02 2017 +0100
     1.3 @@ -1023,6 +1023,16 @@
     1.4  		LLLocale locale("");
     1.5  		// </FS:Ansariel>
     1.6  		LLResMgr::getInstance()->getIntegerString(mItemCountString, mItemCount);
     1.7 +		
     1.8 +		// <FS:Ansariel> Include folders in inventory count
     1.9 +		std::string item_str, category_str;
    1.10 +		LLResMgr::getInstance()->getIntegerString(item_str, gInventory.getItemCount());
    1.11 +		LLResMgr::getInstance()->getIntegerString(category_str, gInventory.getCategoryCount());
    1.12 +		LLStringUtil::format_map_t args;
    1.13 +		args["[ITEMS]"] = item_str;
    1.14 +		args["[CATEGORIES]"] = category_str;
    1.15 +		mCounterCtrl->setToolTipArgs(args);
    1.16 +		// </FS:Ansariel>
    1.17  	}
    1.18  
    1.19  	LLStringUtil::format_map_t string_args;
     2.1 --- a/indra/newview/skins/ansastorm/xui/de/panel_main_inventory.xml	Fri Dec 01 20:07:05 2017 +0100
     2.2 +++ b/indra/newview/skins/ansastorm/xui/de/panel_main_inventory.xml	Fri Dec 01 20:08:02 2017 +0100
     2.3 @@ -108,7 +108,7 @@
     2.4  			<button name="new_inv_btn" tool_tip="Zusätzliches Inventar-Fenster"/>
     2.5  		</panel>
     2.6  		<panel name="dummy_panel">
     2.7 -			<text name="ItemcountText">
     2.8 +			<text name="ItemcountText" tool_tip="[ITEMS] Objekte, [CATEGORIES] Ordner">
     2.9  				Objekte
    2.10  			</text>
    2.11  		</panel>
     3.1 --- a/indra/newview/skins/ansastorm/xui/en/panel_main_inventory.xml	Fri Dec 01 20:07:05 2017 +0100
     3.2 +++ b/indra/newview/skins/ansastorm/xui/en/panel_main_inventory.xml	Fri Dec 01 20:08:02 2017 +0100
     3.3 @@ -650,6 +650,7 @@
     3.4             name="ItemcountText"
     3.5             font="SansSerifMedium"
     3.6             top_pad="6"
     3.7 +           tool_tip="[ITEMS] Items, [CATEGORIES] Folders"
     3.8             follows="bottom|left|right"
     3.9             width="240">
    3.10            Items
     4.1 --- a/indra/newview/skins/default/xui/de/panel_main_inventory.xml	Fri Dec 01 20:07:05 2017 +0100
     4.2 +++ b/indra/newview/skins/default/xui/de/panel_main_inventory.xml	Fri Dec 01 20:08:02 2017 +0100
     4.3 @@ -50,7 +50,7 @@
     4.4  			<button name="new_inv_btn" tool_tip="Zusätzliches Inventar-Fenster"/>
     4.5  		</panel>
     4.6  		<panel name="dummy_panel">
     4.7 -			<text name="ItemcountText">
     4.8 +			<text name="ItemcountText" tool_tip="[ITEMS] Objekte, [CATEGORIES] Ordner">
     4.9  				Objekte
    4.10  			</text>
    4.11  		</panel>
     5.1 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml	Fri Dec 01 20:07:05 2017 +0100
     5.2 +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml	Fri Dec 01 20:08:02 2017 +0100
     5.3 @@ -237,6 +237,7 @@
     5.4             name="ItemcountText"
     5.5             font="SansSerifMedium"
     5.6             top_pad="6"
     5.7 +           tool_tip="[ITEMS] Items, [CATEGORIES] Folders"
     5.8             follows="bottom|left|right"
     5.9             width="170">
    5.10            Items
     6.1 --- a/indra/newview/skins/starlight/xui/en/panel_main_inventory.xml	Fri Dec 01 20:07:05 2017 +0100
     6.2 +++ b/indra/newview/skins/starlight/xui/en/panel_main_inventory.xml	Fri Dec 01 20:08:02 2017 +0100
     6.3 @@ -34,6 +34,7 @@
     6.4  		     name="ItemcountText"
     6.5  		     font="SansSerifMedium"
     6.6  		     text_color="EmphasisColor"
     6.7 +		     tool_tip="[ITEMS] Items, [CATEGORIES] Folders"
     6.8  		     top_pad="0"
     6.9  		     width="300">
    6.10      Items:
     7.1 --- a/indra/newview/skins/starlightcui/xui/en/panel_main_inventory.xml	Fri Dec 01 20:07:05 2017 +0100
     7.2 +++ b/indra/newview/skins/starlightcui/xui/en/panel_main_inventory.xml	Fri Dec 01 20:08:02 2017 +0100
     7.3 @@ -36,6 +36,7 @@
     7.4  		     name="ItemcountText"
     7.5  		     font="SansSerifMedium"
     7.6  		     text_color="SL-EmphasisColor"
     7.7 +		     tool_tip="[ITEMS] Items, [CATEGORIES] Folders"
     7.8  		     top_pad="0"
     7.9  		     width="300">
    7.10      Items:
     8.1 --- a/indra/newview/skins/vintage/xui/de/panel_main_inventory.xml	Fri Dec 01 20:07:05 2017 +0100
     8.2 +++ b/indra/newview/skins/vintage/xui/de/panel_main_inventory.xml	Fri Dec 01 20:08:02 2017 +0100
     8.3 @@ -173,7 +173,7 @@
     8.4  		<worn_inventory_panel label="Angezogene Objekte" name="Worn Items" width="290" />
     8.5  	</tab_container>
     8.6  
     8.7 -	<text name="ItemcountText" >
     8.8 +	<text name="ItemcountText" tool_tip="[ITEMS] Objekte, [CATEGORIES] Ordner">
     8.9  		Objekte
    8.10  	</text>
    8.11  
     9.1 --- a/indra/newview/skins/vintage/xui/en/panel_main_inventory.xml	Fri Dec 01 20:07:05 2017 +0100
     9.2 +++ b/indra/newview/skins/vintage/xui/en/panel_main_inventory.xml	Fri Dec 01 20:08:02 2017 +0100
     9.3 @@ -534,6 +534,7 @@
     9.4  		height="16"
     9.5  		layout="topleft"
     9.6  		top_pad="2"
     9.7 +		tool_tip="[ITEMS] Items, [CATEGORIES] Folders"
     9.8  		left_delta="2"
     9.9  		name="ItemcountText"
    9.10  		right="-1"

mercurial