Monotone-Parent: 345979d6c93d231dc9fbc75bb84322c6b400f189
Monotone-Revision: dc9546aa264cf85f1f6b8f2ec57bc434090e2acf Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-08-22T19:23:58 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
b73223133f
commit
47e25ea44c
|
@ -1,5 +1,9 @@
|
||||||
2006-08-22 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
2006-08-22 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
|
* 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])
|
* UI/Scheduler/UIxCalAptListView.m ([UIxCalAptListView -startDate])
|
||||||
([UIxCalAptListView -endDate]): "today" is now the default filter
|
([UIxCalAptListView -endDate]): "today" is now the default filter
|
||||||
for displayed events.
|
for displayed events.
|
||||||
|
|
|
@ -20,12 +20,21 @@
|
||||||
*/
|
*/
|
||||||
// $Id: UIxCalDayView.m 663 2005-07-05 18:13:24Z znek $
|
// $Id: UIxCalDayView.m 663 2005-07-05 18:13:24Z znek $
|
||||||
|
|
||||||
|
#import <Foundation/NSArray.h>
|
||||||
|
#import <Foundation/NSCalendarDate.h>
|
||||||
|
#import <Foundation/NSDictionary.h>
|
||||||
|
#import <Foundation/NSKeyValueCoding.h>
|
||||||
|
#import <Foundation/NSString.h>
|
||||||
|
#import <Foundation/NSValue.h>
|
||||||
|
|
||||||
|
#import <EOControl/EOQualifier.h>
|
||||||
|
|
||||||
|
#import <NGExtensions/NSCalendarDate+misc.h>
|
||||||
|
#import <NGExtensions/NGCalendarDateRange.h>
|
||||||
|
|
||||||
|
#import <SOGoUI/SOGoDateFormatter.h>
|
||||||
|
|
||||||
#import "UIxCalDayView.h"
|
#import "UIxCalDayView.h"
|
||||||
#include "common.h"
|
|
||||||
#include <EOControl/EOControl.h>
|
|
||||||
#include <NGExtensions/NGCalendarDateRange.h>
|
|
||||||
|
|
||||||
|
|
||||||
@interface UIxCalDayView (PrivateAPI)
|
@interface UIxCalDayView (PrivateAPI)
|
||||||
- (BOOL)isCurrentDateInApt:(id)_apt;
|
- (BOOL)isCurrentDateInApt:(id)_apt;
|
||||||
|
@ -158,13 +167,15 @@
|
||||||
|
|
||||||
/* fetching */
|
/* fetching */
|
||||||
|
|
||||||
- (NSCalendarDate *)startDate {
|
- (NSCalendarDate *) startDate
|
||||||
|
{
|
||||||
return [[self selectedDate] beginOfDay];
|
return [[self selectedDate] beginOfDay];
|
||||||
}
|
}
|
||||||
- (NSCalendarDate *)endDate {
|
|
||||||
return [[self startDate] endOfDay];
|
|
||||||
}
|
|
||||||
|
|
||||||
|
- (NSCalendarDate *) endDate
|
||||||
|
{
|
||||||
|
return [[self selectedDate] endOfDay];
|
||||||
|
}
|
||||||
|
|
||||||
/* appointments */
|
/* appointments */
|
||||||
|
|
||||||
|
@ -248,6 +259,16 @@
|
||||||
return [[self aptsForCurrentDate] count] != 0;
|
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
|
- (NSString *) _dayNameWithOffsetFromToday: (int) offset
|
||||||
{
|
{
|
||||||
NSCalendarDate *date;
|
NSCalendarDate *date;
|
||||||
|
|
Loading…
Reference in a new issue