• Added another block-based method to SSYAlert.

•  Better label for regular expressions

Author: jerrykrinock

Diff for: SSYAlert.h

@@ -737,6 +737,10 @@ extern NSObject <SSYAlertErrorHideManager> * gSSYAlertErrorHideManager ;
  */
 - (SSYAlertRecovery)alertError:(NSError*)error ;
 
+- (void)alertError:(NSError*)error
+          onWindow:(NSWindow*)window
+ completionHandler:(void(^)(NSModalResponse returnCode))completionHandler ;
+
 /*!
  @brief    Invokes -alertError: on the application's shared alert.
 */ 

Diff for: SSYAlert.m

@@ -2077,6 +2077,26 @@ - (void)returnToScriptError:(NSError*)error {
 	[[NSScriptCommand currentCommand] setScriptErrorString:[error localizedDescription]] ;
 }
 
+- (void)alertError:(NSError*)error
+          onWindow:(NSWindow*)window
+ completionHandler:(void(^)(NSModalResponse returnCode))completionHandler {
+    if (!error) {
+        return ;
+    }
+    
+    if ([gSSYAlertErrorHideManager shouldHideError:error]) {
+        return ;
+    }
+    
+    if ([[error domain] isEqualToString:NSCocoaErrorDomain] && ([error code] == NSUserCancelledError)) {
+        return ;
+    }
+
+    [self doLayoutError:error] ;
+    [self runModalSheetOnWindow:window
+              completionHandler:completionHandler] ;
+}
+
 - (void)alertError:(NSError*)error
 		  onWindow:(NSWindow*)documentWindow_
 	 modalDelegate:(id)modalDelegate

Diff for: SSYReplacePredicateEditorRowTemplate.m

@@ -114,9 +114,9 @@ - (BOOL)isRegex {
     return isRegex ;
 }
 
-
 @end
 
+
 @implementation SSYReplacePredicateEditorRowTemplate
 
 /* Superclass NSPredicateEditorRowTemplate must conform to NSCopying because,
@@ -187,7 +187,7 @@ + (NSString*)anyEditableStringValueInView:(NSView*)view {
 }
 
 + (NSString*)localizedRegexMenuItemTitle {
-    return NSLocalizedString(@"Matches Regular Expression", nil) ;
+    return NSLocalizedString(@"matches regular expression", nil) ;
 }
 
 @end