Merge pull request #190 from mullr/master

Add keyboard shortcuts to stage and unstage files

Author: laullon

PBFileChangesTableView.m

@@ -30,4 +30,45 @@ - (NSDragOperation) draggingSourceOperationMaskForLocal:(BOOL) local
 	return NSDragOperationEvery;
 }
 
+#pragma mark NSView overrides
+- (void)keyDown:(NSEvent *)theEvent
+{
+    PBGitIndexController* controller = (PBGitIndexController*)[self delegate];
+
+    bool isUnstagedView = [self tag] == 0;
+    bool isStagedView = !isUnstagedView;
+    
+    bool commandDown = theEvent.modifierFlags & NSCommandKeyMask;
+    
+    if([theEvent.characters isEqualTo:@"s"] && commandDown && isUnstagedView) {
+        int oldSelectedRowIndex = self.selectedRow;
+        [controller stageSelectedFiles];
+
+        // Try to select the file after the one that was just staged, which will have the same index now
+        int rowIndexToSelect = oldSelectedRowIndex;
+        if(rowIndexToSelect > self.numberOfRows - 1) {
+            rowIndexToSelect = self.numberOfRows - 1;
+        }
+        
+
+        [self selectRowIndexes:[NSIndexSet indexSetWithIndex:rowIndexToSelect] byExtendingSelection:NO];
+    }
+    else if([theEvent.characters isEqualTo:@"u"] && commandDown && isStagedView) {
+        int oldSelectedRowIndex = self.selectedRow;
+        [controller unstageSelectedFiles];
+
+        // Try to select the file after the one that was just staged, which will have the same index now
+        int rowIndexToSelect = oldSelectedRowIndex;
+        if(rowIndexToSelect > self.numberOfRows - 1) {
+            rowIndexToSelect = self.numberOfRows - 1;
+        }
+
+        [self selectRowIndexes:[NSIndexSet indexSetWithIndex:rowIndexToSelect] byExtendingSelection:NO];
+
+    }
+    else {
+        [super keyDown:theEvent];     
+    }
+}
+
 @end

PBGitIndexController.h

@@ -23,4 +23,8 @@
 - (IBAction) tableClicked:(NSTableView *)tableView;
 
 - (NSMenu *) menuForTable:(NSTableView *)table;
+
+- (void) stageSelectedFiles;
+- (void) unstageSelectedFiles;
+
 @end

PBGitIndexController.m

@@ -95,13 +95,13 @@ - (NSMenu *) menuForTable:(NSTableView *)table
 
 	// Unstaged changes
 	if ([table tag] == 0) {
-		NSMenuItem *stageItem = [[NSMenuItem alloc] initWithTitle:@"Stage Changes" action:@selector(stageFilesAction:) keyEquivalent:@""];
+		NSMenuItem *stageItem = [[NSMenuItem alloc] initWithTitle:@"Stage Changes" action:@selector(stageFilesAction:) keyEquivalent:@"s"];
 		[stageItem setTarget:self];
 		[stageItem setRepresentedObject:selectedFiles];
 		[menu addItem:stageItem];
 	}
 	else if ([table tag] == 1) {
-		NSMenuItem *unstageItem = [[NSMenuItem alloc] initWithTitle:@"Unstage Changes" action:@selector(unstageFilesAction:) keyEquivalent:@""];
+		NSMenuItem *unstageItem = [[NSMenuItem alloc] initWithTitle:@"Unstage Changes" action:@selector(unstageFilesAction:) keyEquivalent:@"u"];
 		[unstageItem setTarget:self];
 		[unstageItem setRepresentedObject:selectedFiles];
 		[menu addItem:unstageItem];
@@ -168,6 +168,17 @@ - (NSMenu *) menuForTable:(NSTableView *)table
 	return menu;
 }
 
+- (void) stageSelectedFiles
+{
+	[commitController.index stageFiles:[unstagedFilesController selectedObjects]];
+}
+
+- (void) unstageSelectedFiles
+{
+	[commitController.index unstageFiles:[stagedFilesController selectedObjects]];
+}
+
+
 - (void) stageFilesAction:(id) sender
 {
 	[commitController.index stageFiles:[sender representedObject]];