PBGitWindowController: Use beginSheetModalForWindow instead of runModal

Introduce a new showMessageSheet/showErrorSheet-method for
PBGitWindowController which uses the beginSheetModalForWindow method of
NSAlert whereever possible. This has the advantage over runModal as it
doesn't block the other instances of GitX and is generally more
unobstrusive for simple status-messages.

Signed-off-by: Johannes Gilger <[email protected]>

Author: heipei

PBGitCommitController.m

@@ -272,32 +272,20 @@ - (void) commitFailedBecause:(NSString *)reason
 {
 	self.busy--;
 	self.status = [@"Commit failed: " stringByAppendingString:reason];
-	[[NSAlert alertWithMessageText:@"Commit failed"
-					 defaultButton:nil
-				   alternateButton:nil
-					   otherButton:nil
-		 informativeTextWithFormat:reason] runModal];
+	[[repository windowController] showMessageSheet:@"Commit failed" infoText:reason];
 	return;
 }
 
 - (IBAction) commit:(id) sender
 {
 	if ([[cachedFilesController arrangedObjects] count] == 0) {
-		[[NSAlert alertWithMessageText:@"No changes to commit"
-						 defaultButton:nil
-					   alternateButton:nil
-						   otherButton:nil
-			 informativeTextWithFormat:@"You must first stage some changes before committing"] runModal];
+		[[repository windowController] showMessageSheet:@"No changes to commit" infoText:@"You must first stage some changes before committing"];
 		return;
 	}		
 
 	NSString *commitMessage = [commitMessageView string];
 	if ([commitMessage length] < 3) {
-		[[NSAlert alertWithMessageText:@"Commitmessage missing"
-						 defaultButton:nil
-					   alternateButton:nil
-						   otherButton:nil
-			 informativeTextWithFormat:@"Please enter a commit message before committing"] runModal];
+		[[repository windowController] showMessageSheet:@"Commitmessage missing" infoText:@"Please enter a commit message before committing"];
 		return;
 	}
 

PBGitIndexController.m

@@ -113,7 +113,7 @@ - (void) ignoreFiles:(NSArray *)files
 	} else {
 		ignoreFile = [NSMutableString stringWithContentsOfFile:gitIgnoreName usedEncoding:&enc error:&error];
 		if (error) {
-			[[NSAlert alertWithError:error] runModal];
+			[[commitController.repository windowController] showErrorSheet:error];
 			return;
 		}
 		// Add a newline if not yet present
@@ -124,7 +124,7 @@ - (void) ignoreFiles:(NSArray *)files
 
 	[ignoreFile writeToFile:gitIgnoreName atomically:YES encoding:enc error:&error];
 	if (error)
-		[[NSAlert alertWithError:error] runModal];
+		[[commitController.repository windowController] showErrorSheet:error];
 }
 
 # pragma mark Displaying diffs
@@ -166,11 +166,7 @@ - (void) forceRevertChangesForFiles:(NSArray *)files
 	int ret = 1;
 	[commitController.repository outputForArguments:arguments inputString:input retValue:&ret];
 	if (ret) {
-		[[NSAlert alertWithMessageText:@"Reverting changes failed"
-						 defaultButton:nil
-					   alternateButton:nil
-						   otherButton:nil
-			 informativeTextWithFormat:@"Reverting changes failed with error code %i", ret] runModal];
+		[[commitController.repository windowController] showMessageSheet:@"Reverting changes failed" infoText:[NSString stringWithFormat:@"Reverting changes failed with error code %i", ret]];
 		return;
 	}
 

PBGitWindowController.h

@@ -29,6 +29,8 @@
 
 - (void)changeViewController:(NSInteger)whichViewTag;
 - (void)useToolbar:(NSToolbar *)toolbar;
+- (void)showMessageSheet:(NSString *)messageText infoText:(NSString *)infoText;
+- (void)showErrorSheet:(NSError *)error;
 
 - (IBAction) showCommitView:(id)sender;
 - (IBAction) showHistoryView:(id)sender;

PBGitWindowController.m

@@ -122,6 +122,21 @@ - (void) showHistoryView:(id)sender
 		self.selectedViewIndex = 0;
 }
 
+- (void)showMessageSheet:(NSString *)messageText infoText:(NSString *)infoText
+{
+	[[NSAlert alertWithMessageText:messageText
+			 defaultButton:nil
+		       alternateButton:nil
+			   otherButton:nil
+	     informativeTextWithFormat:infoText] beginSheetModalForWindow: [self window] modalDelegate:self didEndSelector:nil contextInfo:nil];
+}
+
+- (void)showErrorSheet:(NSError *)error
+{
+	[[NSAlert alertWithError:error] beginSheetModalForWindow: [self window] modalDelegate:self didEndSelector:nil contextInfo:nil];
+}
+
+
 #pragma mark -
 #pragma mark Toolbar Delegates
 

PBRefController.m

@@ -60,11 +60,7 @@ - (void) checkoutRef:(PBRefMenuItem *)sender
 	int ret = 1;
 	[historyController.repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"checkout", [[sender ref] shortName], nil] retValue: &ret];
 	if (ret) {
-		[[NSAlert alertWithMessageText:@"Checking out branch failed"
-						 defaultButton:@"OK"
-					   alternateButton:nil
-						   otherButton:nil
-			 informativeTextWithFormat:@"There was an error checking out the branch. Perhaps your working directory is not clean?"] runModal];
+		[[historyController.repository windowController] showMessageSheet:@"Checking out branch failed" infoText:@"There was an error checking out the branch. Perhaps your working directory is not clean?"];
 		return;
 	}
 	[historyController.repository reloadRefs];
@@ -79,11 +75,7 @@ - (void) tagInfo:(PBRefMenuItem *)sender
     NSString *info = [historyController.repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"tag", @"-n50", @"-l", [[sender ref] shortName], nil] retValue: &ret];
 
     if (!ret) {
-        [[NSAlert alertWithMessageText:message
-                         defaultButton:@"OK"
-                       alternateButton:nil
-                           otherButton:nil
-             informativeTextWithFormat:info] runModal];
+	    [[historyController.repository windowController] showMessageSheet:message infoText:info];
     }
     return;
 }