From 01a594a50bcd9abb4f9b2e9d75dc6bc62bdf7fd6 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 17 Oct 2017 10:27:53 +0200
Subject: [PATCH] Small improvement to inventory floater for AnsaStorm skin

---
 .../ansastorm/xui/de/panel_main_inventory.xml |  4 +-
 .../ansastorm/xui/en/floater_my_inventory.xml | 22 +++++++++
 .../ansastorm/xui/en/panel_main_inventory.xml | 45 ++++++++++++-------
 .../ansastorm/xui/en/sidepanel_inventory.xml  |  2 +-
 .../ansastorm/xui/es/panel_main_inventory.xml |  2 -
 .../ansastorm/xui/pl/panel_main_inventory.xml |  2 -
 .../ansastorm/xui/ru/panel_main_inventory.xml |  3 --
 7 files changed, 53 insertions(+), 27 deletions(-)
 create mode 100644 indra/newview/skins/ansastorm/xui/en/floater_my_inventory.xml

diff --git a/indra/newview/skins/ansastorm/xui/de/panel_main_inventory.xml b/indra/newview/skins/ansastorm/xui/de/panel_main_inventory.xml
index b0028060a4..e31fa56daf 100644
--- a/indra/newview/skins/ansastorm/xui/de/panel_main_inventory.xml
+++ b/indra/newview/skins/ansastorm/xui/de/panel_main_inventory.xml
@@ -73,10 +73,8 @@
 		</menu>
 	</menu_bar>
 	<filter_editor label="Inventar filtern" name="inventory search editor" tool_tip="Einen oder mehrere Suchbegriffe eingeben, getrennt durch '+'"/>
-	<button name="collapse_btn" label="Einklappen" />
-	<button name="expand_btn" label="Aufklappen" />
 	<text name="filter_label" value="Filter:"/>
-	<combo_box name="filter_combo_box" width="100">
+	<combo_box name="filter_combo_box">
 		<combo_box.item value="filter_type_all" label="Alle Typen" />
 		<combo_box.item value="filter_separator" label="------------" enabled="false" />
 		<combo_box.item value="filter_type_animations" label="Animationen" />
diff --git a/indra/newview/skins/ansastorm/xui/en/floater_my_inventory.xml b/indra/newview/skins/ansastorm/xui/en/floater_my_inventory.xml
new file mode 100644
index 0000000000..c445cb8fef
--- /dev/null
+++ b/indra/newview/skins/ansastorm/xui/en/floater_my_inventory.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater
+ positioning="centered"
+ can_close="true"
+ can_resize="true"
+ height="570"
+ help_topic="sidebar_inventory"
+ min_width="260"
+ min_height="200"
+ name="floater_my_inventory"
+ save_rect="true"
+ save_visibility="true"
+ reuse_instance="true"
+ title="Inventory"
+ width="330" >
+   <panel
+    class="sidepanel_inventory"
+    name="main_panel"
+    filename="sidepanel_inventory.xml"
+    follows="all"
+    top="0"/>
+</floater>
diff --git a/indra/newview/skins/ansastorm/xui/en/panel_main_inventory.xml b/indra/newview/skins/ansastorm/xui/en/panel_main_inventory.xml
index c2ce27c058..500c89b723 100644
--- a/indra/newview/skins/ansastorm/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/ansastorm/xui/en/panel_main_inventory.xml
@@ -415,18 +415,18 @@
    height="23"
    label="Filter Inventory"
    layout="topleft"
-   left="10"
+   left="4"
    max_length_chars="300"
    name="inventory search editor"
    tool_tip="Type in one or more words to search for, separated by '+' "
    top_pad="4"
-   width="310" />
+   right="-6" />
 
   <button
    name="collapse_btn"
-   label="Collapse"
-   width="80"
-   height="16"
+   image_overlay="MinusItem_Off"
+   width="18"
+   height="18"
    left="4"
    top_pad="4"
    follows="top|left"
@@ -434,10 +434,10 @@
 
   <button
    name="expand_btn"
-   label="Expand"
-   width="80"
-   height="16"
-   left_pad="4"
+   image_overlay="AddItem_Off"
+   width="18"
+   height="18"
+   left_pad="2"
    follows="top|left"
    layout="topleft" />
 
@@ -445,17 +445,19 @@
    name="filter_label"
    value="Filter:"
    width="40"
-   height="16"
+   height="18"
    left_pad="4"
+   top_delta="2"
    follows="top|left"
    layout="topleft" />
 
   <combo_box
    name="filter_combo_box"
-   width="80"
-   height="16"
+   right="-26"
+   height="18"
    left_pad="4"
-   follows="top|left"
+   top_delta="-2"
+   follows="top|left|right"
    layout="topleft">
 
   <combo_box.item value="filter_type_all" label="All Types" />
@@ -477,6 +479,17 @@
 
   </combo_box>
 
+  <button
+   commit_callback.function="Inventory.ShowFilters"
+   name="filteroptions_btn"
+   image_overlay="Script_Config"
+   width="18"
+   height="18"
+   right="-6"
+   top_delta="0"
+   follows="top|right"
+   layout="topleft"/>
+
   <tab_container
      bg_alpha_color="DkGray"
      bg_opaque_color="DkGray"
@@ -484,15 +497,15 @@
      background_opaque="false"
      follows="all"
      halign="center"
-     height="324"
+     height="322"
      layout="topleft"
-     left="4"
+     left="2"
      name="inventory filter tabs"
      open_tabs_on_drag_and_drop="true"
      tab_group="1"
      tab_position="top"
      top_pad="4"
-     width="322">
+     width="326">
     <inventory_panel
      border="false"
      bevel_style="none"
diff --git a/indra/newview/skins/ansastorm/xui/en/sidepanel_inventory.xml b/indra/newview/skins/ansastorm/xui/en/sidepanel_inventory.xml
index 38f05958e4..9e9f89fcf5 100644
--- a/indra/newview/skins/ansastorm/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/ansastorm/xui/en/sidepanel_inventory.xml
@@ -7,7 +7,7 @@
 	  min_height="350"
 	  min_width="240"
 	  name="objects panel"
-	  width="333">
+	  width="330">
     <panel
 		 follows="all"
 		 layout="topleft"
diff --git a/indra/newview/skins/ansastorm/xui/es/panel_main_inventory.xml b/indra/newview/skins/ansastorm/xui/es/panel_main_inventory.xml
index bbb9955f81..5a88af1267 100644
--- a/indra/newview/skins/ansastorm/xui/es/panel_main_inventory.xml
+++ b/indra/newview/skins/ansastorm/xui/es/panel_main_inventory.xml
@@ -62,8 +62,6 @@
 		</menu>
 	</menu_bar>
 	<filter_editor label="Filtrar" name="inventory search editor" tool_tip="Escribe una o más palabras a buscar, separadas por '+'"/>
-	<button name="collapse_btn" label="Colapsar"/>
-	<button name="expand_btn" label="Expandir"/>
 	<text name="filter_label" value="Filtro:"/>
 	<combo_box name="filter_combo_box">
 		<combo_box.item value="filter_type_all" label="Todo"/>
diff --git a/indra/newview/skins/ansastorm/xui/pl/panel_main_inventory.xml b/indra/newview/skins/ansastorm/xui/pl/panel_main_inventory.xml
index 77d3868fb6..eae71d5aac 100644
--- a/indra/newview/skins/ansastorm/xui/pl/panel_main_inventory.xml
+++ b/indra/newview/skins/ansastorm/xui/pl/panel_main_inventory.xml
@@ -70,8 +70,6 @@
 		</menu>
 	</menu_bar>
 	<filter_editor label="Filtruj Szafę" name="inventory search editor" tool_tip="Wpisz jedno lub więcej słów które chcesz wyszukać, oddzielonych za pomocą '+' "/>
-	<button name="collapse_btn" label="Zwiń"/>
-	<button name="expand_btn" label="Rozwiń" />
 	<text name="filter_label" value="Filtruj:"/>
 	<combo_box name="filter_combo_box">
 		<combo_box.item value="filter_type_all" label="Wszystkie typy" />
diff --git a/indra/newview/skins/ansastorm/xui/ru/panel_main_inventory.xml b/indra/newview/skins/ansastorm/xui/ru/panel_main_inventory.xml
index 38b0c0c0e2..5e3e7a4dde 100644
--- a/indra/newview/skins/ansastorm/xui/ru/panel_main_inventory.xml
+++ b/indra/newview/skins/ansastorm/xui/ru/panel_main_inventory.xml
@@ -67,8 +67,6 @@
 		</menu>
 	</menu_bar>
 	<filter_editor label="Фильтр" name="inventory search editor" tool_tip="Напишите одно или несколько слов для поиска. Для разделения используйте '+' "/>
-	<button name="collapse_btn" label="Свернуть"/>
-	<button name="expand_btn" label="Развернуть" />
 	<text name="filter_label" width="60" value="Фильтр:"/>
 	<combo_box name="filter_combo_box">
 		<combo_box.item value="filter_type_all" label="Все типы" />
@@ -105,7 +103,6 @@
 			<text name="ItemcountText">
 				Элементов
 			</text>
-			</text>
 		</panel>
 		<panel name="trash_btn_panel">
 			<dnd_button name="trash_btn" tool_tip="Удалить выбранный элемент"/>