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

Timestamp:

10/29/02 22:20:58 (22 years ago)

Author:

Nicholas Riley

Message:

Changes for Pester 1.1d1.

File:

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

trunk/Cocoa/Pester/Source/PSAlarmNotifierController.m

@@ -8 +8 @@
 
 #import "PSAlarmNotifierController.h"
+#import "PSAlarmAlertController.h"
 #import "PSAlarm.h"
 
@@ -13 +14 @@
 
 // XXX should use NSNonactivatingPanelMask on 10.2
-
-+ (PSAlarmNotifierController *)controllerWithTimerExpiredNotification:(NSNotification *)notification;
-{
-    return [[self alloc] initWithAlarm: [notification object]];
-}
 
 - (id)initWithAlarm:(PSAlarm *)alarm;
@@ -25 +21 @@
         [messageField setStringValue: [alarm message]];
         [dateField setObjectValue: [alarm date]];
-        [NSApp requestUserAttention: NSInformationalRequest];
-        [NSApp activateIgnoringOtherApps: YES];
         [[self window] makeKeyAndOrderFront: nil];
         [[self window] orderFrontRegardless];
-        [NSApp cancelUserAttentionRequest: NSInformationalRequest];
-        NSBeep();
     }
     return self;
@@ -37 +29 @@
 - (IBAction)close:(id)sender;
 {
+    [PSAlarmAlertController stopAlerts: sender];
     [self close];
 }