Changeset 41 for trunk/Cocoa/Pester/Source/NJRQTMediaPopUpButton.m

Timestamp:

11/05/02 23:54:02 (21 years ago)

Author:

Nicholas Riley

Message:

Popup triangle.tiff: Needed display component of NJRFSObjectSelector.
This one appears to use transparency unlike the one I prepared for
Process Exhibits, so it should be preferred.

NSMovie-NJRExtensions: Added -isStatic to identify whether the movie
contains dynamic components. If the movie is static, it most likely
contains only an image and shouldn't be 'played' as such, otherwise
the duration will be so short that the image won't be useful.

NJRFSObjectSelector: Fixed -drawRect: to draw the drag feedback
rectangle inside the bounds of the control, not inside whatever dirty
rectangle is passed to the method (often they are the same, but not
always). Only draw the popup arrow if the control is enabled.
Properly draw the popup arrow with transparency. Display the 'make
alias' cursor as additional drag feedback.

PSMovieAlertController: Only repeat movie and auto-close after movie
finished if it contains time-based media, otherwise just display the
movie (an image) until the window is closed or alarms are cancelled.

NSImage-NJRExtensions: Include code to actually scale icons from
F-Script Anywhere, otherwise the menu ends up with 32x32 (or
potentially larger) icons if smaller variations are not provided.
There's some more code in FSA that chooses which representation to
select; this code may still not be properly handling representations,
but it works better now. A good test case is the icon for Tex-Edit
Plus documents.

NJRQTMediaPopUpButton: Added notification for movie change (needed to
update interface). Changed -_validatePreview to
-_validateWithPreview: - preview is now optional. This will be needed
when I add archiving support for the selected item; we'll need to
validate it before updating the interface, but we don't want sounds to
play. Added some #pragma mark lines to separate methods by
functionality. Call -validateWithPreview: NO in awakeFromNib (again,
this logic will become more sophisticated later). Commented some
debugging logic since I'm pretty happy with the code. Added
-canRepeat accessor and setters, notification support in the
validation method. Added drag feedback.

PSAlarmSetController: Notification support, -setSoundRepetitionCount:
to avoid flashing with repetition text field control as NSStepper is
adjusted

English.lproj/MainMenu.nib: Switched action method for the NSStepper
stuff discussed above.

AM /Users/nicholas/Documents/Development/Cocoa/Pester/Source/Popup triangle.tiff
M /Users/nicholas/Documents/Development/Cocoa/Pester/Source/NSMovie-NJRExtensions.m
M /Users/nicholas/Documents/Development/Cocoa/Pester/Source/NJRFSObjectSelector.m
M /Users/nicholas/Documents/Development/Cocoa/Pester/Source/PSMovieAlertController.m
M /Users/nicholas/Documents/Development/Cocoa/Pester/Source/NSImage-NJRExtensions.m
M /Users/nicholas/Documents/Development/Cocoa/Pester/Source/NJRQTMediaPopUpButton.h
M /Users/nicholas/Documents/Development/Cocoa/Pester/Source/NJRQTMediaPopUpButton.m
M /Users/nicholas/Documents/Development/Cocoa/Pester/Source/.DS_Store
M /Users/nicholas/Documents/Development/Cocoa/Pester/Source/English.lproj/MainMenu.nib/objects.nib
M /Users/nicholas/Documents/Development/Cocoa/Pester/Source/English.lproj/MainMenu.nib/info.nib
M /Users/nicholas/Documents/Development/Cocoa/Pester/Source/English.lproj/MainMenu.nib/classes.nib
M /Users/nicholas/Documents/Development/Cocoa/Pester/Source/Pester.pbproj/nicholas.pbxuser
M /Users/nicholas/Documents/Development/Cocoa/Pester/Source/Pester.pbproj/project.pbxproj
M /Users/nicholas/Documents/Development/Cocoa/Pester/Source/PSAlarmSetController.h
M /Users/nicholas/Documents/Development/Cocoa/Pester/Source/PSAlarmSetController.m
M /Users/nicholas/Documents/Development/Cocoa/Pester/Source/NSMovie-NJRExtensions.h

File:

• trunk/Cocoa/Pester/Source/NJRQTMediaPopUpButton.m (modified) (16 diffs)

trunk/Cocoa/Pester/Source/NJRQTMediaPopUpButton.m

@@ -14 +14 @@
 static const int NJRQTMediaPopUpButtonMaxRecentItems = 10;
 
+NSString * const NJRQTMediaPopUpButtonMovieChangedNotification = @"NJRQTMediaPopUpButtonMovieChangedNotification";
+
 @interface NJRQTMediaPopUpButton (Private)
 - (void)_setPath:(NSString *)path;
 - (NSMenuItem *)_itemForAlias:(BDAlias *)alias;
-- (BOOL)_validatePreview;
+- (BOOL)_validateWithPreview:(BOOL)doPreview;
 @end
 
@@ -25 +27 @@
 // XXX don't add icons on Puma, they look like ass
 // XXX launch preview on a separate thread (if movies take too long to load, they inhibit the interface responsiveness)
+// XXX when dropping invalid JPEG file on button, it dies
 
 // Recent media layout:
 // Most recent media are at TOP of menu (smaller item numbers, starting at [self indexOfItem: otherItem] + 1)
 // Most recent media are at END of array (larger indices)
+
+#pragma mark recently selected media tracking
 
 - (NSString *)_defaultKey;
@@ -95 +100 @@
 }
 
+#pragma mark initialize-release
+
 - (void)awakeFromNib;
 {
@@ -127 +134 @@
     otherItem = [item retain];
 
+    [self _validateWithPreview: NO];
+
     recentMediaAliasData = [[NSMutableArray alloc] initWithCapacity: NJRQTMediaPopUpButtonMaxRecentItems + 1];
     [self _addRecentMediaFromAliasesData: [[NSUserDefaults standardUserDefaults] arrayForKey: [self _defaultKey]]];
-    [self _validateRecentMedia];
+    // [self _validateRecentMedia];
 
     [self registerForDraggedTypes:
@@ -142 +151 @@
     [super dealloc];
 }
+
+#pragma mark accessing
 
 - (BDAlias *)selectedAlias;
@@ -172 +183 @@
     }
 
-    [self _validateRecentMedia];
+    // [self _validateRecentMedia];
     path = [alias fullPath];
     sf = [[SoundFileManager sharedSoundFileManager] soundFileFromPath: path];
-    NSLog(@"_itemForAlias: %@", path);
+    // NSLog(@"_itemForAlias: %@", path);
 
     // selected a system sound?
     if (sf != nil) {
-        NSLog(@"_itemForAlias: selected system sound");
+        // NSLog(@"_itemForAlias: selected system sound");
         return [self itemAtIndex: [self indexOfItemWithRepresentedObject: sf]];
     } else {
@@ -194 +205 @@
                 if (menuIndex == otherIndex + 1) return [self itemAtIndex: menuIndex]; // already at top
                 // remove item, add (at top) later
-                NSLog(@"_itemForAlias removing item: idx %d + otherItemIdx %d + 1 = %d [%@]", recentIndex, otherIndex, menuIndex, [self itemAtIndex: menuIndex]);
+                // NSLog(@"_itemForAlias removing item: idx %d + otherItemIdx %d + 1 = %d [%@]", recentIndex, otherIndex, menuIndex, [self itemAtIndex: menuIndex]);
                 [self removeItemAtIndex: menuIndex];
                 [recentMediaAliasData removeObjectAtIndex: [recentMediaAliasData count] - recentIndex];
@@ -209 +220 @@
 }
 
+- (BOOL)canRepeat;
+{
+    return movieCanRepeat;
+}
+
+#pragma mark selected media validation
+
 - (void)_invalidateSelection;
 {
     [self _setAlias: previousAlias];
     [self selectItem: [self _itemForAlias: [self selectedAlias]]];
-}
-
-- (BOOL)_validatePreview;
+    [[NSNotificationCenter defaultCenter] postNotificationName: NJRQTMediaPopUpButtonMovieChangedNotification object: self];
+}
+
+- (BOOL)_validateWithPreview:(BOOL)doPreview;
 {
     [preview stop: self];
     if (selectedAlias == nil) {
         [preview setMovie: nil];
-        NSBeep();
+        movieCanRepeat = YES;
+        if (doPreview) NSBeep();
     } else {
         NSMovie *movie = [[NSMovie alloc] initWithURL: [NSURL fileURLWithPath: [selectedAlias fullPath]] byReference: YES];
+        movieCanRepeat = ![movie isStatic];
         if ([movie hasAudio])
             [preview setMovie: movie];
@@ -242 +263 @@
         [preview start: self];
     }
+    [[NSNotificationCenter defaultCenter] postNotificationName: NJRQTMediaPopUpButtonMovieChangedNotification object: self];
     return YES;
 }
 
+#pragma mark actions
+
 - (IBAction)stopSoundPreview:(id)sender;
 {
@@ -253 +277 @@
 {
     [self _setAlias: nil];
-    [self _validatePreview];
+    [self _validateWithPreview: YES];
 }
 
@@ -259 +283 @@
 {
     [self _setPath: [(SoundFile *)[sender representedObject] path]];
-    if (![self _validatePreview]) {
+    if (![self _validateWithPreview: YES]) {
         [[self menu] removeItem: sender];
     }
@@ -269 +293 @@
     int index = [self indexOfItem: sender], otherIndex = [self indexOfItem: otherItem];
     [self _setAlias: alias];
-    if (![self _validatePreview]) {
+    if (![self _validateWithPreview: YES]) {
         [[self menu] removeItem: sender];
     } else if (index > otherIndex + 1) { // move "other" item to top of list
@@ -281 +305 @@
         [item release];
         NSAssert(recentIndex >= 0, @"Recent media index invalid");
-        NSLog(@"_aliasSelected removing item %d - %d + %d = %d of recentMediaAliasData", [recentMediaAliasData count], index, otherIndex, recentIndex);
+        // NSLog(@"_aliasSelected removing item %d - %d + %d = %d of recentMediaAliasData", [recentMediaAliasData count], index, otherIndex, recentIndex);
         [recentMediaAliasData removeObjectAtIndex: recentIndex];
         [recentMediaAliasData addObject: data];
@@ -313 +337 @@
         NSAssert1([files count] == 1, @"%d items returned, only one expected", [files count]);
         [self _setPath: [files objectAtIndex: 0]];
-        if ([self _validatePreview]) {
+        if ([self _validateWithPreview: YES]) {
             [self selectItem: [self _itemForAlias: selectedAlias]];
         }
@@ -322 +346 @@
     }
     // [self _validateRecentMedia];
+}
+
+#pragma mark drag feedback
+
+- (void)drawRect:(NSRect)rect;
+{
+    if (dragAccepted) {
+        NSWindow *window = [self window];
+        NSRect boundsRect = [self bounds];
+        BOOL isFirstResponder = ([window firstResponder] == self);
+        // focus ring and drag feedback interfere with one another
+        if (isFirstResponder) [window makeFirstResponder: window];
+        [super drawRect: rect];
+        [[NSColor selectedControlColor] set];
+        NSFrameRectWithWidthUsingOperation(NSInsetRect(boundsRect, 2, 2), 3, NSCompositeSourceIn);
+        if (isFirstResponder) [window makeFirstResponder: self];
+    } else {
+        [super drawRect: rect];
+    }
 }
 
@@ -410 +453 @@
         if (url == nil) return NO;
         [self _setPath: [url path]];
-        if ([self _validatePreview]) {
+        if ([self _validateWithPreview: YES]) {
             [self selectItem: [self _itemForAlias: selectedAlias]];
         }