BookMacster 1.19.9, shipped

Author: jerrykrinock

Diff for: SSYAlert.m

@@ -688,9 +688,10 @@ + (void)supportError:(NSError*)error {
 							  @"*** Note to user***  It is possible that this file may have some of your private "
 							  @"information in it, bookmarks in particular.  Please skim through it before sending.  "
 							  @"Delete anything which is too private, add a little note in its place, then save this file.\n\n"
-							  @"To zip this file, select it in Finder, then execute a secondary click.  A secondary click "
-							  @"can also be produced by clicking it with the right/secondary mouse button, or holding down "
-							  @"the 'control' key while clicking on it.  From the contextual menu which appears, click 'Compress...' "
+							  @"To zip this file, select it in Finder, then execute a secondary click.  (A secondary click "
+							  @"means to click it while holding down the 'control' key, or to tap with two fingers if you "
+                              @"have a trackpad, or to use the secondary button if you have a multi-button mouse.)  "
+							  @"From the contextual menu which appears, click 'Compress...' "
 							  @"A new file with a name ending in .zip will appear.\n\n"
 							  @"Please send the .zip file to our support crew, and thank you for helping us to support",
 							  appName,
@@ -711,7 +712,12 @@ + (void)supportError:(NSError*)error {
 									  buttons:nil] ;
 
 				mailableDescription = [NSString stringWithFormat:
-									   @"*** Please review, zip and attach file %@. ***",
+									   @"******   I M P O R T A N T   I N S T R U C T I O N S   ******\n\n"
+									   @"*** Please look on your Desktop and find the file named %@ ***\n"
+                                       @"Review for your privacy, zip and ATTACH it before sending this.\n"
+                                       @"To zip a file, perform a secondary click (right-click or control-click)\n"
+                                       @"on it, then from the contextual menu which appears, click 'Compress ...'.\n"
+                                       @"Attach the .zip file which appears.  Thank you.\n",
 									   filename] ;
 			}
 			else {

Diff for: SSYLaunchdGuy.m

@@ -92,6 +92,17 @@ + (NSError*)warnUserIfLaunchdHangInTaskResult:(NSInteger)result
 // 35.0 seconds.
 #define LAUNCHCTL_TIMEOUT 35.0
 
+/*
+ @details  TODO: See if there is a better way to do this, without using
+ /bin/lauchctl, and NSTask in general.  First, see here…
+ http://www.opensource.apple.com/source/initng/initng-12/initng/src/launch.h
+ http://www.opensource.apple.com/source/initng/initng-12/initng/src/launchctl.c
+ which seems to have several useful functions, but they are not formally
+ documented.  On the other hand, the overview of the Service Management
+ framework says that it "...provides support for loading and unloading launchd
+ jobs and reading and manipulating job dictionaries from within an application."
+ That's great, except the last time I look, it didn't.
+ */
 + (BOOL)agentLoadPath:(NSString*)plistPath
 			  error_p:(NSError**)error_p {	
 	NSString* subcmd = @"load" ;
@@ -569,7 +580,7 @@ + (BOOL)removeAgentWithLabel:(NSString*)label
 	[[NSFileManager defaultManager] createFileAtPath:cmdPath
 											contents:data
 										  attributes:attributes] ;
-    NSTask* task = [[NSTask alloc] init] ;	
+    NSTask* task = [[NSTask alloc] init] ;
     [task setLaunchPath:cmdPath] ;
 	[task launch] ;
 	[task release] ;

Diff for: SSYPersistentDocumentMultiMigrator.m

@@ -61,6 +61,9 @@ + (BOOL)migrateIfNeededStoreAtUrl:(NSURL*)url
 	NSURL* destempUrl = nil ; 	// destemp means "destination/temporary"
 
 	// Get store metadata for the document to be opened.
+    // If the file indicated at url will not load, Core Data will log an
+    // "error" here.  I @tryed to @catch exceptions, but got nothing.
+    // Oh well, just ignore it.
 	NSDictionary *storeMetadata = [NSPersistentStoreCoordinator metadataForPersistentStoreOfType:nil
 																							 URL:url 
 																						   error:&underlyingError] ;  

Diff for: SSYShortcutActuator.h

@@ -1,9 +1,34 @@
 #import <Cocoa/Cocoa.h>
 #import "SRCommon.h"  // for KeyCombo, also this imports <Carbon/Carbon.h>
 
+/*
+ @brief    Posted whenever the count of shortcuts registered with the shared
+ actuator increases from 0 to 1
+ 
+ @details  The notification object is the shared actuator.  If the user defaults
+ contains one or more shortcuts to be registered, this notification will be
+ posted during the -init of the shared actuator.
+ */
 extern NSString* const SSYShortcutActuatorDidNonemptyNotification ;
+
+/*
+ @brief    Posted whenever the count of shortcuts registered with the shared
+ actuator decreases from 1 to 0
+ 
+ @details  The notification object is the shared actuator.
+ */
 extern NSString* const SSYShortcutActuatorDidEmptyNotification ;
 
+/*
+ @brief    Posted at the conclusion of -setKeyCode:modifierFlags:selectorName:,
+ whether or not any shortcut was actually registered or unregistered
+ 
+ @details  The notification object is the actuator to which
+ -setKeyCode:modifierFlags:selectorName: was sent.
+ */
+extern NSString* const SSYShortcutActuatorDidChangeShortcutsNotification ;
+
+
 
 @interface SSYShortcutActuator : NSObject {
 	NSMutableDictionary* m_registeredShortcutInfos ;
@@ -21,7 +46,6 @@ extern NSString* const SSYShortcutActuatorDidEmptyNotification ;
  http://inquisitivecocoa.com/2009/04/05/key-code-translator/
  @param    keyCode  
  @param    modifierFlags  
- @result   
 */
 + (NSString*)stringForKeyCode:(NSInteger)keyCode
 				modifierFlags:(NSUInteger)modifierFlags ;
@@ -66,8 +90,27 @@ extern NSString* const SSYShortcutActuatorDidEmptyNotification ;
 	 modifierFlags:(NSUInteger)modifierFlags
 	  selectorName:(NSString*)selectorName ;
 
+/*!
+ @brief    Returns the KeyCombo of the shortcut which is currently registered to
+ invoke a give selector
+ 
+ @details  If no such shortcut is currently registered, the 'code' member of
+ the result is -1.  Or use -hasKeyComboForSelectorName: instead.
+ */
 - (KeyCombo)keyComboForSelectorName:(NSString*)selectorName ;
 
+/*!
+ @brief    Returns whether or not a keyboard shortcut is currently registered
+ to invoke a given selector
+ */
+- (BOOL)hasKeyComboForSelectorName:(NSString*)selectorName ;
+
+/*!
+ @brief    Returns whether or not the receiver has one or more keyboard
+ shortcuts currently registered
+ */
+- (BOOL)hasAnyKeyCombo ;
+
 - (void)disableAllShortcuts ;
 - (void)enableAllShortcuts ;
 

Diff for: SSYShortcutActuator.m

@@ -47,7 +47,7 @@
 
 NSString* const SSYShortcutActuatorDidNonemptyNotification = @"SSYShortcutActuatorDidNonemptyNotification" ;
 NSString* const SSYShortcutActuatorDidEmptyNotification = @"SSYShortcutActuatorDidEmptyNotification" ;
-
+NSString* const SSYShortcutActuatorDidChangeShortcutsNotification = @"SSYShortcutActuatorDidChangeShortcutsNotification" ;
 
 @interface SSYShortcutActuator ()
 
@@ -512,6 +512,32 @@ - (KeyCombo)keyComboForSelectorName:(NSString*)selectorName {
 	return keyCombo ;
 }
 
+- (BOOL)hasKeyComboForSelectorName:(NSString*)selectorName {
+    return ([self keyComboForSelectorName:selectorName].code != -1) ;
+}
+
+- (BOOL)hasAnyKeyCombo {
+    BOOL answer = NO ;
+    NSDictionary* shortcutInfos = [[NSUserDefaults standardUserDefaults] objectForKey:SSYShortcutActuatorKeyBindings] ;
+    if ([shortcutInfos respondsToSelector:@selector(objectForKey:)]) {
+        for (NSString* selectorName in shortcutInfos) {
+            NSDictionary* shortcutInfo = [shortcutInfos objectForKey:selectorName] ;
+            if ([shortcutInfo respondsToSelector:@selector(objectForKey:)]) {
+                NSNumber* number = [shortcutInfo objectForKey:constKeyKeyCode] ;
+                if ([number respondsToSelector:@selector(integerValue)]) {
+                    NSInteger value = [number integerValue] ;
+                    if (value != -1) {
+                        answer = YES ;
+                        break ;
+                    }
+                }
+            }
+        }
+    }
+    
+    return answer ;
+}
+
 - (void)disableAllShortcuts {
 	[self unregisterAllShortcuts] ;
 	[self removeAllRegisteredShortcutInfos] ;
@@ -581,6 +607,9 @@ - (void)setKeyCode:(NSInteger)keyCode
 		// Since we've got at least one shortcut now, start observing
 		[self postDidEmpty:NO] ;
 	}
+    
+    [[NSNotificationCenter defaultCenter] postNotificationName:SSYShortcutActuatorDidChangeShortcutsNotification
+                                                        object:self] ;
 }
 
 @end