diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 51e020dd8..e77630542 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -9,7 +9,7 @@
-
+
{24, 25}
@@ -406,7 +406,7 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -8528,33 +8491,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ
-
-
@@ -8580,7 +8517,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ
@@ -8606,8 +8543,8 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ
+
+
@@ -8683,6 +8672,27 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ
+
0
@@ -8690,7 +8700,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ
3
diff --git a/Playlist/PlaylistController.h b/Playlist/PlaylistController.h
index 3a49098fc..963eb15a5 100644
--- a/Playlist/PlaylistController.h
+++ b/Playlist/PlaylistController.h
@@ -13,10 +13,12 @@
@class PlaylistLoader;
@class PlaylistEntry;
@class EntriesController;
+@class SpotlightWindowController;
@interface PlaylistController : DNDArrayController {
IBOutlet PlaylistLoader *playlistLoader;
IBOutlet EntriesController *entriesController;
+ IBOutlet SpotlightWindowController *spotlightWindowController;
NSString *totalTimeDisplay;
@@ -57,6 +59,10 @@
- (IBAction)clearFilterPredicate:(id)sender;
- (IBAction)clear:(id)sender;
+// Spotlight
+- (IBAction)searchByArtist:(id)sender;
+- (IBAction)searchByAlbum:(id)sender;
+
- (void)setTotalTimeDisplay:(NSString *)ttd;
- (NSString *)totalTimeDisplay;
diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m
index 599d515c2..bc2a6e645 100644
--- a/Playlist/PlaylistController.m
+++ b/Playlist/PlaylistController.m
@@ -10,6 +10,7 @@
#import "PlaylistController.h"
#import "PlaylistEntry.h"
#import "Shuffle.h"
+#import "SpotlightWindowController.h"
#import "CogAudio/AudioPlayer.h"
@@ -533,4 +534,15 @@
[ws selectFile:[url path] inFileViewerRootedAtPath:[url path]];
}
+- (IBAction)searchByArtist:(id)sender;
+{
+ PlaylistEntry *entry = [[self arrangedObjects] objectAtIndex:[self selectionIndex]];
+ [spotlightWindowController searchForArtist:[entry artist]];
+}
+- (IBAction)searchByAlbum:(id)sender;
+{
+ PlaylistEntry *entry = [[self arrangedObjects] objectAtIndex:[self selectionIndex]];
+ [spotlightWindowController searchForAlbum:[entry album]];
+}
+
@end
diff --git a/Playlist/PlaylistView.h b/Playlist/PlaylistView.h
index 156dff78c..d6b16f73e 100644
--- a/Playlist/PlaylistView.h
+++ b/Playlist/PlaylistView.h
@@ -14,7 +14,7 @@
@interface PlaylistView : NSTableView {
IBOutlet PlaybackController *playbackController;
IBOutlet PlaylistController *playlistController;
-
+
NSMenu *headerContextMenu;
}
diff --git a/Playlist/PlaylistView.m b/Playlist/PlaylistView.m
index d46f15c13..f1425dd02 100644
--- a/Playlist/PlaylistView.m
+++ b/Playlist/PlaylistView.m
@@ -142,38 +142,63 @@
//Find which row is under the cursor
[[self window] makeFirstResponder:self];
NSPoint menuPoint = [self convertPoint:[event locationInWindow] fromView:nil];
- int row = [self rowAtPoint:menuPoint];
+ NSInteger iRow = [self rowAtPoint:menuPoint];
+ NSMenu* tableViewMenu = [[self menu] copy];
/* Update the table selection before showing menu
Preserves the selection if the row under the mouse is selected (to allow for
multiple items to be selected), otherwise selects the row under the mouse */
- BOOL currentRowIsSelected = [[self selectedRowIndexes] containsIndex:row];
+ BOOL currentRowIsSelected = [[self selectedRowIndexes] containsIndex:iRow];
if (!currentRowIsSelected) {
- if (row == -1)
+ if (iRow == -1)
{
[self deselectAll:self];
}
else
{
- [self selectRow:row byExtendingSelection:NO];
+ [self selectRow:iRow byExtendingSelection:NO];
}
}
if ([self numberOfSelectedRows] <=0)
{
//No rows are selected, so the table should be displayed with all items disabled
- NSMenu* tableViewMenu = [[self menu] copy];
int i;
for (i=0;i<[tableViewMenu numberOfItems];i++) {
[[tableViewMenu itemAtIndex:i] setEnabled:NO];
}
-
- return [tableViewMenu autorelease];
}
else
{
- return [self menu];
+ // 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:@""];
+ }
+
+ if(spotlightMenuItem)
+ {
+ spotlightMenuItem.target = playlistController;
+ [tableViewMenu insertItem:spotlightMenuItem atIndex:0];
+ }
}
+
+ return [tableViewMenu autorelease];
}
diff --git a/Spotlight/SpotlightPanel.xib b/Spotlight/SpotlightPanel.xib
index 02f341101..2c63b3dbb 100644
--- a/Spotlight/SpotlightPanel.xib
+++ b/Spotlight/SpotlightPanel.xib
@@ -32,7 +32,7 @@
2
{{196, 192}, {480, 320}}
536870912
- Spotlight
+ Spotlight
NSPanel
{400, 260}
@@ -53,7 +53,7 @@
134217728
Add to Playlist
@@ -110,7 +110,7 @@
0
Title
@@ -120,7 +120,7 @@
@@ -1479,7 +1420,7 @@
@@ -1505,7 +1446,7 @@
@@ -1531,7 +1472,7 @@
@@ -1557,7 +1498,7 @@
@@ -1578,7 +1519,7 @@
NSTableView
@@ -1599,56 +1540,16 @@
PlaylistController
-
+
+
+
0
@@ -1763,9 +1770,9 @@ AwcDCgMhAykDLwMwAzQDQwNEA0kDSgNLA04DUgNTA1YDWANZA10DYgNwA3EDcgN8A30DfwOBA4IDhwOI
A40DjgOTA5QDmQOaA58DoAOjA6gDqQOuA68DtAO1A78DwAPBA8IDxQPOA88D0APWA9cD2QPhA+ID4wPp
A+oD6wPzA/QD9QP7BAMEBAQFBAsEEwQUBBUEGwQjBCQEJQQrBDIEMwQ0BDUEPQQ+BD8ERQRNBE4ETwRV
BHkEfAR9BH8EowTIBO0E7gTvBPAE8QTyBPME9AT1BPYE9wT4BPkE+gT7BPwE/QT+BP8FAAUBBQIFAwUE
-BQUFBgUHBQgFCQUKBQsFDAUNBQ4FDwUUBRkFUgWLBYwFjQWOBY8FkAWRBZIFkwWUBZUFlgBZBZcFmAWZ
-BZoFmwWcBZ0FngWfAWkFoAWhBaIFowWkBaUFpgWnBagFqQCSBaoFqwWsBa0FrgWvBbAFsQWyBbMFtAW1
-BbYAwQW3BbgAWAW5BboFuwW+BcEFxFUkbnVsbN8QEgANAA4ADwAQABEAEgATABQAFQAWABcAGAAZABoA
+BQUFBgUHBQgFCQUKBQsFDAUNBQ4FDwUUBRkFUgWLBYwFjQWOBY8FkAWRBZIFkwWUBZUFlgWXBZgFmQWa
+AFkFmwWcBZ0FngWfBaAFoQWiAWkFowWkBaUFpgWnBagFqQWqAJIFqwWsBa0FrgWvBbAFsQWyBbMFtADB
+BbUFtgW3BbgAWAW5BboFuwW+BcEFxFUkbnVsbN8QEgANAA4ADwAQABEAEgATABQAFQAWABcAGAAZABoA
GwAcAB0AHgAfACAAIQAiACMAJAAlACYAJwAoACkAKgArACwALQAuAC8AMFZOU1Jvb3RWJGNsYXNzXU5T
T2JqZWN0c0tleXNfEA9OU0NsYXNzZXNWYWx1ZXNfEBlOU0FjY2Vzc2liaWxpdHlPaWRzVmFsdWVzXU5T
Q29ubmVjdGlvbnNbTlNOYW1lc0tleXNbTlNGcmFtZXdvcmtdTlNDbGFzc2VzS2V5c1pOU09pZHNLZXlz
@@ -1945,17 +1952,17 @@ bGljYXRpb25fEBFTZWFyY2ggRmllbGQgQ2VsbF8QGlN0YXRpYyBUZXh0IChTZWFyY2ggUGF0aDopXxAd
U3BvdGxpZ2h0IFBsYXlsaXN0IENvbnRyb2xsZXJfEB1UZXh0IEZpZWxkIENlbGwgKFRleHQgQ2VsbCkt
MV8QHUJ1dHRvbiBDZWxsIChBZGQgdG8gUGxheWxpc3QpXENvbnRlbnQgVmlld18QFFRhYmxlIENvbHVt
biAoZ2VucmUpXxAaTWVudSBJdGVtIChTaG93IGluIEZpbmRlcinSAA4APgRWBRGA+aIDYADdgLCAHtIA
-DgA+BFYFFoD5ogNvAQaAsYAf0gAOAD4EVgUbgPmvEDYCHQByAHUDHQMbAHEA3QDJAHMDIAMSAt0BNwBB
-AZkBNgHTAxwDEQMmATMDFAJrAH0DGQMVATgDMwMQATQAHwMeAxYCwAD6Aw4DDwMTAL4BSAMfAgcBNQMN
-Ae4BOQRwAHQDYAG5AxoATwMYAxeAYIAagI6A5oDegA+AHoBpgHOA8oC+gJSAUoAHgEaATIBQgOKAvICg
-gCqAw4B1gBGA1IDFgFeAo4C6gD+AAoDqgMeAiYAigK+AuIDAgG2ANoDugFuAR4CfgFaAXID3gIeAsIBL
-gNqADIDOgMnSAA4APgRWBVSA+a8QNgVVBVYFVwVYBVkFWgVbBVwFXQVeBV8FYAVhAqwFYwVkBWUFZgVn
+DgA+BFYFFoD5ogNvAQaAsYAf0gAOAD4EVgUbgPmvEDYCHQByAxEAdQMdAxsDFgBxAN0AyQMSAHMDDgMg
+At0DDwE3AEEBmQE2AdMDHAMmATMCawMNAH0DGQE4AzMDEAE0AB8DHgLAAPoAvgFIAx8CBwE1Ae4BOQRw
+AxMAdANgAbkDGgMUAxUATwMYAxeAYIAagLyAjoDmgN6Ax4APgB6AaYC+gHOAr4DygJSAuIBSgAeARoBM
+gFCA4oCggCqAdYCfgBGA1IBXgKOAuoA/gAKA6oCJgCKAbYA2gO6AW4BHgFaAXID3gMCAh4CwgEuA2oDD
+gMWADIDOgMnSAA4APgRWBVSA+a8QNgVVBVYFVwVYBVkFWgVbBVwFXQVeBV8FYAVhBWIFYwVkBWUCrAVn
BWgFaQVqBWsFbAVtBW4FbwVwBXEFcgVzBXQFdQV2BXcFeAV5BXoFewV8BX0FfgV/BYAFgQWCBYMFhAWF
-BYYFhwWIBYkFioEBI4EBJIEBJYEBJoEBJ4EBKIEBKYEBKoEBK4EBLIEBLYEBLoEBL4CCgQEwgQExgQEy
-gQEzgQE0gQE1gQE2gQE3gQE4gQE5gQE6gQE7gQE8gQE9gQE+gQE/gQFAgQFBgQFCgQFDgQFEgQFFgQFG
-gQFHgQFIgQFJgQFKgQFLgQFMgQFNgQFOgQFPgQFQgQFRgQFSgQFTgQFUgQFVgQFWgQFXECwQGBBYEF4Q
-aRAFEBwQGxA3EGYQnxBZECcQIBApEGsQoRCrECQQPRA4EJ0QlxAeEKwQoBAiELEQphCvEFAQlRBIEKMQ
-GhAlEGgQKxAhELAQKhAdE//////////9EE8QKBBlEF0QmtIADgA+AG8FvYBhoNIADgA+BFYFwID5oNIA
+BYYFhwWIBYkFioEBI4EBJIEBJYEBJoEBJ4EBKIEBKYEBKoEBK4EBLIEBLYEBLoEBL4EBMIEBMYEBMoEB
+M4CCgQE0gQE1gQE2gQE3gQE4gQE5gQE6gQE7gQE8gQE9gQE+gQE/gQFAgQFBgQFCgQFDgQFEgQFFgQFG
+gQFHgQFIgQFJgQFKgQFLgQFMgQFNgQFOgQFPgQFQgQFRgQFSgQFTgQFUgQFVgQFWgQFXECwQGBChEFgQ
+XhBpEK8QBRAcEBsQnxA3EJUQZhBZEEgQJxAgECkQaxCrECQQOBCwEJ0QHhCsEKAQIhCxEKYQUBAaECUQ
+aBArECEQKhAdE//////////9EKMQTxAoEGUQPRCXEF0QmtIADgA+AG8FvYBhoNIADgA+BFYFwID5oNIA
DgA+BFYFw4D5oNIANwA4BcUFxqIFxgA7Xk5TSUJPYmplY3REYXRhAAgAGQAiACcAMQA6AD8ARABSAFQA
ZgMiAygDcwN6A4EDjwOhA70DywPXA+MD8QP8BAoEJgQ0BEcEWQRzBH0EigSMBI8EkQSUBJcEmQSbBJ0E
oASjBKUEqASqBKwErgSxBLMEtgS/BMsEzQTPBOsE9AT9BQgFDQUcBSUFOAVBBUwFTgVRBVMFiAWVBaIF
@@ -2002,10 +2009,10 @@ eyl+KYEphCmHKYopjSmQKZMplimZKZwpnymiKaUpqCmrKa4psSm0KbcpuinSKd8p6yoIKigqSSppKrYq
yireKusrASshKysrSytiK3grjCukK8Ir4iwCLBksMSxILFQsaCyFLKUsxSzlLPItCS0mLS8tMS02LTgt
Oi1DLUUtSi1MLU4tVy1ZLcgtyi3MLc4t0C3SLdQt1i3YLdot3C3eLeAt4i3kLeYt6C3qLewt7i3wLfIt
9C32Lfgt+i38Lf4uAC4CLgQuBi4ILgouDC4OLhAuEi4ULhYuGC4aLhwuHi4gLiIuJC4mLiguKi4sLi4u
-MC4yLjQuPS4/Lq4usS60Lrcuui69LsAuwy7GLskuzC7PLtIu1S7XLtou3S7gLuMu5i7pLuwu7y7yLvUu
+MC4yLjQuPS4/Lq4usS60Lrcuui69LsAuwy7GLskuzC7PLtIu1S7YLtsu3i7hLuMu5i7pLuwu7y7yLvUu
+C77Lv4vAS8ELwcvCi8NLxAvEy8WLxkvHC8fLyIvJS8oLysvLi8xLzQvNy86Lz0vQC9DL0YvSS9ML08v
US9TL1UvVy9ZL1svXS9fL2EvYy9lL2cvaS9rL20vby9xL3MvdS93L3kvey99L38vgS+DL4Uvhy+JL4sv
-jS+PL5Evky+VL5cvmS+bL50vny+hL6MvrC+uL7Avsi+0L7Yvvy/BL8Ivyy/NL84v1y/ZL9ov4y/oAAAA
+jS+PL5Evky+VL5cvmS+bL50vpi+oL6ovrC+uL7Avsi+0L7Yvvy/BL8Ivyy/NL84v1y/ZL9ov4y/oAAAA
AAAAAgIAAAAAAAAFxwAAAAAAAAAAAAAAAAAAL/c
diff --git a/Spotlight/SpotlightPlaylistController.h b/Spotlight/SpotlightPlaylistController.h
index 0255aa727..bd780ffbe 100644
--- a/Spotlight/SpotlightPlaylistController.h
+++ b/Spotlight/SpotlightPlaylistController.h
@@ -8,10 +8,8 @@
#import
#import "PlaylistController.h"
-#import "SpotlightWindowController.h"
@interface SpotlightPlaylistController : PlaylistController {
- IBOutlet SpotlightWindowController * spotlightWindowController;
}
- (BOOL)tableView:(NSTableView *)tv writeRowsWithIndexes:(NSIndexSet *)rowIndexes toPasteboard:(NSPasteboard*)pboard;
diff --git a/Spotlight/SpotlightPlaylistController.m b/Spotlight/SpotlightPlaylistController.m
index 70bdfa8ca..51aa67628 100644
--- a/Spotlight/SpotlightPlaylistController.m
+++ b/Spotlight/SpotlightPlaylistController.m
@@ -7,6 +7,7 @@
//
#import "SpotlightPlaylistController.h"
+#import "SpotlightWindowController.h"
@implementation SpotlightPlaylistController
diff --git a/Spotlight/SpotlightWindowController.h b/Spotlight/SpotlightWindowController.h
index e9c56b8d8..49864ff70 100644
--- a/Spotlight/SpotlightWindowController.h
+++ b/Spotlight/SpotlightWindowController.h
@@ -25,6 +25,9 @@
- (void)performSearch;
- (NSPredicate *)processSearchString;
+- (void)searchForArtist:(NSString *)artist;
+- (void)searchForAlbum:(NSString *)album;
+
@property(retain) NSMetadataQuery *query;
@property(copy) NSString *searchString;
@property(copy) NSString *spotlightSearchPath;
diff --git a/Spotlight/SpotlightWindowController.m b/Spotlight/SpotlightWindowController.m
index 2fe060965..951ee141c 100644
--- a/Spotlight/SpotlightWindowController.m
+++ b/Spotlight/SpotlightWindowController.m
@@ -228,6 +228,15 @@ static NSPredicate * musicOnlyPredicate = nil;
[self.query enableUpdates];
}
+- (void)searchForArtist:(NSString *)artist
+{
+ NSLog(@"When Matthew gets less lazy I will search for songs by %@", artist);
+}
+- (void)searchForAlbum:(NSString *)album
+{
+ NSLog(@"When Matthew gets less lazy I will search for songs from %@", album);
+}
+
// Don't update the track list until some results have been gathered
- (id)valueForKeyPath:(NSString *)keyPath
{