Merge pull request #187 from jphalip/master

Fix for branch badges and improvements to file search UI

Author: laullon

English.lproj/Preferences.xib

@@ -26,6 +26,8 @@
 	IBOutlet NSView *accessoryView;
 	IBOutlet NSSplitView *fileListSplitView;
     IBOutlet NSSearchField *searchField;
+    IBOutlet NSSegmentedControl *stepper;
+    IBOutlet NSTextField *numberOfMatches;
     PBGitTree *lastFile;
 }
 
@@ -51,9 +53,13 @@
 
 - (void) openFileMerge:(NSString*)file sha:(NSString *)sha sha2:(NSString *)sha2;
 
--(IBAction)updateSearch:(NSSearchField *)sender;
+- (IBAction)searchFieldChanged:(NSSearchField *)sender;
+- (IBAction)stepperPressed:(id)sender;
 
 @property(strong) NSMutableArray *groups;
 @property(strong) NSString *logFormat;
 
+@property (strong) IBOutlet NSSegmentedControl *stepper;
+@property (strong) IBOutlet NSSearchField *searchField;
+@property (strong) IBOutlet NSTextField *numberOfMatches;
 @end

GLFileView.h

@@ -30,7 +30,7 @@ + (NSString *)parseBinaryDiff:(NSString *)txt;
 
 @implementation GLFileView
 
-@synthesize historyController, typeBar;
+@synthesize historyController, typeBar, stepper, searchField, numberOfMatches, groups, logFormat;
 
 - (void) awakeFromNib
 {
@@ -140,7 +140,7 @@ - (void) showFile
             }else{
                 [script callWebScriptMethod:@"setMessage" withArguments:[NSArray arrayWithObjects:[theError localizedDescription], nil]];
             }
-            [self updateSearch:searchField];
+            [self updateSearch];
         }
 	}
 
@@ -681,17 +681,62 @@ - (void)restoreSplitViewPositiion
 	[fileListSplitView setHidden:NO];
 }
 
-#pragma mark IBActions
+// -------------
+// File search
+// -------------
 
--(IBAction)updateSearch:(NSSearchField *)sender
+#pragma mark -
+#pragma mark Search
+
+NSString *searchString;
+
+- (NSString *)numberOfMatchesString
+{    
+	if ([view resultCount] == 0)
+		return @"Not found";
+    
+	if ([view resultCount] == 1)
+		return @"1 match";
+    
+	return [NSString stringWithFormat:@"%d matches", [view resultCount]];
+}
+
+- (void) updateSearch
 {
-    [view updateSearch:sender];
+    [view search:searchField update:YES direction:YES];
+    [self updateSearchUI];
 }
 
-#pragma mark -
+- (void) updateSearchUI
+{
+    if ([searchString length] == 0) {
+        [numberOfMatches setHidden:YES];
+		[stepper setHidden:YES];
+    }
+    else {
+        [numberOfMatches setHidden:NO];
+		[stepper setHidden:NO];
+        [numberOfMatches setStringValue:[self numberOfMatchesString]];
+        [stepper setEnabled:([view resultCount]>0)];
+    }
+}
+
+- (IBAction)searchFieldChanged:(id)sender
+{
+    BOOL update=[[searchField stringValue] isEqualToString:searchString]? NO: YES;
+    searchString=[searchField stringValue];
+    [view search:searchField update:update direction:YES];
+    [self updateSearchUI];
+}
 
 
-@synthesize groups;
-@synthesize logFormat;
+- (IBAction)stepperPressed:(id)sender {
+    NSInteger selectedSegment = [sender selectedSegment];
+    
+	if (selectedSegment == 0)
+        [view search:searchField update:NO direction:NO];
+	else
+		[view search:searchField update:NO direction:YES];
+}
 
 @end

GLFileView.m

@@ -88,7 +88,7 @@ - (IBAction) createBranch:(id)sender
 	}
 
     NSString *refExistsReturnMessage;
-    if([self.repository refExists:ref checkOnRemotesWithoutBranches:YES resultMessage:&refExistsReturnMessage])
+    if([self.repository refExists:ref checkOnRemotesWithoutBranches:NO resultMessage:&refExistsReturnMessage])
     {
         NSError  *error = [NSError errorWithDomain:PBGitRepositoryErrorDomain 
                                               code:0

PBCreateBranchSheet.m

@@ -69,7 +69,7 @@ - (IBAction) createTag:(id)sender
 	}
 
     NSString *refExistsReturnMessage;
-    if([self.repository refExists:ref checkOnRemotesWithoutBranches:YES resultMessage:&refExistsReturnMessage])
+    if([self.repository refExists:ref checkOnRemotesWithoutBranches:NO resultMessage:&refExistsReturnMessage])
     {
         NSError  *error = [NSError errorWithDomain:PBGitRepositoryErrorDomain 
                                               code:0