From c3690ab4d4a475d6cd534dff62ca33b75ca7b879 Mon Sep 17 00:00:00 2001 From: znek Date: Fri, 22 Oct 2004 15:46:56 +0000 Subject: [PATCH] some progress in the mailer git-svn-id: http://svn.opengroupware.org/SOGo/trunk@419 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/UI/Mailer/ChangeLog | 12 ++ .../Mailer/Images/title_attachment_14x14.png | Bin 322 -> 430 bytes SOGo/UI/Mailer/Images/title_config.png | Bin 140 -> 250 bytes SOGo/UI/Mailer/Images/title_junk.png | Bin 352 -> 440 bytes SOGo/UI/Mailer/Images/title_read_14x14.png | Bin 297 -> 467 bytes .../UI/Mailer/Images/title_sortdown_12x12.png | Bin 148 -> 256 bytes SOGo/UI/Mailer/Images/title_sortup_12x12.png | Bin 0 -> 252 bytes SOGo/UI/Mailer/Images/title_thread.png | Bin 415 -> 493 bytes SOGo/UI/Mailer/UIxMailListView.m | 23 +++- SOGo/UI/Mailer/UIxMailListView.wox | 124 +++++++++++++++--- SOGo/UI/Mailer/Version | 4 +- SOGo/UI/Mailer/product.plist | 3 +- SOGo/UI/SOGoUI/ChangeLog | 5 + SOGo/UI/SOGoUI/UIxComponent.m | 58 ++++---- SOGo/UI/SOGoUI/Version | 2 +- 15 files changed, 172 insertions(+), 59 deletions(-) create mode 100644 SOGo/UI/Mailer/Images/title_sortup_12x12.png diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog index 90a66e60..dc17567c 100644 --- a/SOGo/UI/Mailer/ChangeLog +++ b/SOGo/UI/Mailer/ChangeLog @@ -1,3 +1,15 @@ +2004-10-22 Marcus Mueller + + * v0.9.42 + + * UIxMailListView.wox: sorting, proper handling of sort keys. + NOTE: there's still an unidentified bug of sort keys failing to be + retained on successive paging. + + * UIxMailListView.m: sorting + + * Images/title_*: corrected alpha values + 2004-10-20 Marcus Mueller * v0.9.41 diff --git a/SOGo/UI/Mailer/Images/title_attachment_14x14.png b/SOGo/UI/Mailer/Images/title_attachment_14x14.png index d8af1b02f8111f6cbe5780644c8eb0c1c89b8729..b9e4667537a4e897fc88add57fc16b75abba4451 100644 GIT binary patch delta 415 zcmV;Q0bu^Z006Lfe02gnPU&TfM z00AUPL_t(|+G70w|33pc03d*vunBHjx9q>ZuFii}Ru(YU*MHOfzj^&~6dM2nh!LBO z8tQ8QwKUZj@^aF^{0Wn0GTgd-hvC}wn~X3u00G1R(uj^385#c{J+S>hj1OXi#E{hh z1Q3db;6T6sP#65iCkDa*0feFvCW)*Fn-~ZK1P~JgnE)Vw$kqrDKrGkptLVxqvp&kFVwKV=48R-2tG|>I8qoWB7;T;&E3J^djHcCo}GaNp0oMCc* z2g9nh8^B`Wp@9sCjvQlN>h7vazxK|NkGZ0Dqx$?fOl~#-nkuxD^i| zK`DA*F)}j#`t|Go|No4Pj5w7tGBW=D^IJ<(J-49zKf`}*ZH-^Qej{r@D3z2DKYZl) zU_~<>~63EGsMP<>{)Ut$Fz9$*%4RIaw*H zD#}=*VEeAU^D7oCdGh2L0|SGsjC4{$jE9>O&e*~O03SMD1bzfkrvLx|07*qoM6N<$ Eg0MP|zyJUM diff --git a/SOGo/UI/Mailer/Images/title_config.png b/SOGo/UI/Mailer/Images/title_config.png index 34e76e068f64a293a5d06925d31b881fa1ef23fd..eb5d46fdd4d5566bcaf313198b564dda63ba77f1 100644 GIT binary patch delta 233 zcmeBS{KYsyvYw5BfkECw_aczuEbxddW?I(3R2di=ni&{={s+=885l|p7#Ln9FfdrnU|pA>)84XC!j)5S5Q;#Sh1 z|NrfoEg2LVBu-xC5O7GzX5moS;RXavYDo-NjSk&lU~E|==-R{}uh4K}n;?w122^Wd zD#Qeo4Ocd+KYWFOMc~|lMr{WncQXlvh7K==8!^m4zopr09e~arT_o{ delta 122 zcmeyx*uywMvY3g1fnkEyt~MYQ?CIhdQgJKUrZz{Pxv-(LF~gxLNQ@&j>uHZS>z!7e z8BWW>&Yj393BKsEG0LfF<&;*2A`j)wksG8Mo`rR=xpB1Ww5u_h&k*!KqV&7JA?TB` Z7(@JOt!THl9$TRC44$rjF6*2UngE}KEOr0@ diff --git a/SOGo/UI/Mailer/Images/title_junk.png b/SOGo/UI/Mailer/Images/title_junk.png index b62fec9ab62b4f67f4b0c5a8695b1a8d8dc94f51..4fdeb5d273a6ce2da358ba066a77bc47f3633c1d 100644 GIT binary patch delta 425 zcmV;a0apIt0=NT^8Gi-<0019IEztk~010qNS#tmY3ljhU3ljkVnw%H_000DMK}|sb z0I`mI`%#ks001CkNK#Dz0D2_=0Dyx40Qvs_0D$QL0Cg|`0P0`>06Lfe02gnPU&TfM z00AyZL_t(|+G70w|33pc03d*v7{~+w0feEkslMXBx|;HTR)1DjFb1)k8mcgy1rR_C zAg98xpO43X0e-&!b=9T+_wC#O#vrz^kl=rRU$6hjY5@WW&S0RjjvsidgzAEddbvl**qkj*N}if}Q20D?;}Gc*6+zh@Iz0-I)# zvsqY};e3DqVt+yQD-0Bu)i8pDDr=j;Qh7xcjObwl5I}H^@^W$vhYlTOaB%j;s`=gf z_dqqWaE$-~gyIKL5t09Uwy#I=8_e0D&<2G8OdKG9P@==z)9t^Ah%h+x4(!IawIAH7c zT?Y>z`}O;eu#gZhFE1}IudlbqvL$nl96i2m$1W75iI`oY6TC`$kT{|{kcszwhic{#a5hmK;ZK6v<; zyqqjVoH;Eyo`HdZgM)qAjCnp@?i?KK3=9kk^0G>b3N`huXU?2UPfbu$RYsWV>+NA? zY7`NhvTet%uSws&fBp9T>(?)=tSq)RmfoIj5H*a*5xaToj-|_2-+%Ckk&#hBUN$Bw i%*V?eF3U)hGynkEw0rbY95f{W000006Lfe02gnPU&TfM z00Bu!L_t(|+G70w|33pc03d*v7{~+w0YtV&fB+&}BR~L=t$z_9fWR7Cn`-`Zb94Xi zXsJU9snf^y{x>r<`p?hL|9{@BDJXIP0mJ|bRWUJ<|FKbF|3yVb{vSWQ^FK%ogy+qk z{9j#7^?zes`F|cBp8qqZ_QB-<0*DbrfD~KWx-+V)sr+YVW@dQz?mdI1raFUzoi)ST zx9=EOSXdZl&3|3U@cZ{4hW?&bhOFEYMt}fffSCZoX(@64)l`-LuUS6-zp07ge{nI< z|Ms?4|A89+PoLcLzql|5ECx~w5I`7#!_UvhASEryASfuvU}0{`P+F7=w2_%XPELkF zURH+T=g*&DbpQc`V&ncjoBr$RX#ZzpWBsq9toVQ1#yyo_)05((|8sJ3{O9B2``_MN u3l;+iAVzYN96$h(9ghG3M7BnN00RJd=#mUWp_6<700007=PMg9Ci}CQbkI_YXw$%C+mCK7A=J$jmRUJbV5k zM3C|HvAw_l{AOigjgC)aW@di(?!Bg_x`Und+qdsnSXgGwU4Qud_n-crRx=YLCI$uu zRu)zU1_lRv>%V{hPMz5G_3PK^Gv{5pe0B1)**zUix!Gw=EnVo|;^*g+l9m({6tplm zEiKArVPTe&laZH|`T6rF0|NsKTwP>D$cYnY9bA0nWMwAxb%=_JM1_ZhL?p1XvQ?Jm fL)|){Q2+ox$P!wh^OJ{K00000NkvXXu0mjf{n?2g diff --git a/SOGo/UI/Mailer/Images/title_sortdown_12x12.png b/SOGo/UI/Mailer/Images/title_sortdown_12x12.png index 1a77d1eefa08729e071e549c55a2d46822200edb..30ff16f852e40761ea49fd52b2ab3911c0473974 100644 GIT binary patch delta 239 zcmbQj*uXSFvYw5Bfg!9k<~fk!EbxddW?I(3R2di=ni&{={s+=885l|p7#Ln9FfdrnU|pA>)84XC!v)5S5Q;#ShH z|NrfoH6;`pW=MFjFfh7oVryVXYBc=x>C?ZA$H5kvmsH#Ycm*7EcBo8X=yGIWJksK> zXw-0;kwrk!KEXm*p~0X@*WCQOz0iOAT{aF3iCY<^7$TS%f#z{kNF9y`YT($^Cc+@# fpyDp$(7?!`sS(+t_EG;L&K@ov*Ljx4lD{@g4``pTWXlYUhX)- z(4v&0$YHRtBq<@mqPRx>kX1^iMZ<~%FV#8>BV^>nB^%xt?J$h+0jZy5_@e89p0in7 gV`JmQEJZ#B-(S*Vds&=r zc3?={ns{l6XOBad;A|NO2E&Jja~W50y7B;Z7R=}qW?&Hzmb)yu;U}v?Lj*^K)Xg*l oUIB-mCC5x07$(XTGBC0+6sSur+A-^?H_&zlPgg&ebxsLQ0Q!nVmjD0& literal 0 HcmV?d00001 diff --git a/SOGo/UI/Mailer/Images/title_thread.png b/SOGo/UI/Mailer/Images/title_thread.png index 8762589ecb16f51ce4097b025fb8716bec544282..aed73319d23bdd040e60e2126961b2966c56087e 100644 GIT binary patch delta 478 zcmV<40U`dM1MLHl8Gi-<0019IEztk~010qNS#tmY3ljhU3ljkVnw%H_000DMK}|sb z0I`mI`%#ks001CkNK#Dz0D2_=0Dyx40Qvs_0D$QL0Cg|`0P0`>06Lfe02gnPU&TfM z00Co3L_t(|+G70w|33pc03d)EKpJ6q#nQR|Jw06ii;0Q+XMbT~0b_A7QLq?D4p}Wg z0Kpk)DRKWfIXV6Z2m1b>Gh^ca{d+cnF^C-$-~*P+NKJri1_&T9QBzg?Ur^}{ku2*XMbj92CD-IASO@%2@4A`T)23JU_kEOcZfkoS`y3#2q3UYMfq9a(A&Ck z1x{N*fyBkd^?zb-J6H`s0Kp}~Lj(Ww@NoZ6N{IQtZskH018ORZ|8sG2{;#hogNp+M z5Q?d@r}zK2wlo790P=TgQY=^@2M5Q0kQ}mFfB?c75LZnNRsSW##lUe1N(g(luSd}c z5I}fC(Z$LBzo@7P*l#V3)hHSP0*HZ76x3Ch{+E%F`tR@Sg`yE4fEdY5*+*=2d8Ehh<}QS_<4IWF)%R9oxilI zybxI(9LUSdRg@LXowtO6fq{vEf#K!LSLUY1xO`(~YV`8eYp7CTVWA5bui#R;ci$ly zX-TNk*r>49j^0KfZii+^*So$L{T#lXOD;o_wQiiz_Fa3YO`j7L75eATA4LTPxB@0j_j$TG>u76+MJBPav7I<|1}@H=mK=|% u+QrG9kB|4pt=s?qGuYW$p+qb(004YWfsWV%F(3c{00{s|MNUMnLSTaFdCf-v diff --git a/SOGo/UI/Mailer/UIxMailListView.m b/SOGo/UI/Mailer/UIxMailListView.m index c1014889..cc5c9230 100644 --- a/SOGo/UI/Mailer/UIxMailListView.m +++ b/SOGo/UI/Mailer/UIxMailListView.m @@ -31,6 +31,12 @@ id message; } +- (NSString *)defaultSortKey; +- (NSString *)imap4SortKey; +- (NSString *)imap4SortOrdering; + +- (BOOL)isSortedDescending; + @end #include "common.h" @@ -115,13 +121,24 @@ static int attachmentFlagSize = 8096; sort = [[[self context] request] formValueForKey:@"sort"]; - // TODO: reversed sorts - if ([sort length] == 0) sort = [self defaultSortKey]; return [sort uppercaseString]; } +- (BOOL)isSortedDescending { + return [[[self context] request] formValueForKey:@"desc"] ? YES : NO; +} + +- (NSString *)imap4SortOrdering { + NSString *sort; + + sort = [self imap4SortKey]; + if(![self isSortedDescending]) + return sort; + return [@"REVERSE " stringByAppendingString:sort]; +} + - (NSRange)fetchRange { if (self->firstMessageNumber == 0) return NSMakeRange(0, 50); @@ -134,7 +151,7 @@ static int attachmentFlagSize = 8096; self->sortedUIDs = [[[self clientObject] fetchUIDsMatchingQualifier:[self qualifier] - sortOrdering:[self imap4SortKey]] retain]; + sortOrdering:[self imap4SortOrdering]] retain]; return self->sortedUIDs; } - (unsigned int)totalMessageCount { diff --git a/SOGo/UI/Mailer/UIxMailListView.wox b/SOGo/UI/Mailer/UIxMailListView.wox index d33fa476..21456504 100644 --- a/SOGo/UI/Mailer/UIxMailListView.wox +++ b/SOGo/UI/Mailer/UIxMailListView.wox @@ -10,7 +10,8 @@ title="name" >
- :, + :,