From bfa4cb51589f25c2989a2c3cc1668c2498de9676 Mon Sep 17 00:00:00 2001 From: wolfgang Date: Thu, 25 Oct 2007 20:11:52 +0000 Subject: [PATCH] git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1200 d1b88da0-ebda-0310-925b-ed51d893ca5b --- ChangeLog | 4 ++ UI/MailerUI/UIxMailListView.m | 29 ++++++++++++-- UI/WebServerResources/MailerUI.css | 37 ++++++++++++++++-- UI/WebServerResources/icon-deleted.png | Bin 0 -> 705 bytes .../icon-forwarded-replied.png | Bin 0 -> 734 bytes UI/WebServerResources/icon-forwarded.png | Bin 0 -> 546 bytes UI/WebServerResources/icon-new.png | Bin 0 -> 396 bytes UI/WebServerResources/icon-replied.png | Bin 0 -> 541 bytes UI/WebServerResources/message-mail.png | Bin 626 -> 0 bytes 9 files changed, 63 insertions(+), 7 deletions(-) create mode 100644 UI/WebServerResources/icon-deleted.png create mode 100644 UI/WebServerResources/icon-forwarded-replied.png create mode 100644 UI/WebServerResources/icon-forwarded.png create mode 100644 UI/WebServerResources/icon-new.png create mode 100644 UI/WebServerResources/icon-replied.png delete mode 100644 UI/WebServerResources/message-mail.png diff --git a/ChangeLog b/ChangeLog index 1fd10a59..2239ac96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2007-10-25 Wolfgang Sourdeau + * 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 e2cb26da..7c6a855b 100644 --- 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 abd9a6ec..22c3feb5 100644 --- 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 index 0000000000000000000000000000000000000000..147db859d585970babc07a0b534c222961e07faa GIT binary patch literal 705 zcmV;y0zUnTP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L04ERt04ERulxa~J00007bV*G`2iFQ2 z6Dk$Bn6qgB000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0006UNkl%~%E9;V2e7~-ghWJk z8W|aBfBW|B|6xhVWse>`Du{mm{0*|^Bj)CQzyJK1^zp-oNtf>5FGX>|N?F+le0+TJ znwpvn($dll4<0;te)Zb5h=AL-4{cLXVV6-g?f(%!$Uj6#w#S8neM~}{;t7k$Nh<)?sdHCbUNt|3R69w|S3@ZhD0sHnJ*u<*xQ_wJd5-MxDUSuHcV z=KTx|ERx2?+rE7HVsQKR?Ylp}e%1N;`?nm!|No|fe0&zNPoFM0$iVOqrx$qa?Hiex zm~3v{y2ZfAz)%qT?%k(rj~~aqd;50T&tJdHEVZ=@aC%{zii)AEvht}nZ{D!HdiCm1 z_~Xa+Fu9ow46H(Oa=ZEX`Hen)`lJ^2@Zk##7qD`2M*aNxljY5uHw^z78Jm&i(is?j z|NikK{LAOh-#FRWYOuOsjf8|e2S0!3w{PDbg*|>;hAn_sNJ|H^u(2)q_x-zE*ozmh n$;v>hWMp=(mX>y)N^S%Is}k4{L6r^r00000NkvXXu0mjfSpQt5 literal 0 HcmV?d00001 diff --git a/UI/WebServerResources/icon-forwarded-replied.png b/UI/WebServerResources/icon-forwarded-replied.png new file mode 100644 index 0000000000000000000000000000000000000000..17c18ffe456d412953f5abc65fced2abe9748f30 GIT binary patch literal 734 zcmV<40wMj0P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L04ERt04ERulxa~J00007bV*G`2iFQ2 z6DcXY+MF!_000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0006xNkl1J`?g*k{?MPQP&q>y9(k;8WWaJ$Y!(GNY?)JkKVgEeK@Y9?Ihd&6yP>g>-gc_H{8GD ztcnB*;z1tL!XNWQ*%ed>h67Q)V5g{YJFqpC)S5z{Q1 zPfBpkxY5~j9LJ=xvEK#AOHswzcYac{xS(u#lVur-qQK|#qV=31?+6e=Ozz#Mz0hZt zGj(z~gz6iQ#{<9Lk1W$DF5Q8=9jH2K0x-0?l8{1Q)^Yoa9mzxnrDa-N?ypBxP4UBA zpqiwUq(kMMwSTsA`s*|Yd+hAL^olD>N|Iz(E_^zkiZ2aJ3^0{Rk)$ALAnEOX)=lfY zl{0TbOs6tol8w2rF|rm(w?A#CWRf-mhBp!$vB4LEluQzX--9G+BUzzl3rRk4gdB25vPB?5r}gxGqN`igoOn~c=!^jGu2oAZyj!)~@dXr*M5 zD48VM{5FPGLnP@U*@C}`Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L04ERt04ERulxa~J00007bV*G`2iFQ2 z6Dl8AO_CX>@2HM@dakSAh-}0004fNklNTfCh3JSVODS}x5&{v0Y81x1A}z2)FJ?sv!Wob>+$PzqGsxA}3> zvVX^qQVvj)rq=;Yw*k}z7h_C*3IhzL>B;Dx1uz6;+ytoF3B~c(2RMu*0fvD>z;3CX zWqIKcUkjGy8i0?$Y4eLI-aMb;+lNgY$B6(>?&1&IUmxJ-QVd`Y$h)h-tk^*k kU;uF6$DuEQ+JE{(XQMFfkfT0kYXATM07*qoM6N<$f;MUA5dZ)H literal 0 HcmV?d00001 diff --git a/UI/WebServerResources/icon-new.png b/UI/WebServerResources/icon-new.png new file mode 100644 index 0000000000000000000000000000000000000000..227ab50e4db0dc9acdd31d256911bfa7ea20141f GIT binary patch literal 396 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85q=o`qTv&r(_070tMMiJbhi+uX9NXYjLib`CbhuBw6AbQR1AR zo12TU0NS}?f-xK;y?diFZudEeOr<6hLy=jJ`^|Hd_UiR zzVU`tn~b}^o;dV0Ud;a2|L5P%@6Va^h$m_G`AtI4n(G%yqQ?|fW!1Kn+)r%UctB4z?wGEwtXA=l!hi3r?f;*Wshe|NSylF!o^GUD jkyXXhPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L04ERt04ERulxa~J00007bV*G`2iFQ2 z6Dk1JMOT6V000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0004aNklHjkz4vcr3oB=W|{=|)c z6I5%}2H;3is6$~7@V;Cv9|Qzn0s9+T$ere_bX5vVayoS#0KON_3nV`$X*3%E!@#GC zR|!&EDNe3V0FsjQqOEuwIM^(1zS?*9pmH8acoh`Q_HT&5@zPL0~Tua+Rpm7^}a&6ATv|FUY9fADE2a@w3F88(C80I^JaG0 zNx;_u!CAJHW%A=Bi4TcK5%++%K&YGD_X9`AY|%&x``4>X#0xHWwx}j zQ4<{%mSqKnrm|pWq%%wVv2<=Z+`jGGPG^&ipmq`6b>QKBUU;AP=bZNt{No}2L4pZS zhd(9=(pXf0z`!^XJO$y8eiS?(32r}ru7rGWJL$scV#rpnMYdSNa>f7}o408mpSM&% zBpAT=AvfGTgV=Vm?g$xu<)ACn26!Lap{lG#jzpSK%>S6dNOva+^m;sW+{3O@7tQ3| zi`!JQZa3y;zGBdI3)-!Fu_SldZ{l#k2al@_g@!VSmx^%LVu$hcC5{X|v(mz{>SSPW z`U?i^O(>~30I@7DEe`po(PwLgZsU4LbJ>^z4@cu2)SkJ_5l>eW)m9kOZTmluquYD| zRYy-iBF{s}H-$$g6H1LcAz!ITiV@{uYiz^5vke@1{ooqaZP=3(N5gY?-e7`UslsS) z4Qf9f7ys4Si)PvRRU5%Y7WIzsZqar-`m9--NfFPACmk$*K?{=~fff zQatc&67Sy(qexqT7V8rnGPiQ%rM;f!ugZr^U4$I5D5E&ZnGMa(!te9L)!v80SM3~m zYCRuBEG|lISf&k3Y^d;y9}0(sW6kYc;xDKfHZy1#vi{;5B%W>fCztP4N->$d8~^|S M07*qoM6N<$f&gkEa{vGU -- 2.39.5