kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Album and artist search is now exposed no matter where you click.

CQTexperiment
matthewleon 2008-02-16 19:40:34 +00:00
parent 3c8b325a00
commit 332a062d93
1 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Playlist/PlaylistView.m
View File

@ -14,6 +14,7 @@
#import "IndexFormatter.h"
#import "SecondsFormatter.h"
#import "PlaylistEntry.h"
@implementation PlaylistView
@ -171,30 +172,41 @@
else
{
// Add Spotlight search items
NSMenuItem *spotlightMenuItem = Nil;
NSPoint menuPoint = [self convertPoint:[event locationInWindow] fromView:nil];
NSInteger iColumn = [self columnAtPoint: menuPoint];
NSTableColumn *column = [[self tableColumns]objectAtIndex:iColumn];
NSString *identifier = (NSString *)[column identifier];
if ([identifier isEqualToString:@"artist"])
{
spotlightMenuItem = [NSMenuItem alloc];
[spotlightMenuItem initWithTitle:@"Search for songs by artist..."
action:@selector(searchByArtist:)
keyEquivalent:@""];
}
else if ([identifier isEqualToString:@"album"])
{
spotlightMenuItem = [NSMenuItem alloc];
[spotlightMenuItem initWithTitle:@"Search for songs by album..."
action:@selector(searchByAlbum:)
keyEquivalent:@""];
}
PlaylistEntry *song = [[playlistController arrangedObjects]objectAtIndex:iRow];
NSString *artist = [song artist];
NSString *album = [song album];
unsigned addedItems = 0; // Count the number of added items, used for separator
if(spotlightMenuItem)
if(album)
{
spotlightMenuItem.target = playlistController;
[tableViewMenu insertItem:spotlightMenuItem atIndex:0];
NSMenuItem *albumMenuItem = [NSMenuItem alloc];
NSString *title = [NSString
stringWithFormat:@"Search for Songs from %@...", album];
[albumMenuItem initWithTitle:title
action:@selector(searchByAlbum:)
keyEquivalent:@""];
albumMenuItem.target = playlistController;
[tableViewMenu insertItem:albumMenuItem atIndex:0];
[albumMenuItem release];
addedItems++;
}
if(artist)
{
NSMenuItem *artistMenuItem = [NSMenuItem alloc];
NSString *title = [NSString
stringWithFormat:@"Search for Songs by %@...", artist];
[artistMenuItem initWithTitle:title
action:@selector(searchByArtist:)
keyEquivalent:@""];
artistMenuItem.target = playlistController;
[tableViewMenu insertItem:artistMenuItem atIndex:0];
[artistMenuItem release];
addedItems++;
}
if(addedItems)
{
// add a separator in the right place
[tableViewMenu insertItem:[NSMenuItem separatorItem] atIndex:addedItems];
}
}