Monotone-Parent: 77d6f1cf85f2204c8e5f316ee513551508049ec9
Monotone-Revision: 1487f5359ed75a8c1f5df8db9a25b561e7e5978c Monotone-Author: crobert@inverse.ca Monotone-Date: 2009-06-30T20:10:09 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
784f5bffcc
commit
9b5e7361e3
|
@ -2,6 +2,8 @@
|
||||||
|
|
||||||
* UI/WebServerResources/MailerUI.js: Added drag & drop support!
|
* UI/WebServerResources/MailerUI.js: Added drag & drop support!
|
||||||
* UI/MailPartViewers/UIxMailPartHTMLViewer.m: Removed an extra NSLog
|
* UI/MailPartViewers/UIxMailPartHTMLViewer.m: Removed an extra NSLog
|
||||||
|
* UI/MailerUI/UIxMailListView.m: Added support for "Size" column, fixed a
|
||||||
|
bug when number of columns != 7.
|
||||||
|
|
||||||
2009-06-29 Cyril Robert <crobert@inverse.ca>
|
2009-06-29 Cyril Robert <crobert@inverse.ca>
|
||||||
|
|
||||||
|
|
|
@ -110,6 +110,18 @@
|
||||||
return [dateFormatter formattedDateAndTime: messageDate];
|
return [dateFormatter formattedDateAndTime: messageDate];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (NSString *) messageSize
|
||||||
|
{
|
||||||
|
NSString *rc;
|
||||||
|
int size;
|
||||||
|
|
||||||
|
size = [[message valueForKey: @"size"] intValue];
|
||||||
|
|
||||||
|
rc = [NSString stringWithFormat: @"%dK", size/1024];
|
||||||
|
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// Priorities are defined like this:
|
// Priorities are defined like this:
|
||||||
//
|
//
|
||||||
|
@ -651,7 +663,7 @@
|
||||||
searchValue = [request formValueForKey: @"value"];
|
searchValue = [request formValueForKey: @"value"];
|
||||||
if ([searchValue length])
|
if ([searchValue length])
|
||||||
[self _setQualifierForCriteria: searchCriteria
|
[self _setQualifierForCriteria: searchCriteria
|
||||||
andValue: searchValue];
|
andValue: searchValue];
|
||||||
|
|
||||||
firstMessageNumber
|
firstMessageNumber
|
||||||
= ((specificMessage)
|
= ((specificMessage)
|
||||||
|
@ -761,6 +773,13 @@
|
||||||
[columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns
|
[columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns
|
||||||
forKeys: tmpKeys]
|
forKeys: tmpKeys]
|
||||||
forKey: @"Priority"];
|
forKey: @"Priority"];
|
||||||
|
|
||||||
|
tmpColumns
|
||||||
|
= [NSArray arrayWithObjects: @"tbtv_headercell", @"sizeHeader",
|
||||||
|
@"Size", nil];
|
||||||
|
[columnsMetaData setObject: [NSDictionary dictionaryWithObjects: tmpColumns
|
||||||
|
forKeys: tmpKeys]
|
||||||
|
forKey: @"Size"];
|
||||||
|
|
||||||
return columnsMetaData;
|
return columnsMetaData;
|
||||||
}
|
}
|
||||||
|
@ -777,11 +796,11 @@
|
||||||
if (![defaultsOrder count])
|
if (![defaultsOrder count])
|
||||||
{
|
{
|
||||||
defaultsOrder = [[NSUserDefaults standardUserDefaults]
|
defaultsOrder = [[NSUserDefaults standardUserDefaults]
|
||||||
arrayForKey: @"SOGoMailListViewColumnsOrder"];
|
arrayForKey: @"SOGoMailListViewColumnsOrder"];
|
||||||
if (![defaultsOrder count])
|
if (![defaultsOrder count])
|
||||||
defaultsOrder = [NSArray arrayWithObjects: @"Invisible",
|
defaultsOrder = [NSArray arrayWithObjects: @"Invisible",
|
||||||
@"Attachment", @"Subject", @"From",
|
@"Attachment", @"Subject", @"From",
|
||||||
@"Unread", @"Date", @"Priority", nil];
|
@"Unread", @"Date", @"Priority", nil];
|
||||||
}
|
}
|
||||||
userDefinedOrder = [NSMutableArray arrayWithArray: defaultsOrder];
|
userDefinedOrder = [NSMutableArray arrayWithArray: defaultsOrder];
|
||||||
|
|
||||||
|
@ -802,6 +821,11 @@
|
||||||
notFoundMarker: @""];
|
notFoundMarker: @""];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (NSString *) columnsDisplayCount
|
||||||
|
{
|
||||||
|
return [NSString stringWithFormat: @"%d", [[self columnsDisplayOrder] count]];
|
||||||
|
}
|
||||||
|
|
||||||
- (NSString *) columnTitle
|
- (NSString *) columnTitle
|
||||||
{
|
{
|
||||||
return [self labelForKey: [currentColumn objectForKey: @"value"]];
|
return [self labelForKey: [currentColumn objectForKey: @"value"]];
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
</var:foreach>
|
</var:foreach>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="tableview"
|
<tr class="tableview"
|
||||||
><td colspan="7" class="tbtv_navcell"
|
><td var:colspan="columnsDisplayCount" class="tbtv_navcell"
|
||||||
><var:if condition="hasPrevious">
|
><var:if condition="hasPrevious">
|
||||||
<a href="#"
|
<a href="#"
|
||||||
idx="1"><var:string label:value="first"/></a> |
|
idx="1"><var:string label:value="first"/></a> |
|
||||||
|
@ -132,6 +132,12 @@
|
||||||
><var:string value="messagePriority"
|
><var:string value="messagePriority"
|
||||||
/><entity name="nbsp"
|
/><entity name="nbsp"
|
||||||
/></td
|
/></td
|
||||||
|
></var:if
|
||||||
|
><var:if condition="currentColumn.value" const:value="Size"
|
||||||
|
><td class="messagePriorityColumn"
|
||||||
|
><var:string value="messageSize"
|
||||||
|
/><entity name="nbsp"
|
||||||
|
/></td
|
||||||
></var:if>
|
></var:if>
|
||||||
</var:foreach>
|
</var:foreach>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
Loading…
Reference in a new issue