From db45317cae8cfa700f9003541f948afc9e238303 Mon Sep 17 00:00:00 2001
From: "leslie@leslie-HPz600.lindenlab.com"
 <leslie@leslie-HPz600.lindenlab.com>
Date: Fri, 5 Aug 2011 11:12:27 -0700
Subject: EXP-863 FIX -- Add Outbox sync button that performs marketplace sync
 EXP-908 FIX -- Hide outbox when appropriate EXP-1035 FIX -- Allow user to
 remove items from outbox EXP-1000 FIX -- New icon can cover long names in
 Received Items Panel EXP-1001 FIX -- Newness is removed on next login if you
 log out or crash before opening inventory panel EXP-1008 UPDATE -- Extra
 space at bottom of Inventory panel when Inbox/outbox not displayed

* Updated "New" tag to properly display over long names per Epic's design
* "New" tags now compare vs last inbox collapse time rather than expansion time
* Marketplace inventory panels now have their own layout stack

Reviewed by Leyla
---
 indra/newview/skins/default/colors.xml             |   5 +++-
 indra/newview/skins/default/textures/textures.xml  |   5 +++-
 .../textures/widgets/Badge_Background_New.png      | Bin 1369 -> 0 bytes
 .../textures/widgets/New_Tag_Background.png        | Bin 0 -> 957 bytes
 .../default/textures/widgets/New_Tag_Border.png    | Bin 0 -> 969 bytes
 .../skins/default/xui/en/sidepanel_inventory.xml   |  33 +++++++++++++++++++--
 .../xui/en/widgets/inbox_folder_view_folder.xml    |  12 ++++----
 7 files changed, 45 insertions(+), 10 deletions(-)
 delete mode 100644 indra/newview/skins/default/textures/widgets/Badge_Background_New.png
 create mode 100644 indra/newview/skins/default/textures/widgets/New_Tag_Background.png
 create mode 100644 indra/newview/skins/default/textures/widgets/New_Tag_Border.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 31b6fc77f5..6144c761b7 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -32,6 +32,9 @@
 	<color
 	 name="LtGray_50"
 	 value="0.75 0.75 0.75 0.50" />
+	<color
+	 name="Gray"
+	 value="0.5 0.5 0.5 1" />
 	<color
 	 name="DkGray"
 	 value="0.125 0.125 0.125 1" />
@@ -197,7 +200,7 @@
      reference="Black" />
     <color
      name="ColorPaletteEntry02"
-     value="0.5 0.5 0.5 1" />
+     reference="Gray" />
     <color
      name="ColorPaletteEntry03"
      value="0.5 0 0 1" />
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 799cd907dc..392a6309c3 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -72,7 +72,10 @@ with the same filename but different name
   <texture name="BackButton_Over" file_name="icons/back_arrow_over.png" preload="false" scale.left="22" scale.top="12" scale.right="25" scale.bottom="12" />
   <texture name="BackButton_Press" file_name="icons/back_arrow_press.png" preload="false" scale.left="22" scale.top="12" scale.right="25" scale.bottom="12" />
 
-  <texture name="Badge_Background" file_name="widgets/Badge_Background.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
+	<texture name="New_Tag_Background" file_name="widgets/New_Tag_Background.png" preload="true" scale.left="12" scale.top="2" scale.right="36" scale.bottom="2" />
+	<texture name="New_Tag_Border" file_name="widgets/New_Tag_Border.png" preload="true" scale.left="12" scale.top="2" scale.right="36" scale.bottom="2" />
+
+	<texture name="Badge_Background" file_name="widgets/Badge_Background.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
   <texture name="Badge_Border" file_name="widgets/Badge_Border.png" preload="true" scale.left="9" scale.top="12" scale.right="248" scale.bottom="12" />
 
   <texture name="Blank" file_name="Blank.png" preload="false" />
diff --git a/indra/newview/skins/default/textures/widgets/Badge_Background_New.png b/indra/newview/skins/default/textures/widgets/Badge_Background_New.png
deleted file mode 100644
index 9f114f2e4a..0000000000
Binary files a/indra/newview/skins/default/textures/widgets/Badge_Background_New.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/widgets/New_Tag_Background.png b/indra/newview/skins/default/textures/widgets/New_Tag_Background.png
new file mode 100644
index 0000000000..cd639dd80f
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/New_Tag_Background.png differ
diff --git a/indra/newview/skins/default/textures/widgets/New_Tag_Border.png b/indra/newview/skins/default/textures/widgets/New_Tag_Border.png
new file mode 100644
index 0000000000..56df0d0127
Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/New_Tag_Border.png differ
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index 1d1d4ca01e..24ece37f3c 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -30,6 +30,7 @@
               width="330">
              <layout_panel
                  name="main_inventory_layout_panel"
+								 layout="topleft"
                  min_dim="150"
                  width="330"
                  follows="bottom|left|right"
@@ -47,11 +48,33 @@
                       height="480"
                       width="330" />
              </layout_panel>
-             <layout_panel
+					   <layout_panel
                  width="330"
+								 layout="topleft"
                  auto_resize="true"
                  user_resize="false"
                  follows="bottom|left|right"
+                 name="inbox_outbox_layout_panel"
+                 visible="false"
+                 min_dim="70"
+                 max_dim="235"
+                 expanded_min_dim="125"
+                 height="70">
+							 <layout_stack
+										follows="left|right|top|bottom"
+										layout="topleft"
+										left="0"
+										top="0"
+										orientation="vertical"
+										name="inbox_outbox_layout_stack"
+										height="235"
+										width="330">
+								 <layout_panel
+                 width="330"
+								 layout="topleft"
+                 auto_resize="true"
+                 user_resize="false"
+                 follows="left|right|top"
                  name="inbox_layout_panel"
                  visible="false"
                  min_dim="35"
@@ -72,6 +95,7 @@
                      <string name="InboxLabelNoArg">Received Items</string>
                      <button
                         label="Received Items"
+												font="SansSerifMedium"
                         name="inbox_btn"
                         height="35"
                         width="308"
@@ -96,7 +120,6 @@
                         name="inbox_fresh_new_count"
                         font="SansSerifMedium"
                         halign="right"
-                        text_color="EmphasisColor"
                         top_pad="0"
                         width="300">
                         [NUM] New
@@ -130,9 +153,10 @@
              </layout_panel>
              <layout_panel
                  width="330"
+								 layout="topleft"
                  auto_resize="true"
                  user_resize="false"
-                 follows="bottom|left|right"
+                 follows="all"
                  name="outbox_layout_panel"
                  visible="false"
                  min_dim="35"
@@ -153,6 +177,7 @@
                      <string name="OutboxLabelNoArg">Merchant Outbox</string>
                      <button
                         label="Merchant Outbox"
+												font="SansSerifMedium"
                         name="outbox_btn"
                         height="35"
                         width="308"
@@ -233,6 +258,8 @@
                     </panel>
                  </panel>
              </layout_panel>
+						 </layout_stack>
+						 </layout_panel>
          </layout_stack>
 		<panel
 		     follows="bottom|left|right"
diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
index 0d1120a182..aeea8616b0 100644
--- a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
+++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml
@@ -10,10 +10,12 @@
         label="New" 
         label_offset_horiz="-1"
         location="right" 
-        padding_horiz="4" 
-        padding_vert="1"
-        location_offset_hcenter="-15"
-        border_image=""
-        image="Badge_Background_New"
+        padding_horiz="12.5" 
+        padding_vert="2"
+        location_offset_hcenter="-23"
+        border_image="New_Tag_Border"
+				border_color="DkGray2"
+        image="New_Tag_Background"
+				image_color="Black"
         />
 </inbox_folder_view_folder>
-- 
cgit v1.2.3