diff --git a/Spotlight/SpotlightPanel.xib b/Spotlight/SpotlightPanel.xib
index 69d0a2cbc..950dcf9c5 100644
--- a/Spotlight/SpotlightPanel.xib
+++ b/Spotlight/SpotlightPanel.xib
@@ -8,12 +8,12 @@
343.00
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
0
- ../Cog.xcodeproj
+ ../../Cog.xcodeproj
3
diff --git a/Spotlight/SpotlightSearchController.h b/Spotlight/SpotlightSearchController.h
index c3dc5a832..537bc0355 100644
--- a/Spotlight/SpotlightSearchController.h
+++ b/Spotlight/SpotlightSearchController.h
@@ -13,11 +13,13 @@
@interface SpotlightSearchController : NSObject {
IBOutlet NSArrayController *playlistController;
IBOutlet SpotlightWindowController *spotlightWindowController;
+ IBOutlet NSPathControl *pathControl;
NSMetadataQuery *query;
NSString *searchString;
}
- (IBAction)addToPlaylist:(id)sender;
+- (IBAction)changeSearchPath:(id)sender;
- (void)performSearch;
diff --git a/Spotlight/SpotlightSearchController.m b/Spotlight/SpotlightSearchController.m
index 6648d96b7..c121cd349 100644
--- a/Spotlight/SpotlightSearchController.m
+++ b/Spotlight/SpotlightSearchController.m
@@ -30,10 +30,20 @@ static NSPredicate * musicOnlyPredicate = nil;
return self;
}
+- (void)awakeFromNib
+{
+ // Will replace this with userdefaults, but for now just start in
+ // the home directory.
+ NSString *homeDirectory = @"~";
+ homeDirectory = [homeDirectory stringByExpandingTildeInPath];
+ [pathControl setURL:[NSURL fileURLWithPath:homeDirectory isDirectory:YES]];
+}
+
- (void)performSearch
{
unsigned options = (NSCaseInsensitivePredicateOption|
NSDiacriticInsensitivePredicateOption);
+ [self.query setSearchScopes:[NSArray arrayWithObjects:pathControl.URL, nil]];
NSString *processedKey = [NSString stringWithFormat: @"*%@*", self.searchString];
NSPredicate *searchPredicate = [NSComparisonPredicate
@@ -66,7 +76,15 @@ static NSPredicate * musicOnlyPredicate = nil;
[super dealloc];
}
-- (IBAction)addToPlaylist:(id)sender;
+- (IBAction)changeSearchPath:(id)sender
+{
+ // When the search path is changed, restart search
+ if([self.query isStarted]) {
+ [self performSearch];
+ }
+}
+
+- (IBAction)addToPlaylist:(id)sender
{
[self.query disableUpdates];