Halfway done with BookMacster 1.18.

Author: jerrykrinock

SSYAppInfo.m

@@ -60,7 +60,7 @@ - (void)setUpgradeState:(enum SSYAppInfoUpgradeState)upgradeState {
 	_upgradeState = upgradeState ;
 }
 
-// Keep this method private, vecause it gives the value from User Defaults, which
+// Keep this method private, because it gives the value from User Defaults, which
 // will already have been changed to the current version after the SSYAppInfo
 // singleton instance has been created, which is probably not what you expect.
 // You probably want +previousVersionTriplet instead.
@@ -71,27 +71,22 @@ + (SSYVersionTriplet*)rawPreviousVersionTriplet {
 }
 
 + (SSYVersionTriplet*)rawCurrentVersionTriplet {
-	// Prior BookMacster 1.6.8/1.7.0, we used this:
-	// 	SSYVersionTriplet* cvt = [SSYVersionTriplet versionTripletFromBundleIdentifier:[[NSBundle mainBundle] bundleIdentifier]] ;
-	// which was bad because it allowed Launch Services to give us the bundle, which
-	// may have been from a different app instance if different versions of thisapp
-	// are installed on this Mac.  That was pretty stupid, but probably is because
-	// originally that method was used to get versions of *other* apps.
-	NSString* versionString = [SSYVersionTriplet rawVersionStringFromBundle:[NSBundle mainBundle]] ; 
+	NSString* versionString = [SSYVersionTriplet rawVersionStringFromBundle:[NSBundle mainBundle]] ;
 	SSYVersionTriplet* cvt = [SSYVersionTriplet versionTripletFromString:versionString] ;
 	return cvt ;
 }
 
 
 - (id)init {
-	self = [super init];
+	self = [super init] ;
 	if (self != nil) {
 		SSYVersionTriplet* previousVersionTriplet = [SSYAppInfo rawPreviousVersionTriplet] ;
 		[self setPreviousVersionTriplet:previousVersionTriplet] ;
 		[self setCurrentVersionTriplet:[SSYAppInfo rawCurrentVersionTriplet]] ;
-		_upgradeState = [SSYAppInfo upgradeStateForCurrentVersionTriplet:[self currentVersionTriplet] 
-												  previousVersionTriplet:[self previousVersionTriplet]] ;
-		if (_upgradeState != SSYCurrentRev) {
+        enum SSYAppInfoUpgradeState upgradeState = [SSYAppInfo upgradeStateForCurrentVersionTriplet:[self currentVersionTriplet]
+                                                                             previousVersionTriplet:[self previousVersionTriplet]] ;
+		[self setUpgradeState:upgradeState] ;
+		if ([self upgradeState] != SSYCurrentRev) {
 			// Get a nice, clean, filtered versionString of the form "major.minor.bugFix" using SSVersionTriplet methods
 			SSYVersionTriplet* currentVersionTriplet = [SSYVersionTriplet versionTripletFromBundleIdentifier:[[NSBundle mainBundle] bundleIdentifier]] ;
 			NSString* currentVersionString = [currentVersionTriplet string] ;
@@ -110,7 +105,9 @@ - (id)init {
 
 
 + (BOOL)isNewUser {
-	return ([[self sharedInfo] upgradeState] >= SSYNewUser) ;
+    enum SSYAppInfoUpgradeState upgradeState = [[self sharedInfo] upgradeState] ;
+    BOOL answer = (upgradeState >= SSYNewUser) ;
+	return answer ;
 }
 
 + (BOOL)didUpgradeSinceLastRun {

SSYGrayRect.h

@@ -7,7 +7,22 @@
  toolbar at the top of same window.
 */
 @interface SSYGrayRect : NSView {
-
+    CGFloat m_topWhite ;
+    CGFloat m_bottomWhite ;
 }
 
+
+/*!
+ @brief     The white value (0=black, 1=white) at the top of the receiver
+ @details   Initial default value is 0.627.
+ */
+@property (assign) CGFloat topWhite ;
+
+/*!
+ @brief     The white value (0=black, 1=white) at the top of the receiver
+ @details   Initial default value is 0.784.
+ */
+@property (assign) CGFloat bottomWhite ;
+
+
 @end

SSYGrayRect.m

@@ -3,19 +3,32 @@
 
 @implementation SSYGrayRect
 
+
+
+- (void)awakeFromNib {
+    [self setTopWhite:0.627] ;
+    [self setBottomWhite:0.784] ;
+}
+
 - (void)drawRect:(NSRect)dirtyRect {
 	[super drawRect:dirtyRect] ;
 
 	[self lockFocus] ;
 
-	// Using Digital Color Meter.app, Safari's status bar measures 216 at the bottom, 221 at the top.
-	// To match this, I need to use 208/255 at the bottom, 214/255 at the top (Why????)
-	// However, I want it to complement the toolbar in BookMacster, which is a little darker.
-	NSGradient* gradient = [[NSGradient alloc] initWithStartingColor:[NSColor colorWithCalibratedWhite:(160.0/255.0) alpha:1.0]    // top color
-														 endingColor:[NSColor colorWithCalibratedWhite:(200.0/255.0) alpha:1.0]] ; // bottom color
-	[gradient drawInRect:[self frame]
+	NSGradient* gradient = [[NSGradient alloc] initWithStartingColor:[NSColor colorWithCalibratedWhite:[self topWhite]
+                                                                                                 alpha:1.0]
+														 endingColor:[NSColor colorWithCalibratedWhite:[self bottomWhite]
+                                                                                                 alpha:1.0]] ;
+    
+    // The following was fixed in BookMacster 1.18 so that it works
+    // if the instance does not happen to located at {0,0} in its superview :)
+    NSRect frame ;
+    frame.origin.x = 0 ;
+    frame.origin.y = 0 ;
+    frame.size.width = [self frame].size.width ;
+    frame.size.height = [self frame].size.height ;
+	[gradient drawInRect:frame
 				   angle:270.0] ;
-	
 	[self unlockFocus] ;
 	[gradient release] ;
 }

SSYPersistentDocumentMultiMigrator.m

@@ -255,11 +255,9 @@ + (BOOL)migrateIfNeededStoreAtUrl:(NSURL*)url
         // Fix 20130610 - Does not work.
         BOOL isWritable = [[NSFileManager defaultManager] isWritableFileAtPath:[url absoluteString]] ;
         BOOL isInViewingMode = [document isInViewingMode] ;
-        /*SSYDBL*/ NSLog(@"isWritable = %ld   isInViewingMode = %ld ", isWritable, isInViewingMode) ;
         if (isInViewingMode) {
             NSString* fileNameExtension = [[url absoluteString] pathExtension] ;
             NSString* writablePath = [[[NSFileManager defaultManager] temporaryFilePath] stringByAppendingPathExtension:fileNameExtension] ;
-            /*SSYDBL*/ NSLog(@"Not writable.\nCopying: %@\n     To: %@", [url absoluteString], writablePath) ;
             ok = [[NSFileManager defaultManager] copyItemAtPath:[url absoluteString]
                                                          toPath:writablePath
                                                           error:&underlyingError] ;

SSYProcessTyper.m

@@ -5,9 +5,9 @@ @implementation SSYProcessTyper
 /*
  Added in BookMacster 1.14.4.  See piggyback comment in counterpart .h file.
  */
-+ (ProcessApplicationTransformState)appleTypeForType:(SSYProcessTyperType)type {	
++ (ProcessApplicationTransformState)appleTypeForType:(SSYProcessTyperType)type {
 	ProcessApplicationTransformState answer ;
-
+    
 #if MAC_OS_X_VERSION_MAX_ALLOWED > 1060
 	switch (type) {
 		case SSYProcessTyperTypeForeground:
@@ -47,7 +47,7 @@ + (SSYProcessTyperType)currentType {
     else {
         type = SSYProcessTyperTypeForeground ;
     }
-
+    
 	if (info != NULL) {
 		CFRelease((CFDictionaryRef)info) ;
 	}
@@ -86,10 +86,11 @@ + (void)bringFrontPid:(pid_t)pid {
 }
 
 + (void)transformToType:(SSYProcessTyperType)type {
-    if (type == [self currentType]) {
-        // Nothing to do
-        return ;
-    }
+    // The following was removed in BookMacster 1.18
+    //    if (type == [self currentType]) {
+    //        // Nothing to do
+    //        return ;
+    //    }
 
     if (type != SSYProcessTyperTypeForeground) {
         if (NSAppKitVersionNumber < 1100) {
@@ -102,19 +103,19 @@ + (void)transformToType:(SSYProcessTyperType)type {
     // Actual Subtance
     ProcessSerialNumber psn = { 0, kCurrentProcess } ;
     OSStatus err ;
-    err = TransformProcessType(&psn, [self appleTypeForType:type]) ;
+    ProcessApplicationTransformState appleType = [self appleTypeForType:type] ;
+    err = TransformProcessType(&psn, appleType) ;
     if (err != noErr) {
-        NSLog(@"Internal Error 915-9387 %ld", (long)err) ;
+        // If you TransformProcessType to the current process type, that is,
+        // don't change the type, you'll get err = -50 = paramErr here.
+        // We don't consider that to be an error, and there are no other
+        // reasonable errors that we know of.  So we ignore err.
     }
 
     BOOL doShow = (type == SSYProcessTyperTypeForeground) ;
-
+    
     if (doShow) {
 		[NSApp activateIgnoringOtherApps:YES] ;
-        err = ShowHideProcess(&psn, true);
-        if (err != noErr) {
-            NSLog(@"Internal Error 915-9172 %ld", (long)err) ;
-        }
     }
 }
 

SSYTempWindowController.h

@@ -21,7 +21,7 @@
  In this nib,
  *  File's Owner should be set to your subclass of this class
  *  File's Owner 'window' outlet should be wired to a window
- *  Said window should have checked
+ *  Said window should have these checkboxes switched ON
  **  ON  Release When Closed
  **  OFF Visible At Launch
  **  In the MEMORY section,

SSYVectorImages.h

@@ -5,9 +5,11 @@ enum SSYVectorImageStyles_enum
 {
 	SSYVectorImageStylePlus,
 	SSYVectorImageStyleMinus,
-    /* Triangle, horizonal baseline, pointing up, with top vertex 90 degrees */
+    /* Triangle, horizonal baseline, pointing up, with top vertex 90 degrees.
+     This one is shorter and fatter.  */
 	SSYVectorImageStyleTriangle90,
-    /* Triangle, horizonal baseline, pointing up, with top vertex 2*arctan(.5) = 53.2 degrees */
+    /* Triangle, horizonal baseline, pointing up, with top vertex 2*arctan(.5)
+     = 53.2 degrees.  This one is a taller and thinner. */
 	SSYVectorImageStyleTriangle53,
 	SSYVectorImageStyleInfo,
 	/* Five-pointed star used in SSYStarRatingView */
@@ -21,6 +23,9 @@ typedef enum SSYVectorImageStyles_enum SSYVectorImageStyle ;
 @interface SSYVectorImages : NSObject {
 }
 
+/*
+@param    Measure by which the result should be rotated clockwise
+ */
 + (NSImage*)imageStyle:(SSYVectorImageStyle)style
 			  diameter:(CGFloat)diameter
 				 color:(NSColor*)color