Index: trunk/Cocoa/Pester/Source/English.lproj/MainMenu.nib/classes.nib
===================================================================
--- trunk/Cocoa/Pester/Source/English.lproj/MainMenu.nib/classes.nib (revision 515)
+++ trunk/Cocoa/Pester/Source/English.lproj/MainMenu.nib/classes.nib (revision 516)
@@ -19,4 +19,12 @@
+ CLASS
+ NSDisclosureButtonCell
+ LANGUAGE
+ ObjC
+ SUPERCLASS
+ NSButtonCell
+
+
ACTIONS
@@ -59,5 +67,5 @@
NSTextField
bounceDockIcon
- NSButton
+ NSButtonCell
cancelButton
NSButton
@@ -119,12 +127,4 @@
- CLASS
- NSDisclosureButtonCell
- LANGUAGE
- ObjC
- SUPERCLASS
- NSButtonCell
-
-
ACTIONS
@@ -182,4 +182,18 @@
CLASS
+ NJRUnfocusableMovieView
+ LANGUAGE
+ ObjC
+ SUPERCLASS
+ NSMovieView
+
+
+ CLASS
+ NSObject
+ LANGUAGE
+ ObjC
+
+
+ CLASS
FirstResponder
LANGUAGE
@@ -187,18 +201,4 @@
SUPERCLASS
NSObject
-
-
- CLASS
- NJRUnfocusableMovieView
- LANGUAGE
- ObjC
- SUPERCLASS
- NSMovieView
-
-
- CLASS
- NSObject
- LANGUAGE
- ObjC
@@ -235,4 +235,12 @@
SUPERCLASS
NSObject
+
+
+ CLASS
+ NSWindow
+ LANGUAGE
+ ObjC
+ SUPERCLASS
+ NSResponder
Index: trunk/Cocoa/Pester/Source/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/Cocoa/Pester/Source/English.lproj/MainMenu.nib/info.nib (revision 515)
+++ trunk/Cocoa/Pester/Source/English.lproj/MainMenu.nib/info.nib (revision 516)
@@ -8,8 +8,8 @@
../Pester.xcodeproj
IBOldestOS
- 5
+ 4
IBOpenObjects
- 2
+ 525
IBSystem Version
Index: trunk/Cocoa/Pester/Source/PSDockBounceAlert.m
===================================================================
--- trunk/Cocoa/Pester/Source/PSDockBounceAlert.m (revision 515)
+++ trunk/Cocoa/Pester/Source/PSDockBounceAlert.m (revision 516)
@@ -9,6 +9,10 @@
#import
#import "PSDockBounceAlert.h"
+#import "PSAlarmAlertController.h"
+
+#include
static PSDockBounceAlert *PSDockBounceAlertShared;
+static NMRec nmr;
@implementation PSDockBounceAlert
@@ -16,18 +20,33 @@
+ (PSAlert *)alert;
{
- if (PSDockBounceAlertShared == nil)
+ if (PSDockBounceAlertShared == nil) {
PSDockBounceAlertShared = [[PSDockBounceAlert alloc] init];
+
+ [[NSNotificationCenter defaultCenter] addObserver: PSDockBounceAlertShared selector: @selector(_stopBouncing) name: PSAlarmAlertStopNotification object: nil];
+
+ bzero(&nmr, sizeof(nmr));
+ nmr.nmMark = 1;
+ nmr.qType = nmType;
+ }
+
return PSDockBounceAlertShared;
}
-+ (void)stopBouncing;
+- (void)_stopBouncing;
{
- [NSApp cancelUserAttentionRequest: NSInformationalRequest];
+ if ((void *)nmr.nmRefCon != self)
+ return;
+
+ nmr.nmRefCon = 0;
+ NMRemove(&nmr);
}
- (void)triggerForAlarm:(PSAlarm *)alarm;
{
- [NSApp requestUserAttention: NSInformationalRequest];
- [[self class] performSelector: @selector(stopBouncing) withObject: nil afterDelay: 1 inModes: [NSArray arrayWithObject: NSDefaultRunLoopMode]];
+ if (nmr.nmRefCon == 0) {
+ nmr.nmRefCon = (long)self;
+ NMInstall(&nmr);
+ }
+
[self completedForAlarm: alarm];
}
@@ -35,5 +54,5 @@
- (NSAttributedString *)actionDescription;
{
- return [@"Bounce dock icon" small];
+ return [@"Bounce Dock icon" small];
}