diff --git a/ChangeLog b/ChangeLog index a154a2e25..8f602141e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-08-22 Wolfgang Sourdeau + * UI/Scheduler/UIxCalDayView.m ([UIxCalDayView -labelForDay]): new + method to return the current day as a string formatted depending + on the current locale. + * UI/Scheduler/UIxCalAptListView.m ([UIxCalAptListView -startDate]) ([UIxCalAptListView -endDate]): "today" is now the default filter for displayed events. diff --git a/UI/Scheduler/UIxCalDayView.m b/UI/Scheduler/UIxCalDayView.m index a8366ab56..1aa22f66a 100644 --- a/UI/Scheduler/UIxCalDayView.m +++ b/UI/Scheduler/UIxCalDayView.m @@ -20,12 +20,21 @@ */ // $Id: UIxCalDayView.m 663 2005-07-05 18:13:24Z znek $ +#import +#import +#import +#import +#import +#import + +#import + +#import +#import + +#import #import "UIxCalDayView.h" -#include "common.h" -#include -#include - @interface UIxCalDayView (PrivateAPI) - (BOOL)isCurrentDateInApt:(id)_apt; @@ -84,7 +93,7 @@ min = [[self startDate] hour:[self dayStartHour] minute:0]; max = [[self startDate] hour:[self dayEndHour] minute:0]; - aptDateRanges = [[self appointments] valueForKey:@"startDate"]; + aptDateRanges = [[self appointments] valueForKey: @"startDate"]; if([aptDateRanges count] != 0) { NSCalendarDate *d; @@ -158,13 +167,15 @@ /* fetching */ -- (NSCalendarDate *)startDate { +- (NSCalendarDate *) startDate +{ return [[self selectedDate] beginOfDay]; } -- (NSCalendarDate *)endDate { - return [[self startDate] endOfDay]; -} +- (NSCalendarDate *) endDate +{ + return [[self selectedDate] endOfDay]; +} /* appointments */ @@ -248,6 +259,16 @@ return [[self aptsForCurrentDate] count] != 0; } +- (NSString *) labelForDay +{ + SOGoDateFormatter *fmt; + + fmt = [[SOGoDateFormatter alloc] initWithLocale: [self locale]]; + [fmt autorelease]; + + return [fmt stringForObjectValue: [self startDate]]; +} + - (NSString *) _dayNameWithOffsetFromToday: (int) offset { NSCalendarDate *date;