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

Timestamp:

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

Author:

Nicholas Riley

Message:

Pester 1.1b3

File:

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

trunk/Cocoa/Pester/Source/PSApplication.m

@@ -11 +11 @@
 #import "PSAlarmAlertController.h"
 #import "PSAlarmsController.h"
+#import "NJRReadMeController.h"
 #import "PSAlarm.h"
 #import "PSAlarms.h"
@@ -30 +31 @@
 - (IBAction)showHelp:(id)sender;
 {
-    [[NSWorkspace sharedWorkspace] openFile: [[NSBundle mainBundle] pathForResource: @"Read Me" ofType: @"rtfd"]];
+    [NJRReadMeController readMeControllerWithRTFDocument: [[NSBundle mainBundle] pathForResource: @"Read Me" ofType: @"rtfd"]];
 }
 
@@ -154 +155 @@
 - (BOOL)applicationShouldHandleReopen:(NSApplication *)sender hasVisibleWindows:(BOOL)flag;
 {
-    if (!flag && ![[PSAlarms allAlarms] alarmsExpiring]) [alarmSetController showWindow: self];
+    // XXX sometimes alarmsExpiring is NO (?), and we display the alarm set controller on top of an expiring alarm, try to reproduce
+    if (!flag && ![[PSAlarms allAlarms] alarmsExpiring] && [NSApp modalWindow] == nil)
+        [alarmSetController showWindow: self];
     return YES;
 }
@@ -215 +218 @@
 }
 
+// calendar window (running in modal session) will appear even when app is in background; shouldn't
+- (void)applicationWillBecomeActive:(NSNotification *)notification;
+{
+    NSWindow *modalWindow = [NSApp modalWindow];
+    if (modalWindow != nil) [modalWindow makeKeyAndOrderFront: nil];
+}
+
+- (void)applicationWillResignActive:(NSNotification *)notification;
+{
+    NSWindow *modalWindow = [NSApp modalWindow];
+    if (modalWindow != nil) [modalWindow orderOut: nil];
+}
+
 @end