diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib index 9c46bfcf5..ad22a4136 100644 --- a/English.lproj/MainMenu.xib +++ b/English.lproj/MainMenu.xib @@ -8,12 +8,12 @@ 352.00 YES - - - - + + + + YES @@ -3222,14 +3222,11 @@ QXBwbGUsIEluYy4sIDIwMDgAA queued + title - YES + PlaylistEntry - YES - YES - YES YES - YES @@ -3751,22 +3748,6 @@ QXBwbGUsIEluYy4sIDIwMDgAA 853 - - - value: selection.bitsPerSample - - - - - - value: selection.bitsPerSample - value - selection.bitsPerSample - 2 - - - 878 - menu @@ -5227,122 +5208,134 @@ QXBwbGUsIEluYy4sIDIwMDgAA 1934 - - - value: selection.channels - - - - - - value: selection.channels - value - selection.channels - - YES - - YES - NSAllowsEditingMultipleValuesSelection - NSAlwaysPresentsApplicationModalAlerts - NSConditionallySetsEditable - NSConditionallySetsEnabled - NSConditionallySetsHidden - NSContinuouslyUpdatesValue - NSMultipleValuesPlaceholder - NSNoSelectionPlaceholder - NSNotApplicablePlaceholder - NSNullPlaceholder - NSRaisesForNotApplicableKeys - NSValidatesImmediately - - - YES - - - - - - - - - - - - - - - 2 - - - 1970 - - - - value: selection.bitrate - - - - - - value: selection.bitrate - value - selection.bitrate - 2 - - - 2015 - - - - contentArray: selectedObjects - - - - - - contentArray: selectedObjects - contentArray - selectedObjects - 2 - - - 2023 - - - - title: arrangedObjects.queued - - - - - - title: arrangedObjects.queued - title - arrangedObjects.queued - - NSValueTransformerName - ToggleQueueTitleTransformer - - 2 - - - 2025 - value: selection.sampleRate - + - + value: selection.sampleRate value selection.sampleRate 2 - 2028 + 2034 + + + + value: selection.bitrate + + + + + + value: selection.bitrate + value + selection.bitrate + 2 + + + 2035 + + + + contentArray: arrangedObjects + + + + + + contentArray: arrangedObjects + contentArray + arrangedObjects + 2 + + + 2039 + + + + selectionIndexes: selectionIndexes + + + + + + selectionIndexes: selectionIndexes + selectionIndexes + selectionIndexes + 2 + + + 2041 + + + + title: selection.queued + + + + + + title: selection.queued + title + selection.queued + + YES + + YES + NSMultipleValuesPlaceholder + NSValueTransformerName + + + YES + Toggle Queued + ToggleQueueTitleTransformer + + + 2 + + + 2042 + + + + value: selection.channels + + + + + + value: selection.channels + value + selection.channels + + NSValidatesImmediately + + + 2 + + + 2043 + + + + value: selection.bitsPerSample + + + + + + value: selection.bitsPerSample + value + selection.bitsPerSample + 2 + + + 2044 @@ -8263,7 +8256,7 @@ QXBwbGUsIEluYy4sIDIwMDgAA - 2028 + 2044 diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m index 44036960b..a31373b10 100644 --- a/Playlist/PlaylistController.m +++ b/Playlist/PlaylistController.m @@ -52,11 +52,6 @@ forName:@"ToggleQueueTitleTransformer"]; } -+ (NSSet *)keyPathsForValuesAffectingSelection -{ - return [NSSet setWithObjects:@"content.bitrate", @"content.sampleRate", nil]; -} - - (id)initWithCoder:(NSCoder *)decoder { diff --git a/Playlist/PlaylistView.m b/Playlist/PlaylistView.m index 247161ff9..8f149f682 100644 --- a/Playlist/PlaylistView.m +++ b/Playlist/PlaylistView.m @@ -141,8 +141,6 @@ // enables right-click selection for "Show in Finder" contextual menu -(NSMenu*)menuForEvent:(NSEvent*)event { - return [self menu]; - //Find which row is under the cursor [[self window] makeFirstResponder:self]; NSPoint menuPoint = [self convertPoint:[event locationInWindow] fromView:nil]; diff --git a/Playlist/ToggleQueueTitleTransformer.m b/Playlist/ToggleQueueTitleTransformer.m index 1e5596ea3..e60274050 100644 --- a/Playlist/ToggleQueueTitleTransformer.m +++ b/Playlist/ToggleQueueTitleTransformer.m @@ -12,37 +12,23 @@ @implementation ToggleQueueTitleTransformer -+ (Class)transformedValueClass { return [NSArray class]; } ++ (Class)transformedValueClass { return [NSNumber class]; } + (BOOL)allowsReverseTransformation { return NO; } // Convert from NSNumber to NSString - (id)transformedValue:(id)value { + NSLog(@"VALUE: %@", value); if (value == nil) return nil; - if ([value count] == 0) return nil; + BOOL queued = [value boolValue]; - BOOL trueFound = NO; - BOOL falseFound = NO; - - for (NSNumber *q in value) { - BOOL queued = [q boolValue]; - - if (queued) - { - trueFound = YES; - } - else if (!queued) - { - falseFound = YES; - } - } - - - if (trueFound && !falseFound) + if (queued) + { return @"Remove from Queue"; - else if (falseFound && !trueFound) - return @"Add to Queue"; + } else - return @"Toggle Queued"; + { + return @"Add to Queue"; + } }