Changeset 102 for trunk/Cocoa/Pester/Source/PSAlarmNotifierController.m

Timestamp:

02/23/03 04:55:07 (21 years ago)

Author:

Nicholas Riley

Message:

Pester 1.1b3

File:

• trunk/Cocoa/Pester/Source/PSAlarmNotifierController.m (modified) (5 diffs)

trunk/Cocoa/Pester/Source/PSAlarmNotifierController.m

@@ -11 +11 @@
 #import "PSAlarm.h"
 #import "PSNotifierAlert.h"
+#import "PSSnoozeUntilController.h"
 #import "NJRIntervalField.h"
 
@@ -24 +25 @@
 @implementation PSAlarmNotifierController
 
-// XXX should use NSNonactivatingPanelMask on 10.2
+// XXX should use NSNonactivatingPanelMask on 10.2?
 
 - (id)initWithAlarm:(PSAlarm *)anAlarm;
@@ -34 +35 @@
         [messageField setStringValue: [alarm message]];
         [dateField setStringValue: [alarm dateTimeString]];
-        if (![snoozeIntervalField setInterval: [alarm snoozeInterval]] &&
-            ![snoozeIntervalField setInterval: [[[NSUserDefaults standardUserDefaults] objectForKey: PSAlarmSnoozeInterval] doubleValue]])
-            [snoozeIntervalField setInterval: 15 * 60]; // 15 minutes
+        if (![self setSnoozeInterval: [alarm snoozeInterval]] &&
+            ![self setSnoozeInterval: [[[NSUserDefaults standardUserDefaults] objectForKey: PSAlarmSnoozeInterval] doubleValue]])
+            [self setSnoozeInterval: 15 * 60]; // 15 minutes
         if ([alarm isRepeating]) {
             [intervalField setStringValue:
@@ -75 +76 @@
 - (void)update:(id)sender;
 {
-    canSnooze = [snoozeIntervalField interval] != 0;
+    snoozeInterval = [snoozeIntervalField interval];
+    canSnooze = (snoozeInterval > 0);
     if (canSnooze) [nextDateField setStringValue: @"after snooze"];
     [snoozeButton setEnabled: canSnooze];
@@ -89 +91 @@
 }
 
+- (IBAction)snoozeUntil:(NSMenuItem *)sender;
+{
+    [PSSnoozeUntilController snoozeUntilControllerWithNotifierController: self];
+}
+
+- (IBAction)snoozeIntervalUnitsChanged:(NSPopUpButton *)sender;
+{
+    if ([[sender selectedItem] tag] > 0) [self update: nil];
+}
+
+- (NSTimeInterval)snoozeInterval;
+{
+    return snoozeInterval;
+}
+
+- (BOOL)setSnoozeInterval:(NSTimeInterval)interval;
+{
+    snoozeInterval = interval;
+    return [snoozeIntervalField setInterval: interval];
+}
+
 - (IBAction)snooze:(NSButton *)sender;
 {
-    NSTimeInterval snoozeInterval = [snoozeIntervalField interval];
+    snoozeInterval = [snoozeIntervalField interval];
     [alarm setSnoozeInterval: snoozeInterval];
     [[NSUserDefaults standardUserDefaults] setObject: [NSNumber numberWithDouble: snoozeInterval] forKey: PSAlarmSnoozeInterval];
     [self close: sender];
+}
+
+- (void)snoozeUntilDate:(NSCalendarDate *)date;
+{
+    [alarm setSnoozeInterval: [date timeIntervalSinceNow]];
+    [self close: self];
 }