• SSYToolbarButton now has a -flashDuration property

• More styles added to SSYVectorImageStyle, parameter name 'diameter' changed to 'length' in imageStyle: length:color:rotateDegrees:

Author: jerrykrinock

SSYStarRatingView.m

@@ -44,15 +44,15 @@ - (id)initWithFrame:(NSRect)frame
         [self setDisplayMode:SSYStarRatingViewDisplayFull] ;
         [self setHalfStarThreshold:SSY_STAR_RATING_VIEW_DEFAULT_HALFSTAR_THRESHOLD] ;
 		[self setStarImage:[SSYVectorImages imageStyle:SSYVectorImageStyleStar
-											  diameter:starHeight
+											    length:starHeight
 												 color:[NSColor lightGrayColor]
 										 rotateDegrees:0.0]] ;
 		[self setStarHighlightedImage:[SSYVectorImages imageStyle:SSYVectorImageStyleStar
-														 diameter:starHeight
+														   length:starHeight
 															color:[NSColor blueColor]
 													rotateDegrees:0.0]] ;
 		[self setRemoveXImage:[SSYVectorImages imageStyle:SSYVectorImageStyleRemoveX
-												 diameter:(0.9 * starHeight)
+												   length:(0.9 * starHeight)
 													color:nil
 											rotateDegrees:0.0]] ;
 		[self setEditable:YES] ;

SSYToolbarButton.h

@@ -4,7 +4,8 @@
 /*!
  @brief    A toolbar item which has a tristate 'value' attribute,
  and three each additional images, labels and tooltips which 
- replace super's image, label and tooltip when the value is changed
+ replace super's image, label and tooltip when the value is changed,
+ and/or may be configured to flash when clicked.
 
  @details  
 */
@@ -13,6 +14,7 @@
 	NSImage* m_onImage ;
 	NSImage* m_offImage ;
 	NSImage* m_disImage ;
+    NSImage* m_originalImage ;
 	NSString* m_onLabel ;
 	NSString* m_offLabel ;
 	NSString* m_disLabel ;
@@ -21,6 +23,8 @@
 	NSString* m_disToolTip ;
 	id m_externalTarget ;
 	SEL m_externalAction ;
+    NSTimeInterval m_flashDuration ;
+    NSTimer* m_flashTimer ;
 }
 
 /*!
@@ -105,4 +109,10 @@
  */
 @property (retain) NSString* disToolTip ;
 
+/*!
+ @brief    Duration for which the receiver shall flash when it is clicked
+ @details  The default value is 0 (no flash)
+ */
+@property (assign) NSTimeInterval flashDuration ;
+
 @end

SSYToolbarButton.m

@@ -1,15 +1,19 @@
 #import "SSYToolbarButton.h"
+#import "NSImage+Transform.h"
 
 static NSString* const constKeyValue = @"value" ;
 static NSString* const constKeyToolTip = @"toolTip" ;
 
+
 @interface SSYToolbarButton ()
 
 // To avoid retain cycles, it is conventional to not retain
 // targets.  (In this case, I tested [super setTarget:aTarg]
 // and it does not increase the retain count of aTarg.)
 @property (assign) id externalTarget ;
 @property (assign) SEL externalAction ;
+@property (retain) NSImage* originalImage ;
+@property (assign) NSTimer* flashTimer ;  // NSTimer retains itself, so 'assign'
 
 @end
 
@@ -37,14 +41,16 @@ - (id)initWithItemIdentifier:(NSString*)identifier {
 @synthesize onImage = m_onImage ;
 @synthesize offImage = m_offImage ;
 @synthesize disImage = m_disImage ;
+@synthesize originalImage = m_originalImage ;
 @synthesize onLabel = m_onLabel ;
 @synthesize offLabel = m_offLabel ;
 @synthesize disLabel = m_disLabel ;
 @synthesize onToolTip = m_onToolTip ;
 @synthesize offToolTip = m_offToolTip ;
 @synthesize disToolTip = m_disToolTip ;
 @synthesize externalTarget = m_externalTarget ;
-@synthesize externalAction = m_externalAction ; 
+@synthesize externalAction = m_externalAction ;
+@synthesize flashDuration = m_flashDuration ;
 
 - (void)awakeFromNib {
 	// The following is to support some other object binding to the
@@ -108,18 +114,44 @@ - (void)setValue:(NSInteger)value {
 	if (toolTip) {
 		[self setToolTip:toolTip] ;
 	}
-}	
+}
+
+- (void)restoreOriginalImage:(NSTimer*)timer {
+    [self setImage:[self originalImage]] ;
+    [self setOriginalImage:nil] ;
+}
 
 - (IBAction)doDaClick:(id)sender {
+    if ([self flashDuration] > 0.0) {
+        NSImage* image = [self image] ;
+        [self setOriginalImage:image] ;
+        NSImage* darkerImage = [image copy] ;
+        [darkerImage darken] ;
+        [self setImage:darkerImage] ;
+        [darkerImage release] ;
+        NSTimer* timer = [NSTimer scheduledTimerWithTimeInterval:[self flashDuration]
+                                                          target:self
+                                                        selector:@selector(restoreOriginalImage:)
+                                                        userInfo:nil
+                                                         repeats:NO] ;
+        // Stash the timer so that we can invalidate it during -dealloc, in case
+        // we are deallocced (window closes, for example) before the timer
+        // fires.  Otherwise there would be a crash.
+        [self setFlashTimer:timer] ;
+    }
+    
 	//[self setValue:([self value] == NSOnState) ? NSOffState : NSOnState] ;
 	[[self externalTarget] performSelector:[self externalAction]
 								withObject:self] ;
 }
 
 - (void)dealloc {
+    [m_flashTimer invalidate] ;
+    
 	[m_onImage release] ;
 	[m_offImage release] ;
 	[m_disImage release] ;
+    [m_originalImage release] ;
 	[m_onLabel release] ;
 	[m_offLabel release] ;
 	[m_disLabel release] ;

SSYVectorImages.h

@@ -5,19 +5,32 @@ enum SSYVectorImageStyles_enum
 {
 	SSYVectorImageStylePlus,
 	SSYVectorImageStyleMinus,
+    /* Dash is narrower and thinner than Minus */
+    SSYVectorImageStyleDash,
     /* Triangle, horizonal baseline, pointing up, with top vertex 90 degrees.
-     This one is shorter and fatter.  */
+     This one is shorter and fatter than Triangle53.  */
 	SSYVectorImageStyleTriangle90,
     /* Triangle, horizonal baseline, pointing up, with top vertex 2*arctan(.5)
-     = 53.2 degrees.  This one is a taller and thinner. */
+     = 53.2 degrees.  This one is a taller and thinner than Triangle90. */
 	SSYVectorImageStyleTriangle53,
-	SSYVectorImageStyleInfo,
+	SSYVectorImageStyleInfoOff,
+    SSYVectorImageStyleInfoOn,
+    SSYVectorImageStyleHelp,
 	/* Five-pointed star used in SSYStarRatingView */
     SSYVectorImageStyleStar,
     /* White "X" inside a gray circle, used in SSYStarRatingView */
 	SSYVectorImageStyleRemoveX,
-    /* "Bookmark", solid color except for a white hole near the top */
-    SSYVectorImageStyleBookmark
+    /* "Bookmark", solid black except for a white hole near the top */
+    SSYVectorImageStyleBookmark,
+    SSYVectorImageStyleHierarchy,
+    SSYVectorImageStyleFlat,
+    SSYVectorImageStyleLineage,
+    SSYVectorImageStyleTag,
+    SSYVectorImageStyleCheck1,
+    SSYVectorImageStyleCheck2,
+    SSYVectorImageStyleBookmarksInFolder,
+    SSYVectorImageStyleSettings,
+    SSYVectorImageStyleReports
 } ;
 typedef enum SSYVectorImageStyles_enum SSYVectorImageStyle ;
 
@@ -29,7 +42,7 @@ typedef enum SSYVectorImageStyles_enum SSYVectorImageStyle ;
 @param    rotateDegrees  Measure by which the result should be rotated clockwise
  */
 + (NSImage*)imageStyle:(SSYVectorImageStyle)style
-			  diameter:(CGFloat)diameter
+                length:(CGFloat)length
 				 color:(NSColor*)color
 		 rotateDegrees:(CGFloat)rotateDegrees ;