diff options
| author | Abhi Beckert <abhi@abhibeckert.com> | 2016-01-29 06:40:18 +1000 |
|---|---|---|
| committer | Abhi Beckert <abhi@abhibeckert.com> | 2016-01-29 06:40:18 +1000 |
| commit | f4c4300dca0c416c12b3992204778ef9f37981ec (patch) | |
| tree | e76a4747bf1c3f82bc037990bf84e3f13062601e /Source/SPTextViewAdditions.m | |
| parent | 465062dacc96c2c84bfe9cff1ded58c14d01bdcd (diff) | |
| parent | 3aadea1be33212ca50e7faffcd0620ea976f9d59 (diff) | |
| download | sequelpro-f4c4300dca0c416c12b3992204778ef9f37981ec.tar.gz sequelpro-f4c4300dca0c416c12b3992204778ef9f37981ec.tar.bz2 sequelpro-f4c4300dca0c416c12b3992204778ef9f37981ec.zip | |
Merge remote-tracking branch 'sequelpro/master'
Diffstat (limited to 'Source/SPTextViewAdditions.m')
| -rw-r--r-- | Source/SPTextViewAdditions.m | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/Source/SPTextViewAdditions.m b/Source/SPTextViewAdditions.m index 56103a53..88096a8f 100644 --- a/Source/SPTextViewAdditions.m +++ b/Source/SPTextViewAdditions.m @@ -653,8 +653,11 @@ if(inputFileError != nil) { NSString *errorMessage = [inputFileError localizedDescription]; - SPBeginAlertSheet(NSLocalizedString(@"Bundle Error", @"bundle error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [self window], self, nil, nil, - [NSString stringWithFormat:@"%@ “%@”:\n%@", NSLocalizedString(@"Error for", @"error for message"), [cmdData objectForKey:@"name"], errorMessage]); + SPOnewayAlertSheet( + NSLocalizedString(@"Bundle Error", @"bundle error"), + [self window], + [NSString stringWithFormat:@"%@ “%@”:\n%@", NSLocalizedString(@"Error for", @"error for message"), [cmdData objectForKey:@"name"], errorMessage] + ); if (cmdData) [cmdData release]; return; } @@ -772,8 +775,11 @@ } } else if([err code] != 9) { // Suppress an error message if command was killed NSString *errorMessage = [err localizedDescription]; - SPBeginAlertSheet(NSLocalizedString(@"BASH Error", @"bash error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [self window], self, nil, nil, - [NSString stringWithFormat:@"%@ “%@”:\n%@", NSLocalizedString(@"Error for", @"error for message"), [cmdData objectForKey:@"name"], errorMessage]); + SPOnewayAlertSheet( + NSLocalizedString(@"BASH Error", @"bash error"), + [self window], + [NSString stringWithFormat:@"%@ “%@”:\n%@", NSLocalizedString(@"Error for", @"error for message"), [cmdData objectForKey:@"name"], errorMessage] + ); } } @@ -843,7 +849,7 @@ if([keyEq length]) [mItem setKeyEquivalentModifierMask:[[[item objectForKey:SPBundleFileKeyEquivalentKey] objectAtIndex:1] intValue]]; - [mItem setTarget:[[NSApp mainWindow] firstResponder]]; + [mItem setTarget:[[NSApp keyWindow] firstResponder]]; if([item objectForKey:SPBundleFileTooltipKey]) [mItem setToolTip:[item objectForKey:SPBundleFileTooltipKey]]; |