From e5d6a14f05f857ecbbbd9b464db3ece82d1d099f Mon Sep 17 00:00:00 2001 From: pavelk_productengine Date: Fri, 9 Jan 2015 20:17:39 +0200 Subject: MAINT-4734 (Separate transaction notices from group notice/invites) - initial version Works: 1) All new notices shown on "Invites" tab of new floater "NOTIFICATIONS TABBED" in condensed view To be done: 1) Show other types of notices, like transactions and system 2) Separate notices between tabs "Invites", "System", "Transactions" 3) Design full notice view (in addition to condensed view) --- .../default/textures/icons/Icon_Attachment_Large.png | Bin 0 -> 4182 bytes .../default/textures/icons/Icon_Attachment_Small.png | Bin 0 -> 3774 bytes .../skins/default/textures/icons/Icon_Group_Large.png | Bin 0 -> 12280 bytes .../skins/default/textures/icons/Icon_Group_Small.png | Bin 0 -> 4473 bytes .../textures/icons/Icon_Notification_Condense.png | Bin 0 -> 262 bytes .../default/textures/icons/Icon_Notification_Expand.png | Bin 0 -> 239 bytes indra/newview/skins/default/textures/textures.xml | 7 +++++++ 7 files changed, 7 insertions(+) create mode 100644 indra/newview/skins/default/textures/icons/Icon_Attachment_Large.png create mode 100644 indra/newview/skins/default/textures/icons/Icon_Attachment_Small.png create mode 100644 indra/newview/skins/default/textures/icons/Icon_Group_Large.png create mode 100644 indra/newview/skins/default/textures/icons/Icon_Group_Small.png create mode 100644 indra/newview/skins/default/textures/icons/Icon_Notification_Condense.png create mode 100644 indra/newview/skins/default/textures/icons/Icon_Notification_Expand.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/icons/Icon_Attachment_Large.png b/indra/newview/skins/default/textures/icons/Icon_Attachment_Large.png new file mode 100644 index 0000000000..0732a33d93 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Icon_Attachment_Large.png differ diff --git a/indra/newview/skins/default/textures/icons/Icon_Attachment_Small.png b/indra/newview/skins/default/textures/icons/Icon_Attachment_Small.png new file mode 100644 index 0000000000..8124554902 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Icon_Attachment_Small.png differ diff --git a/indra/newview/skins/default/textures/icons/Icon_Group_Large.png b/indra/newview/skins/default/textures/icons/Icon_Group_Large.png new file mode 100644 index 0000000000..6dc0cbda0b Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Icon_Group_Large.png differ diff --git a/indra/newview/skins/default/textures/icons/Icon_Group_Small.png b/indra/newview/skins/default/textures/icons/Icon_Group_Small.png new file mode 100644 index 0000000000..ef2b521a1f Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Icon_Group_Small.png differ diff --git a/indra/newview/skins/default/textures/icons/Icon_Notification_Condense.png b/indra/newview/skins/default/textures/icons/Icon_Notification_Condense.png new file mode 100644 index 0000000000..4d245eb57a Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Icon_Notification_Condense.png differ diff --git a/indra/newview/skins/default/textures/icons/Icon_Notification_Expand.png b/indra/newview/skins/default/textures/icons/Icon_Notification_Expand.png new file mode 100644 index 0000000000..186822da43 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Icon_Notification_Expand.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 1f10d966d5..0744962064 100755 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -795,4 +795,11 @@ with the same filename but different name + + + + + + + -- cgit v1.2.3 From 9d8bbe16007ef9292a04856f55f71016cf1220bf Mon Sep 17 00:00:00 2001 From: pavelk_productengine 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 .../default/textures/icons/System_Notification_Small.png | Bin 0 -> 661 bytes indra/newview/skins/default/textures/textures.xml | 3 +++ 4 files changed, 3 insertions(+) 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 (limited to 'indra/newview/skins/default/textures') 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 + + + -- cgit v1.2.3 From 575b750d1c1d3de2c86ad80759a2ba51d671344a Mon Sep 17 00:00:00 2001 From: pavelk_productengine Date: Tue, 24 Feb 2015 17:27:00 +0200 Subject: MAINT-4734 (Separate transaction notices from group notice/invites) - introduced expanded notification view and general condense/expand behaviour for all types of notifications --- .../textures/icons/Outcoming_Transaction_Large.png | Bin 0 -> 4662 bytes .../default/textures/icons/System_Notification_Large.png | Bin 0 -> 1804 bytes indra/newview/skins/default/textures/textures.xml | 3 +++ 3 files changed, 3 insertions(+) create mode 100644 indra/newview/skins/default/textures/icons/Outcoming_Transaction_Large.png create mode 100644 indra/newview/skins/default/textures/icons/System_Notification_Large.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/icons/Outcoming_Transaction_Large.png b/indra/newview/skins/default/textures/icons/Outcoming_Transaction_Large.png new file mode 100644 index 0000000000..79011edd8b Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Outcoming_Transaction_Large.png differ diff --git a/indra/newview/skins/default/textures/icons/System_Notification_Large.png b/indra/newview/skins/default/textures/icons/System_Notification_Large.png new file mode 100644 index 0000000000..434ce3e8b6 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/System_Notification_Large.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 66fe119848..eef7d56e75 100755 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -802,7 +802,10 @@ with the same filename but different name + + + -- cgit v1.2.3 From 1891c5a8e0f9323e5657e6be775b1a97763ddf09 Mon Sep 17 00:00:00 2001 From: pavelk_productengine Date: Tue, 24 Feb 2015 17:31:19 +0200 Subject: MAINT-4734 (Separate transaction notices from group notice/invites) - minor fix: added large incoming payment icon --- .../textures/icons/Incoming_Transaction_Large.png | Bin 0 -> 4939 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 indra/newview/skins/default/textures/icons/Incoming_Transaction_Large.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/icons/Incoming_Transaction_Large.png b/indra/newview/skins/default/textures/icons/Incoming_Transaction_Large.png new file mode 100644 index 0000000000..e73dfe2695 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Incoming_Transaction_Large.png differ -- cgit v1.2.3 From b147d659dc0c94a972f1c82f16536b374ee10c19 Mon Sep 17 00:00:00 2001 From: pavelk_productengine Date: Tue, 17 Mar 2015 18:26:28 +0200 Subject: MAINT-4734 (Separate transaction notices from group notice/invites) 1) stripped off attachment field; 2) made logos (group's, sender's, etc) in expanded view the same size as in condensed view; 3) turned on notification showing upon click; 4) fixed cropped right border of Invite and Transactions notifications; 5) enabled "Collapse All" button; 6) stripped off unnecessary icons. --- .../skins/default/textures/icons/Icon_Group_Large.png | Bin 12280 -> 0 bytes .../skins/default/textures/icons/Icon_Group_Small.png | Bin 4473 -> 0 bytes .../textures/icons/Incoming_Transaction_Large.png | Bin 4939 -> 0 bytes .../textures/icons/Incoming_Transaction_Small.png | Bin 1666 -> 0 bytes .../textures/icons/Outcoming_Transaction_Large.png | Bin 4662 -> 0 bytes .../textures/icons/Outcoming_Transaction_Small.png | Bin 1322 -> 0 bytes indra/newview/skins/default/textures/textures.xml | 16 +++------------- 7 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 indra/newview/skins/default/textures/icons/Icon_Group_Large.png delete mode 100644 indra/newview/skins/default/textures/icons/Icon_Group_Small.png delete mode 100644 indra/newview/skins/default/textures/icons/Incoming_Transaction_Large.png delete mode 100644 indra/newview/skins/default/textures/icons/Incoming_Transaction_Small.png delete mode 100644 indra/newview/skins/default/textures/icons/Outcoming_Transaction_Large.png delete mode 100644 indra/newview/skins/default/textures/icons/Outcoming_Transaction_Small.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/icons/Icon_Group_Large.png b/indra/newview/skins/default/textures/icons/Icon_Group_Large.png deleted file mode 100644 index 6dc0cbda0b..0000000000 Binary files a/indra/newview/skins/default/textures/icons/Icon_Group_Large.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/icons/Icon_Group_Small.png b/indra/newview/skins/default/textures/icons/Icon_Group_Small.png deleted file mode 100644 index ef2b521a1f..0000000000 Binary files a/indra/newview/skins/default/textures/icons/Icon_Group_Small.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/icons/Incoming_Transaction_Large.png b/indra/newview/skins/default/textures/icons/Incoming_Transaction_Large.png deleted file mode 100644 index e73dfe2695..0000000000 Binary files a/indra/newview/skins/default/textures/icons/Incoming_Transaction_Large.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/icons/Incoming_Transaction_Small.png b/indra/newview/skins/default/textures/icons/Incoming_Transaction_Small.png deleted file mode 100644 index 8b39770c63..0000000000 Binary files a/indra/newview/skins/default/textures/icons/Incoming_Transaction_Small.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/icons/Outcoming_Transaction_Large.png b/indra/newview/skins/default/textures/icons/Outcoming_Transaction_Large.png deleted file mode 100644 index 79011edd8b..0000000000 Binary files a/indra/newview/skins/default/textures/icons/Outcoming_Transaction_Large.png and /dev/null 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 deleted file mode 100644 index 96c6150f3b..0000000000 Binary files a/indra/newview/skins/default/textures/icons/Outcoming_Transaction_Small.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index eef7d56e75..e47e0c03f1 100755 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -795,17 +795,7 @@ with the same filename but different name - - - - - - - - - - - - - + + + -- cgit v1.2.3 From 60d28437e616a6afda51a368ea40ad49a707d16c Mon Sep 17 00:00:00 2001 From: pavelk_productengine Date: Wed, 8 Apr 2015 19:51:39 +0300 Subject: MAINT-4734 (Separate transaction notices from group notice/invites) 1) added GroupNotice notification type and tab "Group" for it; 2) added Attachment field to group notice notifications which may contain inventory offers, notecards, etc; 3) added Fee field to Group Invite notifications; 4) added notification resize depending on attachment field. --- indra/newview/skins/default/textures/textures.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index e47e0c03f1..4f8962182e 100755 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -798,4 +798,6 @@ with the same filename but different name + + -- cgit v1.2.3