Changeset 608 for trunk/Cocoa/Pester/Source/PSAlarm.m

Timestamp:

12/21/09 22:13:21 (14 years ago)

Author:

Nicholas Riley

Message:

Display "today" or "tomorrow" when setting an alarm.

File:

• trunk/Cocoa/Pester/Source/PSAlarm.m (modified) (4 diffs)

trunk/Cocoa/Pester/Source/PSAlarm.m

@@ -29 +29 @@
 
 static NSDateFormatter *dateFormatter, *shortDateFormatter, *timeFormatter;
+
+static NSCalendar *gregorianCalendar;
+
+static NSDate *midnightOnDate(NSDate *date) {
+    return [gregorianCalendar dateFromComponents: 
+            [gregorianCalendar components: NSMonthCalendarUnit|NSDayCalendarUnit|NSYearCalendarUnit fromDate: date]];
+}
 
 @implementation PSAlarm
@@ -46 +53 @@
     [timeFormatter setTimeStyle: NSDateFormatterMediumStyle];
     [timeFormatter setDateStyle: NSDateFormatterNoStyle];
+    gregorianCalendar = [[NSCalendar alloc] initWithCalendarIdentifier: NSGregorianCalendar];
 }
 
@@ -246 +254 @@
 }
 
+- (NSDate *)midnightOnDate;
+{
+    if (alarmType == PSAlarmInterval) [self _setDateFromInterval];
+    
+    return midnightOnDate(alarmDate);
+}
+
 - (NSDate *)time;
 {
@@ -251 +266 @@
     if (alarmType == PSAlarmInterval) [self _setDateFromInterval];
 
-    NSCalendar *calendar = [NSCalendar currentCalendar];
-
-    return [calendar dateFromComponents: 
-            [calendar components: NSHourCalendarUnit|NSMinuteCalendarUnit|NSSecondCalendarUnit fromDate: alarmDate]];
+    return [gregorianCalendar dateFromComponents: 
+            [gregorianCalendar components: NSHourCalendarUnit|NSMinuteCalendarUnit|NSSecondCalendarUnit fromDate: alarmDate]];
+}
+
+- (int)daysFromToday;
+{
+    if (alarmType == PSAlarmInterval) [self _setDateFromInterval];
+    
+    return [[gregorianCalendar components: NSDayCalendarUnit fromDate: midnightOnDate([NSDate date]) toDate: alarmDate options: 0] day];
 }