Changeset 53 for trunk/Cocoa/Pester/Source/PSAlarm.h

Timestamp:

01/02/03 05:30:03 (21 years ago)

Author:

Nicholas Riley

Message:

Updated for Pester 1.1a5 (very limited release).

Pester 1.1a4 was never released.

Location:

trunk/Cocoa/Pester/Source

Files:

• . (modified) (1 prop)
• PSAlarm.h (modified) (3 diffs)

trunk/Cocoa/Pester/Source

@@ -1 +1 @@
 build
+.gdb_history

@@ -1 +1 @@
 build
+.gdb_history

trunk/Cocoa/Pester/Source/PSAlarm.h

@@ -8 +8 @@
 
 #import <Foundation/Foundation.h>
+#import "PSPropertyListSerialization.h"
 
 typedef enum {
-    PSAlarmInvalid, PSAlarmInterval, PSAlarmDate, PSAlarmSet
+    PSAlarmInvalid, // incorrectly specified
+    PSAlarmInterval, // interval specified (possibly repeating)
+    PSAlarmDate, // date specified
+    PSAlarmSet, // pending, timer set
+    PSAlarmSnooze, // expired alarm with snooze interval set (possibly repeating)
+    PSAlarmExpired // expired alarm (possibly repeating)
 } PSAlarmType;
 
 extern NSString * const PSAlarmTimerSetNotification;
 extern NSString * const PSAlarmTimerExpiredNotification;
+extern NSString * const PSAlarmDiedNotification;
 
-// XXX figure out how to support reading old alarms
+@class PSAlert, PSAlerts;
 
-@class PSAlert;
-
-@interface PSAlarm : NSObject <NSCoding> {
-    PSAlarmType alarmType;
+@interface PSAlarm : NSObject <NSCoding, PSPropertyListSerialization> {
+    PSAlarmType alarmType; // changes during lifetime of alarm; more like a state
     NSCalendarDate *alarmDate;
     NSTimeInterval alarmInterval;
+    NSTimeInterval snoozeInterval;
+    NSTimeInterval timeRemaining;
     NSString *alarmMessage;
     NSString *invalidMessage;
     NSTimer *timer;
-    NSMutableArray *alerts;
+    PSAlerts *alerts;
+    BOOL repeating;
 }
 
@@ -34 +42 @@
 - (void)setForDate:(NSDate *)date atTime:(NSDate *)time;
 - (void)setMessage:(NSString *)aMessage;
-- (void)addAlert:(PSAlert *)alert;
-- (void)removeAlerts;
+- (void)setAlerts:(PSAlerts *)theAlerts;
+- (void)setRepeating:(BOOL)isRepeating;
+- (void)setSnoozeInterval:(NSTimeInterval)anInterval;
 
 - (NSCalendarDate *)date;
 - (NSCalendarDate *)time;
 - (NSTimeInterval)interval;
+- (NSTimeInterval)timeRemaining;
 - (NSString *)message;
-- (NSArray *)alerts;
+- (PSAlerts *)alerts;
+- (BOOL)isRepeating;
+- (NSTimeInterval)snoozeInterval; // most recent interval (nonzero return does not indicate alarm is snoozing or set to snooze)
 
 - (NSString *)dateString;
 - (NSString *)shortDateString;
 - (NSString *)timeString;
+- (NSString *)dateTimeString; // current or next alarm time
+- (NSString *)nextDateTimeString; // next alarm time
+- (NSString *)intervalString;
 - (NSString *)timeRemainingString;
 
@@ -51 +66 @@
 - (NSString *)invalidMessage;
 
+- (NSAttributedString *)prettyDescription;
+
 - (NSComparisonResult)compareDate:(PSAlarm *)otherAlarm;
 - (NSComparisonResult)compareMessage:(PSAlarm *)otherAlarm;
 
-- (BOOL)setTimer;
+- (BOOL)setTimer; // or die, if expired and no snooze/repeat
 - (void)cancelTimer;
 
+// 1.1 only, going away when we move to keyed archiving
+- (NSDictionary *)propertyListRepresentation;
+- (id)initWithPropertyList:(NSDictionary *)dict;
+
 @end

@@ -1 +1 @@
 build
+.gdb_history