Changeset 355 for trunk/Cocoa/Pester/Source/NJRFSObjectSelector.m

Timestamp:

11/23/07 04:58:05 (16 years ago)

Author:

Nicholas Riley

Message:

English.lproj/MainMenu.nib: Modernize menu and alarm set dialog
layout. Use keyed archiving (10.2+) nib format.

Info-Pester.plist: Moved from old PBX project.

NJRFSObjectSelector.m: Bug fixes from code sent to Joey: remove
incorrect usage of tryToPerform:with:; fix logic error in menu
construction. Work around Cocoa's deciding that the menu font size
needs adjustment when it doesn't - so the menu font size now matches
the button font size, though the position is still off. Don't pop up
a menu if we're disabled. Use IconRefs for menu icons, though not
(yet) for the button icon.

NJRHistoryTrackingComboBox.m: Remove item height adjustment
workaround; it now makes the items too tall.

NJRHotKey.m: Add a missing [super dealloc] caught by current GCC.

NJRHotKeyField.m: Add a missing [super dealloc] caught by current GCC.

NJRHotKeyManager.m: Add a missing [super dealloc] caught by current
GCC.

NJRIntervalField.m: Fix some type errors.

NJRQTMediaPopUpButton.m: Replace SoundFileManager SPI usage, which
doesn't work in Leopard anyway, with manual enumeration of system
sounds. Start migration to QTKit. Use IconRefs for menu icons.

NJRReadMeController.m: Change source encoding to UTF-8.

NJRSoundManager.m: Fix a type error.

NJRVoicePopUpButton.m: Change source encoding to UTF-8.

NSMenuItem-NJRExtensions.[hm]: Code from ICeCoffEE to use IconRefs for
menu item icons.

PSAlarm.m: Change source encoding to UTF-8.

PSAlarms.m: Fix a signedness mismatch.

PSAlarmsController.m: Change source encoding to UTF-8.

PSAlarmSetController.m: Set keyboard focus after unchecking "Do
script:" and "Play" checkboxes.

PSAlerts.m: Add a missing [super dealloc] caught by current GCC. Fix
a memory leak in property list serialization.

PSPowerManager.[hm]: There's now API for scheduling wakeups; use it
(the old code asserted on startup). To fix: removing scheduled
wakeup. Fix a small type-checking error.

PSPreferencesController.m: Add a missing [super dealloc] caught by
current GCC.

PSScriptAlert.m: Change source encoding to UTF-8.

PSTimeDateEditor.m: Fix a tiny, and one-time, memory leak.

PSTimer.m: Update for new PSPowerManager API.

Pester.pbproj: Deleted; now supporting OS X 10.4+ (up from 10.1,
aiee.)

Pester.xcodeproj: Xcode 2.4+ project, upgraded targets, etc.

SoundFileManager.h: Deleted; this SPI no longer exists in Leopard and
possibly earlier.

File:

• trunk/Cocoa/Pester/Source/NJRFSObjectSelector.m (modified) (8 diffs)

trunk/Cocoa/Pester/Source/NJRFSObjectSelector.m

@@ -1 +1 @@
 #import "NJRFSObjectSelector.h"
+#import "NSMenuItem-NJRExtensions.h"
 #import "NSImage-NJRExtensions.h"
 #import "NSString-NJRExtensions.h"
@@ -84 +85 @@
 - (void)setImage:(NSImage *)image;
 {
+    // XXX change to use IconRef; see ICeCoffEELabeledIconCell and Google
     [super setImage: [image bestFitImageForSize: [[self cell] cellSize]]];
 }
@@ -111 +113 @@
         NSAssert1([files count] == 1, @"%d items returned, only one expected", [files count]);
         [self setPath: [files objectAtIndex: 0]];
-        [[self target] tryToPerform: [self action] with: self];
+                if ([self target] != nil && [[self target] respondsToSelector:[self action]])
+                        [[self target] performSelector: [self action] withObject: self];
     }
 }
@@ -145 +148 @@
             }
             do {
+                NSAssert1(![path isEqualToString: revealPath], @"Stuck on path |%@|", [alias fullPath]);
                 item = [menu addItemWithTitle: [fmgr displayNameAtPath: path]
                                        action: @selector(revealInFinder:)
@@ -150 +154 @@
                 [item setTarget: self];
                 [item setRepresentedObject: revealPath];
-                [item setImage:
-                    [[[NSWorkspace sharedWorkspace] iconForFile: path] bestFitImageForSize: NSMakeSize(16, 16)]];
+                [item setImageFromPath: path];
                 revealPath = path;
                 path = [path stringByDeletingLastPathComponent];
-                NSAssert1(![path isEqualToString: revealPath], @"Stuck on path |%@|", [alias fullPath]);
             } while (![revealPath isEqualToString: @"/"] && ![path isEqualToString: @"/Volumes"]);
             [[self cell] setMenu: menu];
@@ -195 +197 @@
 - (void)mouseDown:(NSEvent *)theEvent;
 {
+    if (![self isEnabled]) return;
+    
     NSMenu *menu = [[self cell] menu];
     MenuRef mRef = _NSGetCarbonMenu(menu);
@@ -219 +223 @@
                                   pressure: [theEvent pressure]];
 
-    // this undocumented API does not work any better; contextual menu items are still added:
-    // [menu _popUpMenuWithEvent: theEvent forView: self];
-    [NSMenu popUpContextMenu: menu withEvent: theEvent forView: self];
+    // XXX otherwise Cocoa thoughtfully doesn't give me the font I want
+    NSFont *font = [[self cell] font];
+    [NSMenu popUpContextMenu: menu withEvent: theEvent forView: self withFont: 
+     [NSFont fontWithName: [font fontName] size: [font pointSize] - 0.001]];
 }
 
@@ -310 +315 @@
         if (url == nil) return NO;
         [self setPath: [url path]];
-        [[self target] tryToPerform: [self action] with: self];
+                if ([self target] != nil && [[self target] respondsToSelector:[self action]])
+                        [[self target] performSelector: [self action] withObject: self];
     }
     return YES;