From 4da7f68549f531a6bec3643727cc68fb29a00bfa Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Thu, 5 Jun 2014 17:06:59 -0400
Subject: VWR-25689 Support 'older than' when inventory filtering

---
 .../xui/en/floater_inventory_view_finder.xml       | 48 ++++++++++++++++------
 1 file changed, 35 insertions(+), 13 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
index c86ed595a7..5c7c4de9e8 100755
--- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_minimize="false"
- height="408"
+ height="440"
  layout="topleft"
  name="Inventory Finder"
  help_topic="inventory_finder"
@@ -95,36 +95,36 @@
      width="126" />
     <icon
      height="16"
-     image_name="Inv_Mesh"
+     image_name="Inv_Notecard"
      layout="topleft"
      left="8"
      mouse_opaque="true"
-     name="icon_mesh"
-     top="142"
+     name="icon_notecard"
+     top="122"
      width="16" />
     <check_box
      height="16"
-     label="Meshes"
+     label="Notecards"
      layout="topleft"
      left_pad="2"
-     name="check_mesh"
+     name="check_notecard"
      top_delta="0"
      width="126" />
     <icon
      height="16"
-     image_name="Inv_Notecard"
+     image_name="Inv_Mesh"
      layout="topleft"
      left="8"
      mouse_opaque="true"
-     name="icon_notecard"
-     top="122"
+     name="icon_mesh"
+     top="142"
      width="16" />
     <check_box
      height="16"
-     label="Notecards"
+     label="Meshes"
      layout="topleft"
      left_pad="2"
-     name="check_notecard"
+     name="check_mesh"
      top_delta="0"
      width="126" />
     <icon
@@ -261,12 +261,34 @@
      width="144">
         - OR -
     </text>
+
+ <radio_group
+  follows="top|left"
+  height="16"
+  layout="topleft"
+  left_delta="0"
+  name="date_search_direction"
+  top_pad="0"
+  width="270">
+  <radio_item
+   label="Older than"
+   layout="topleft"
+   name="older"
+   top_pad="6" />
+  <radio_item
+   label="Younger than"
+   layout="topleft"
+   name="yonger"
+   top_pad="-10"
+   left="120" />
+ </radio_group>
+
     <spinner
      follows="left|top"
      height="16"
      increment="1"
      initial_value="0"
-     label="Hours Ago"
+     label="Hours"
      label_width="64"
      layout="topleft"
      left_delta="0"
@@ -279,7 +301,7 @@
      height="16"
      increment="1"
      initial_value="0"
-     label="Days Ago"
+     label="Days"
      label_width="64"
      layout="topleft"
      left_delta="0"
-- 
cgit v1.2.3


From 89837f385261804781979bdac499d264457e3297 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Fri, 6 Jun 2014 14:56:11 -0400
Subject: STOMR-2034 XML adjustments and a bit of code cleanup

---
 .../xui/en/floater_inventory_view_finder.xml       | 66 ++++++++++++----------
 1 file changed, 36 insertions(+), 30 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
index 5c7c4de9e8..54e08822f1 100755
--- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
@@ -223,25 +223,33 @@
      top="262"
      width="100" />
     <button
-     follows="left|top"
      height="20"
      label="None"
      label_selected="None"
-     layout="topleft"
      left_delta="0"
      name="None"
-     top_pad="4"
+     left_pad="10"
      width="100" />
     <check_box
      height="16"
      label="Always show folders"
      layout="topleft"
-     left_delta="0"
+     left="8"
      name="check_show_empty"
-     top_pad="4"
+     top_pad="6"
      width="144" />
+    <view_border
+     bevel_style="none"
+     follows="top|left"
+     height="0"
+     layout="topleft"
+     left="10"
+     name="horiz_separator"
+     top_pad="8"
+     width="260"/>
     <check_box
      height="16"
+     top="324"
      label="Since Logoff"
      layout="topleft"
      left_delta="0"
@@ -257,32 +265,30 @@
      layout="topleft"
      left_delta="0"
      name="- OR -"
-     top_delta="16"
+     top="342"
      width="144">
         - OR -
     </text>
-
- <radio_group
-  follows="top|left"
-  height="16"
-  layout="topleft"
-  left_delta="0"
-  name="date_search_direction"
-  top_pad="0"
-  width="270">
-  <radio_item
-   label="Older than"
-   layout="topleft"
-   name="older"
-   top_pad="6" />
-  <radio_item
-   label="Younger than"
-   layout="topleft"
-   name="yonger"
-   top_pad="-10"
-   left="120" />
- </radio_group>
-
+    <radio_group
+     height="16"
+     layout="topleft"
+     name="date_search_direction"
+     top="360"
+     left="8"
+     width="270">
+     <radio_item
+      label="Newer than"
+      layout="topleft"
+      name="newer"
+      top_pad="6"
+      left="0" />
+     <radio_item
+      label="Older than"
+      layout="topleft"
+      name="older"
+      top_delta="0"
+      left="120" />
+    </radio_group>
     <spinner
      follows="left|top"
      height="16"
@@ -307,7 +313,7 @@
      left_delta="0"
      max_val="10000"
      name="spin_days_ago"
-     top_pad="4"
+     top_pad="14"
      width="144" />
     <button
      follows="top|right"
@@ -317,6 +323,6 @@
      layout="topleft"
      name="Close"
      right="-6"
-     top="382"
+     top="412"
      width="76" />
 </floater>
-- 
cgit v1.2.3


From 481f3cc54ba5ede6eadef77f1f808c39cb2cec92 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Sat, 7 Jun 2014 05:16:56 -0400
Subject: STORM-2034 Add persistence for new setting, more XML formatting
 changes, Fix two issues with how hours and days are calculated and displayed

---
 .../xui/en/floater_inventory_view_finder.xml       | 36 ++++++++++++++++------
 1 file changed, 27 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
index 54e08822f1..17bc818cc1 100755
--- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
@@ -294,27 +294,45 @@
      height="16"
      increment="1"
      initial_value="0"
-     label="Hours"
-     label_width="64"
      layout="topleft"
      left_delta="0"
      max_val="240000"
      name="spin_hours_ago"
      top_pad="4"
-     width="144" />
+     width="64" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="3"
+     top_delta="4"
+     width="80">
+        Hours
+    </text>
     <spinner
      follows="left|top"
      height="16"
      increment="1"
      initial_value="0"
-     label="Days"
-     label_width="64"
      layout="topleft"
-     left_delta="0"
      max_val="10000"
      name="spin_days_ago"
-     top_pad="14"
-     width="144" />
+     top_pad="4"
+     left="8"
+     width="64" />
+    <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_pad="3"
+     top_delta="4"
+     width="80">
+        Days
+    </text>
     <button
      follows="top|right"
      height="20"
@@ -323,6 +341,6 @@
      layout="topleft"
      name="Close"
      right="-6"
-     top="412"
+     top="406"
      width="76" />
 </floater>
-- 
cgit v1.2.3


From 51aa604af4e8b3b7361c31dcf2578c8a42bf3b1e Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Tue, 10 Jun 2014 13:06:53 -0400
Subject: STORM-2034 Try to fix incorrect logic about increasing and decreasing
 filtering. Minor XML adjustment.

---
 indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index d2519a5aa4..06d0b849a3 100755
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -63,7 +63,7 @@
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
-     label="Show Filters"
+     label="Show Filters..."
      layout="topleft"
      name="show_filters">
         <on_click
-- 
cgit v1.2.3