Merge branch 'refs/heads/filtering_File_Browser'

Author: laullon

PBGitHistoryController.h

@@ -27,6 +27,7 @@
 	IBOutlet PBRefController *refController;
 	IBOutlet NSSearchField *searchField;
 	IBOutlet NSArrayController* commitController;
+	IBOutlet NSSearchField *filesSearchField;
 	IBOutlet NSTreeController* treeController;
 	IBOutlet NSOutlineView* fileBrowser;
 	NSArray *currentFileBrowserSelectionPath;
@@ -94,6 +95,7 @@
 // Find/Search methods
 - (IBAction)selectNext:(id)sender;
 - (IBAction)selectPrevious:(id)sender;
+- (IBAction) updateSearch:(id) sender;
 
 - (void) copyCommitInfo;
 - (void) copyCommitSHA;

PBGitHistoryController.m

@@ -232,7 +232,8 @@ - (void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(
 {
     if ([(NSString *)context isEqualToString: @"commitChange"]) {
 		[self updateKeys];
-		//[self restoreFileBrowserSelection];
+		[self restoreFileBrowserSelection];
+		[self updateSearch:filesSearchField];
 	}else if ([(NSString *)context isEqualToString: @"treeChange"]) {
 		[self updateQuicklookForce: NO];
 		[self saveFileBrowserSelection];
@@ -811,6 +812,32 @@ - (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(PBSourceViewCe
     NSImage *image = [workspace iconForFile:path];
     [image setSize:NSMakeSize(15, 15)];
     [cell setImage:image];
+	
+	NSColor *textColor = [NSColor blackColor];
+	if ([object filterPredicate] && !([[filesSearchField stringValue] length] > 0 && [[object filterPredicate] evaluateWithObject:object])) {
+		textColor = [NSColor lightGrayColor];
+	}
+
+
+	[cell setTextColor:textColor];
+}
+
+#pragma mark -
+
+- (IBAction) updateSearch:(NSSearchField *) sender {
+	static NSPredicate *predicateTemplate = nil;
+	if (!predicateTemplate) {
+		predicateTemplate = [NSPredicate predicateWithFormat:@"path CONTAINS[c] $SEARCH_STRING"];
+	}
+	
+	NSString *searchString = [sender stringValue];
+	NSPredicate *predicate = nil;
+	if ([searchString length] > 0) {
+		predicate = [predicateTemplate predicateWithSubstitutionVariables:
+								  [NSDictionary dictionaryWithObject:searchString forKey:@"SEARCH_STRING"]];
+	}
+	[gitTree setFilterPredicate:predicate];
+	[treeController setContent:gitTree.filteredChildren];
 }
 
 @end