Merge pull request #35 from ShadowLightz/master

Replace deprecated NSRunCriticalAlertPanel with NSAlert
cocoabits · Jun 14, 2014 · a21ac33 · a21ac33
2 parents ea5a30f + 7d36048
commit a21ac33
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/MASShortcutView.m b/MASShortcutView.m
@@ -380,12 +380,17 @@ - (void)activateEventMonitoring:(BOOL)shouldActivate
                             [weakSelf activateEventMonitoring:NO];
                             NSString *format = NSLocalizedString(@"The key combination %@ cannot be used",
                                                                  @"Title for alert when shortcut is already used");
-                            NSRunCriticalAlertPanel([NSString stringWithFormat:format, shortcut], @"%@",
-                                                    NSLocalizedString(@"OK", @"Alert button when shortcut is already used"),
-                                                    nil, nil, error.localizedDescription);
-                            weakSelf.shortcutPlaceholder = nil;
-                            [weakSelf activateResignObserver:YES];
-                            [weakSelf activateEventMonitoring:YES];
+                            NSAlert* alert = [[NSAlert alloc]init];
+                            alert.messageText = [NSString stringWithFormat:format, shortcut];
+                            alert.informativeText = error.localizedDescription;
+                            alert.alertStyle = NSWarningAlertStyle;
+                            weakSelf.recording = NO;
+                            [alert beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) {
+                                weakSelf.shortcutPlaceholder = nil;
+                                [weakSelf activateResignObserver:YES];
+                                [weakSelf activateEventMonitoring:YES];
+                                weakSelf.recording = YES;
+                            }];
                         }
                         else {
                             weakSelf.shortcutValue = shortcut;