git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1200 d1b88da0-ebda-0310...

diff --git a/ChangeLog b/ChangeLog
index 1fd10a59bf7c3b9d3a0f2db004ac90cae77068dc..2239ac960b1bc8c3e36f447fb6e33f51a87348c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-10-25  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+       * UI/MailerUI/UIxMailListView.m ([UIxMailListView
+       -messageSubjectCellStyleClass]): added support for replied,
+       forwarded, forwarded and replied mails.
+
        * SoObjects/Mailer/NSData+Mail.m ([NSData
        -bodyDataFromEncoding:encoding]): new utility method that decodes
        the NSData instance properly depending on the encoding string

diff --git a/UI/MailerUI/UIxMailListView.m b/UI/MailerUI/UIxMailListView.m
index e2cb26daf9f2580e865a98f56e8a665da3359c7c..7c6a855bbb48cdc6921c159c14fb01204b266915 100644 (file)
--- a/UI/MailerUI/UIxMailListView.m
+++ b/UI/MailerUI/UIxMailListView.m
@@ -173,9 +173,32 @@ static int attachmentFlagSize = 8096;
 
 - (NSString *) messageSubjectCellStyleClass 
 {
-  return ([self isMessageRead]
-         ? @"mailer_readmailsubject"
-         : @"mailer_unreadmailsubject");
+  NSArray *flags;
+  NSString *cellClass;
+
+  flags = [[self message] valueForKey:@"flags"];
+
+  if ([flags containsObject: @"seen"])
+    {
+      if ([flags containsObject: @"answered"])
+       {
+         if ([flags containsObject: @"$forwarded"])
+           cellClass = @"mailer_forwardedrepliedmailsubject";
+         else
+           cellClass = @"mailer_repliedmailsubject";
+       }
+      else if ([flags containsObject: @"$forwarded"])
+       cellClass = @"mailer_forwardedmailsubject";
+      else
+       cellClass = @"mailer_readmailsubject";
+    }
+  else
+    cellClass = @"mailer_unreadmailsubject";
+
+  return cellClass;
+//   return ([self isMessageRead]
+//       ? @"mailer_readmailsubject"
+//       : @"mailer_unreadmailsubject");
 }
 
 - (BOOL) hasMessageAttachment 

diff --git a/UI/WebServerResources/MailerUI.css b/UI/WebServerResources/MailerUI.css
index abd9a6ec1487fe3eb968081b0e68b9509d1487f0..22c3feb52fe6882105311da4dd31ec728384118c 100644 (file)
--- a/UI/WebServerResources/MailerUI.css
+++ b/UI/WebServerResources/MailerUI.css
@@ -240,21 +240,50 @@ span.mailer_datefield
 
 TD.mailer_readmailsubject
 {
-  background-image: url(message-mail-read.png) !important;
-  background-repeat: no-repeat !important;
-  background-position: 0px 0px !important;
   padding-left: 20px !important;
 }
 
 TD.mailer_unreadmailsubject
 {
-  background-image: url(message-mail.png) !important;
+  background-image: url(icon-new.png) !important;
   background-repeat: no-repeat !important;
   background-position: 0px 0px !important;
   padding-left: 20px !important;
   font-weight: bold !important;
 }
 
+TD.mailer_repliedmailsubject
+{
+  background-image: url(icon-replied.png) !important;
+  background-repeat: no-repeat !important;
+  background-position: 0px 0px !important;
+  padding-left: 20px !important;
+}
+
+TD.mailer_forwardedmailsubject
+{
+  background-image: url(icon-forwarded.png) !important;
+  background-repeat: no-repeat !important;
+  background-position: 0px 0px !important;
+  padding-left: 20px !important;
+}
+
+TD.mailer_forwardedrepliedmailsubject
+{
+  background-image: url(icon-forwarded-replied.png) !important;
+  background-repeat: no-repeat !important;
+  background-position: 0px 0px !important;
+  padding-left: 20px !important;
+}
+
+TD.mailer_deletedmailsubject
+{
+  background-image: url(icon-deleted.png) !important;
+  background-repeat: no-repeat !important;
+  background-position: 0px 0px !important;
+  padding-left: 20px !important;
+}
+
 TD.mailer_readmailsubject a
 {
   color: black;

diff --git a/UI/WebServerResources/icon-deleted.png b/UI/WebServerResources/icon-deleted.png
new file mode 100644 (file)
index 0000000..147db85
Binary files /dev/null and b/UI/WebServerResources/icon-deleted.png differ

diff --git a/UI/WebServerResources/icon-forwarded-replied.png b/UI/WebServerResources/icon-forwarded-replied.png
new file mode 100644 (file)
index 0000000..17c18ff
Binary files /dev/null and b/UI/WebServerResources/icon-forwarded-replied.png differ

diff --git a/UI/WebServerResources/icon-forwarded.png b/UI/WebServerResources/icon-forwarded.png
new file mode 100644 (file)
index 0000000..821af5c
Binary files /dev/null and b/UI/WebServerResources/icon-forwarded.png differ

diff --git a/UI/WebServerResources/icon-new.png b/UI/WebServerResources/icon-new.png
new file mode 100644 (file)
index 0000000..227ab50
Binary files /dev/null and b/UI/WebServerResources/icon-new.png differ

diff --git a/UI/WebServerResources/icon-replied.png b/UI/WebServerResources/icon-replied.png
new file mode 100644 (file)
index 0000000..9d0fb1e
Binary files /dev/null and b/UI/WebServerResources/icon-replied.png differ

diff --git a/UI/WebServerResources/message-mail.png b/UI/WebServerResources/message-mail.png
deleted file mode 100644 (file)
index c58e099..0000000
Binary files a/UI/WebServerResources/message-mail.png and /dev/null differ