mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-07-03 15:54:18 +00:00
Monotone-Parent: 91b936a7c3b51400c8170802ad0c722be8b8553b
Monotone-Revision: 6d9008be8a9f9eeb652c345572bad88c284033f6 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-09-05T18:42:18 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
+33
-24
@@ -114,6 +114,7 @@ static BOOL uixDebugEnabled = NO;
|
||||
if ((self = [super init]))
|
||||
{
|
||||
viewTimeZone = nil;
|
||||
selectedDate = nil;
|
||||
}
|
||||
|
||||
return self;
|
||||
@@ -124,6 +125,8 @@ static BOOL uixDebugEnabled = NO;
|
||||
[self->queryParameters release];
|
||||
if (viewTimeZone)
|
||||
[viewTimeZone release];
|
||||
if (selectedDate)
|
||||
[selectedDate release];
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
@@ -341,27 +344,38 @@ static BOOL uixDebugEnabled = NO;
|
||||
return GMT;
|
||||
}
|
||||
|
||||
- (NSCalendarDate *)selectedDate {
|
||||
NSString *s;
|
||||
- (NSCalendarDate *) selectedDate
|
||||
{
|
||||
NSString *s, *dateString;
|
||||
NSCalendarDate *cdate;
|
||||
unsigned hour, minute;
|
||||
|
||||
s = [self queryParameterForKey:@"day"];
|
||||
cdate = ([s length] > 0)
|
||||
? [self dateForDateString:s]
|
||||
: [NSCalendarDate date];
|
||||
[cdate setTimeZone:[self viewTimeZone]];
|
||||
s = [self queryParameterForKey:@"hm"];
|
||||
if([s length] == 4) {
|
||||
unsigned hour, minute;
|
||||
|
||||
hour = [[s substringToIndex:2] unsignedIntValue];
|
||||
minute = [[s substringFromIndex:2] unsignedIntValue];
|
||||
cdate = [cdate hour:hour minute:minute];
|
||||
}
|
||||
else {
|
||||
cdate = [cdate hour:12 minute:0];
|
||||
}
|
||||
return cdate;
|
||||
if (!selectedDate)
|
||||
{
|
||||
s = [self queryParameterForKey: @"day"];
|
||||
if ([s length] > 0)
|
||||
{
|
||||
dateString = [s stringByAppendingFormat: @" %@",
|
||||
[[self viewTimeZone] abbreviation]];
|
||||
cdate = [NSCalendarDate dateWithString: dateString
|
||||
calendarFormat: @"%Y%m%d %Z"];
|
||||
}
|
||||
else
|
||||
cdate = [NSCalendarDate date];
|
||||
s = [self queryParameterForKey: @"hm"];
|
||||
if ([s length] == 4)
|
||||
{
|
||||
hour = [[s substringToIndex: 2] unsignedIntValue];
|
||||
minute = [[s substringFromIndex: 2] unsignedIntValue];
|
||||
selectedDate = [cdate hour: hour minute: minute];
|
||||
}
|
||||
else
|
||||
selectedDate = [cdate hour: 12 minute: 0];
|
||||
|
||||
[selectedDate retain];
|
||||
}
|
||||
|
||||
return selectedDate;
|
||||
}
|
||||
|
||||
- (NSString *)dateStringForDate:(NSCalendarDate *)_date {
|
||||
@@ -369,11 +383,6 @@ static BOOL uixDebugEnabled = NO;
|
||||
return [_date descriptionWithCalendarFormat:@"%Y%m%d"];
|
||||
}
|
||||
|
||||
- (NSCalendarDate *)dateForDateString:(NSString *)_dateString {
|
||||
return [NSCalendarDate dateWithString:_dateString
|
||||
calendarFormat:@"%Y%m%d"];
|
||||
}
|
||||
|
||||
- (BOOL) hideFrame
|
||||
{
|
||||
return ([[self queryParameterForKey: @"noframe"] boolValue]);
|
||||
|
||||
Reference in New Issue
Block a user