From 9d8bbe16007ef9292a04856f55f71016cf1220bf Mon Sep 17 00:00:00 2001
From: pavelk_productengine <pavelkproductengine@lindenlab.com>
Date: Tue, 10 Feb 2015 19:56:32 +0200
Subject: MAINT-4734 (Separate transaction notices from group notice/invites) -
 introduced different design for System, Incoming/Outcoming Transactions,
 Invites

---
 .../textures/icons/Incoming_Transaction_Small.png  | Bin 0 -> 1666 bytes
 .../textures/icons/Outcoming_Transaction_Small.png | Bin 0 -> 1322 bytes
 .../textures/icons/System_Notification_Small.png   | Bin 0 -> 661 bytes
 indra/newview/skins/default/textures/textures.xml  |   3 ++
 .../xui/en/panel_notification_list_item.xml        |  60 +++++++++++++++++++++
 .../xui/en/panel_notification_tabbed_item.xml      |  57 --------------------
 6 files changed, 63 insertions(+), 57 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/Incoming_Transaction_Small.png
 create mode 100644 indra/newview/skins/default/textures/icons/Outcoming_Transaction_Small.png
 create mode 100644 indra/newview/skins/default/textures/icons/System_Notification_Small.png
 create mode 100644 indra/newview/skins/default/xui/en/panel_notification_list_item.xml
 delete mode 100644 indra/newview/skins/default/xui/en/panel_notification_tabbed_item.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/Incoming_Transaction_Small.png b/indra/newview/skins/default/textures/icons/Incoming_Transaction_Small.png
new file mode 100644
index 0000000000..8b39770c63
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Incoming_Transaction_Small.png differ
diff --git a/indra/newview/skins/default/textures/icons/Outcoming_Transaction_Small.png b/indra/newview/skins/default/textures/icons/Outcoming_Transaction_Small.png
new file mode 100644
index 0000000000..96c6150f3b
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Outcoming_Transaction_Small.png differ
diff --git a/indra/newview/skins/default/textures/icons/System_Notification_Small.png b/indra/newview/skins/default/textures/icons/System_Notification_Small.png
new file mode 100644
index 0000000000..027a8446d8
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/System_Notification_Small.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 0744962064..66fe119848 100755
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -801,5 +801,8 @@ with the same filename but different name
   <texture name="Icon_Group_Large" file_name="icons/Icon_Group_Large.png"	preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
   <texture name="Icon_Attachment_Small" file_name="icons/Icon_Attachment_Small.png"	preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
   <texture name="Icon_Attachment_Large" file_name="icons/Icon_Attachment_Large.png"	preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
+  <texture name="System_Notification_Small" file_name="icons/System_Notification_Small.png"	preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
+  <texture name="Incoming_Transaction_Small" file_name="icons/Incoming_Transaction_Small.png"	preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
+  <texture name="Outcoming_Transaction_Small" file_name="icons/Outcoming_Transaction_Small.png"	preload="true" scale.left="2" scale.top="13" scale.right="13" scale.bottom="2" />
 
 </textures>
diff --git a/indra/newview/skins/default/xui/en/panel_notification_list_item.xml b/indra/newview/skins/default/xui/en/panel_notification_list_item.xml
new file mode 100644
index 0000000000..9bd9742a20
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_notification_list_item.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- All our XML is utf-8 encoded. -->
+<panel
+  translate="false"
+  name="panel_notification_list_item"
+  title="panel_notification_list_item"
+  visible="true"
+  top="0"
+  left="0"
+  width="331"
+  height="50"
+  can_resize="false"
+  layout="topleft"
+  follows="left|right"
+  background_opaque="false"
+  background_visible="true"
+  bg_alpha_color="SysWellItemUnselected" >
+  <panel.string
+    name="sender_resident_text">
+    Sender: "[SENDER_RESIDENT]"
+  </panel.string>
+
+  <panel border="true" top="0" left="3" width="327" height="44" bevel_style="none" follows="left|top|right|bottom" layout="topleft" name="group_name_notice_title_panel">
+    <layout_stack top="0" left="0" width="325" height="50" orientation="horizontal" follows="left|top|right|bottom" name="HorizontalStack">
+      <layout_panel width="30" height="22" orientation="horizontal" follows="left|top|right|bottom" name="layout_panel_1">
+        <group_icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="group_icon" tool_tip="Group" default_icon_name="Generic_Group" visible="false"/>
+        <icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="system_notification_icon" tool_tip="Icon" image_name="System_Notification_Small" visible="false"/>
+        <icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="incoming_transaction_icon" tool_tip="Icon" image_name="Incoming_Transaction_Small" visible="false"/>
+        <icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="outcoming_transaction_icon" tool_tip="Icon" image_name="Outcoming_Transaction_Small" visible="false"/>
+      </layout_panel>
+      <layout_panel width="260" height="50" orientation="horizontal" follows="left|top|right|bottom" name="layout_panel_2">
+        <panel border="false" top="0" width="260" height="38" bevel_style="none" follows="left|top|right|bottom" layout="topleft" name="main_info_panel">
+          <panel border="false" top="0" left="0" width="260" height="19" bevel_style="none" follows="left|top|right|bottom" layout="topleft" name="notification_title_panel">
+            <text allow_scroll="false" font="SansSerifSmall" top="6" left="0" width="245" height="12" layout="topleft" follows="right|left" text_color="White"
+              use_ellipses="true" word_wrap="true" mouse_opaque="false" name="notification_title" >
+              Group Name:Notice Title N o t i c e T i t l e N o t i c e T i t l e N o t i c e T i t l e N oticeTitle
+            </text>
+            <icon top="0" left="242" width="21" height="21" image_name="Icon_Attachment_Small" follows="right" mouse_opaque="true" name="icon_attachment_small" tool_tip="Attachment"/>
+          </panel>
+          <panel border="false" top="23" left="0" width="260" bevel_style="none" follows="left|top|right|bottom" layout="topleft" name="sender_time_panel" height="15">
+            <text allow_scroll="false" font="SansSerifSmall" top="0" left="0" width="250" height="13"    layout="topleft"    follows="right|left"
+              use_ellipses="true" word_wrap="true" mouse_opaque="false" name="sender_resident" visible="false">
+              Sender:Resident
+            </text>
+            <text allow_scroll="false" font="SansSerifSmall" top="0" width="95" height="13" follows="right" halign="right" layout="topleft" left_pad="5"
+              name="notification_time" right="-5" value="2014/12/24 23:30" />
+          </panel>
+        </panel>
+      </layout_panel>
+      <layout_panel name="layout_panel_3" width="18" height="39" orientation="horizontal" follows="left|top|right|bottom">
+        <panel name="close_expand_panel" border="false" top="0" left="0" width="17"  height="39" bevel_style="none" follows="left|top|right|bottom" layout="topleft">
+          <button top="0" left="0" width="17" height="17" layout="topleft" follows="top" name="close_btn" mouse_opaque="true"
+            tab_stop="false" image_unselected="Icon_Close_Foreground" image_selected="Icon_Close_Press" />
+          <button top="22" left="0" width="17" height="17" layout="topleft" follows="top" name="expand_btn" mouse_opaque="true"
+            tab_stop="false" image_unselected="Notification_Expand" image_selected="Notification_Expand" />
+        </panel>
+      </layout_panel>
+    </layout_stack>
+  </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_notification_tabbed_item.xml b/indra/newview/skins/default/xui/en/panel_notification_tabbed_item.xml
deleted file mode 100644
index 603a3312e0..0000000000
--- a/indra/newview/skins/default/xui/en/panel_notification_tabbed_item.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- All our XML is utf-8 encoded. -->
-<panel
-  translate="false"
-  name="panel_notification_tabbed_item"
-  title="panel_notification_tabbed_item"
-  visible="true"
-  top="0"
-  left="0"
-  width="331"
-  height="50"
-  can_resize="false"
-  layout="topleft"
-  follows="left|right"
-  background_opaque="false"
-  background_visible="true"
-  bg_alpha_color="SysWellItemUnselected" >
-  <panel.string
-    name="sender_resident_text">
-    Sender: "[SENDER_RESIDENT]"
-  </panel.string>
-
-  <panel border="true" top="0" left="3" width="327" height="44" bevel_style="none" follows="left|top|right|bottom" layout="topleft" name="GroupNameNoticeTitlePanel">
-    <layout_stack top="0" left="0" width="325" height="50" orientation="horizontal" follows="left|top|right|bottom" name="HorizontalStack">
-      <layout_panel width="30" height="22" orientation="horizontal" follows="left|top|right|bottom" name="LayoutPanel">
-        <group_icon left="5" top="6" width="25" height="25" mouse_opaque="true" name="group_icon_small" tool_tip="Group" default_icon_name="Generic_Group"/>
-      </layout_panel>
-      <layout_panel width="260" height="50" orientation="horizontal" follows="left|top|right|bottom" name="LayoutPanel">
-        <panel border="false" top="0" width="260" height="38" bevel_style="none" follows="left|top|right|bottom" layout="topleft" name="MainInfoBlockPanel">
-          <panel border="false" top="0" left="0" width="260" height="19" bevel_style="none" follows="left|top|right|bottom" layout="topleft" name="GroupNameNoticeTitlePanel">
-            <text allow_scroll="false" font="SansSerifSmall" top="6" left="0" width="245" height="12" layout="topleft" follows="right|left" text_color="White"
-              use_ellipses="true" word_wrap="true" mouse_opaque="false" name="GroupName_NoticeTitle" >
-              Group Name:Notice Title N o t i c e T i t l e N o t i c e T i t l e N o t i c e T i t l e N oticeTitle
-            </text>
-            <icon top="0" left="242" width="21" height="21" image_name="Icon_Attachment_Small" follows="right" mouse_opaque="true" name="icon_attachment_small" tool_tip="Attachment"/>
-          </panel>
-          <panel border="false" top="23" left="0" width="260" bevel_style="none" follows="left|top|right|bottom" layout="topleft" name="SenderAndTimePanel" height="15">
-            <text allow_scroll="false" font="SansSerifSmall" top="0" left="0" width="250" height="13"    layout="topleft"    follows="right|left"
-              use_ellipses="true" word_wrap="true" mouse_opaque="false" name="Sender_Resident" >
-              Sender:Resident
-            </text>
-            <text allow_scroll="false" font="SansSerifSmall" top="0" width="95" height="13" follows="right" halign="right" layout="topleft" left_pad="5"
-              name="Time_Box" right="-5" value="2014/12/24 23:30" />
-          </panel>
-        </panel>
-      </layout_panel>
-      <layout_panel name="LayoutPanel3" width="18" height="39" orientation="horizontal" follows="left|top|right|bottom">
-        <panel name="CloseExpandButtonsPanel" border="false" top="0" left="0" width="17"  height="39" bevel_style="none" follows="left|top|right|bottom" layout="topleft">
-          <button top="0" left="0" width="17" height="17" layout="topleft" follows="top" name="close_btn" mouse_opaque="true"
-            tab_stop="false" image_unselected="Icon_Close_Foreground" image_selected="Icon_Close_Press" />
-          <button top="22" left="0" width="17" height="17" layout="topleft" follows="top" name="expand_btn" mouse_opaque="true"
-            tab_stop="false" image_unselected="Notification_Expand" image_selected="Notification_Expand" />
-        </panel>
-      </layout_panel>
-    </layout_stack>
-  </panel>
-</panel>
-- 
cgit v1.2.3