Changeset 516

Timestamp:

05/25/09 02:40:34 (16 years ago)

Author:

Nicholas Riley

Message:

Restore Dock bouncing using Notification Manager; should be more reliable now.

Location:

trunk/Cocoa/Pester/Source

Files:

• English.lproj/MainMenu.nib/classes.nib (modified) (6 diffs)
• English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• English.lproj/MainMenu.nib/keyedobjects.nib (modified) ( previous)
• PSDockBounceAlert.m (modified) (3 diffs)

trunk/Cocoa/Pester/Source/English.lproj/MainMenu.nib/classes.nib

@@ -19 +19 @@
                 </dict>
                 <dict>
+                        <key>CLASS</key>
+                        <string>NSDisclosureButtonCell</string>
+                        <key>LANGUAGE</key>
+                        <string>ObjC</string>
+                        <key>SUPERCLASS</key>
+                        <string>NSButtonCell</string>
+                </dict>
+                <dict>
                         <key>ACTIONS</key>
                         <dict>
@@ -59 +67 @@
                                 <string>NSTextField</string>
                                 <key>bounceDockIcon</key>
-                                <string>NSButton</string>
+                                <string>NSButtonCell</string>
                                 <key>cancelButton</key>
                                 <string>NSButton</string>
@@ -119 +127 @@
                 </dict>
                 <dict>
-                        <key>CLASS</key>
-                        <string>NSDisclosureButtonCell</string>
-                        <key>LANGUAGE</key>
-                        <string>ObjC</string>
-                        <key>SUPERCLASS</key>
-                        <string>NSButtonCell</string>
-                </dict>
-                <dict>
                         <key>ACTIONS</key>
                         <dict>
@@ -182 +182 @@
                 <dict>
                         <key>CLASS</key>
+                        <string>NJRUnfocusableMovieView</string>
+                        <key>LANGUAGE</key>
+                        <string>ObjC</string>
+                        <key>SUPERCLASS</key>
+                        <string>NSMovieView</string>
+                </dict>
+                <dict>
+                        <key>CLASS</key>
+                        <string>NSObject</string>
+                        <key>LANGUAGE</key>
+                        <string>ObjC</string>
+                </dict>
+                <dict>
+                        <key>CLASS</key>
                         <string>FirstResponder</string>
                         <key>LANGUAGE</key>
@@ -187 +201 @@
                         <key>SUPERCLASS</key>
                         <string>NSObject</string>
-                </dict>
-                <dict>
-                        <key>CLASS</key>
-                        <string>NJRUnfocusableMovieView</string>
-                        <key>LANGUAGE</key>
-                        <string>ObjC</string>
-                        <key>SUPERCLASS</key>
-                        <string>NSMovieView</string>
-                </dict>
-                <dict>
-                        <key>CLASS</key>
-                        <string>NSObject</string>
-                        <key>LANGUAGE</key>
-                        <string>ObjC</string>
                 </dict>
                 <dict>
@@ -235 +235 @@
                         <key>SUPERCLASS</key>
                         <string>NSObject</string>
+                </dict>
+                <dict>
+                        <key>CLASS</key>
+                        <string>NSWindow</string>
+                        <key>LANGUAGE</key>
+                        <string>ObjC</string>
+                        <key>SUPERCLASS</key>
+                        <string>NSResponder</string>
                 </dict>
                 <dict>

trunk/Cocoa/Pester/Source/English.lproj/MainMenu.nib/info.nib

@@ -8 +8 @@
         <string>../Pester.xcodeproj</string>
         <key>IBOldestOS</key>
-        <integer>5</integer>
+        <integer>4</integer>
         <key>IBOpenObjects</key>
         <array>
-                <integer>2</integer>
+                <integer>525</integer>
         </array>
         <key>IBSystem Version</key>

trunk/Cocoa/Pester/Source/PSDockBounceAlert.m

@@ -9 +9 @@
 #import <AppKit/AppKit.h>
 #import "PSDockBounceAlert.h"
+#import "PSAlarmAlertController.h"
+
+#include <Carbon/Carbon.h>
 
 static PSDockBounceAlert *PSDockBounceAlertShared;
+static NMRec nmr;
 
 @implementation PSDockBounceAlert
@@ -16 +20 @@
 + (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 +54 @@
 - (NSAttributedString *)actionDescription;
 {
-    return [@"Bounce dock icon" small];
+    return [@"Bounce Dock icon" small];
 }