Fixed a bug in updateTime:

[MenuTunes.git] / StatusWindow.m

diff --git a/StatusWindow.m b/StatusWindow.m
index ffbc1e6..3a84d8b 100755 (executable)
--- a/StatusWindow.m
+++ b/StatusWindow.m
@@ -19,8 +19,6 @@
 #define SW_BUTTON_DIV      12.00
 #define SW_BUTTON_EXTRA_W   8.00
 #define SW_SHADOW_SAT       1.25
 #define SW_BUTTON_DIV      12.00
 #define SW_BUTTON_EXTRA_W   8.00
 #define SW_SHADOW_SAT       1.25

-#define SMALL_DIVISOR       1.33333
-#define MINI_DIVISOR        1.66667

 
 @interface StatusWindow (Private)
 - (NSRect)setupWindowWithDataSize:(NSSize)dataSize;
 
 @interface StatusWindow (Private)
 - (NSRect)setupWindowWithDataSize:(NSSize)dataSize;


@@ -53,7 +51,7 @@
 
 - (void)dealloc
 {
 
 - (void)dealloc
 {

-    [_image     release];
+    [_image release];

     [super dealloc];
 }
 
     [super dealloc];
 }
 


@@ -80,7 +78,6 @@
     _sizing = newSizing;
 }
 
     _sizing = newSizing;
 }
 

-

 /*************************************************************************/
 #pragma mark -
 #pragma mark INSTANCE METHODS
 /*************************************************************************/
 #pragma mark -
 #pragma mark INSTANCE METHODS


@@ -119,11 +116,11 @@
     float        maxHeight     = ( screenHeight - (SW_BORDER * 2) );
     float        excessWidth   = 0.0;
     float        excessHeight  = 0.0;
     float        maxHeight     = ( screenHeight - (SW_BORDER * 2) );
     float        excessWidth   = 0.0;
     float        excessHeight  = 0.0;

-    NSPoint      windowOrigin;
+    NSPoint      windowOrigin  = NSZeroPoint;

     ITImageView *imageView;
     BOOL         shouldAnimate = ( ! (([self visibilityState] == ITWindowAppearingState) ||
                                       ([self visibilityState] == ITWindowVanishingState)) );
     ITImageView *imageView;
     BOOL         shouldAnimate = ( ! (([self visibilityState] == ITWindowAppearingState) ||
                                       ([self visibilityState] == ITWindowVanishingState)) );

-        
+       

     if ( _sizing == ITTransientStatusWindowSmall ) {
         divisor = SMALL_DIVISOR;
     } else if ( _sizing == ITTransientStatusWindowMini ) {
     if ( _sizing == ITTransientStatusWindowSmall ) {
         divisor = SMALL_DIVISOR;
     } else if ( _sizing == ITTransientStatusWindowMini ) {


@@ -138,7 +135,7 @@
     contentHeight = ( ( imageHeight > dataHeight ) ? imageHeight : dataHeight );
 
 //  Setup the Window, and remove all its contentview's subviews.
     contentHeight = ( ( imageHeight > dataHeight ) ? imageHeight : dataHeight );
 
 //  Setup the Window, and remove all its contentview's subviews.

-    windowWidth  = ( (SW_PAD / divisor) + imageWidth + (SW_SPACE / divisor) + dataWidth + (SW_PAD / divisor) );
+    windowWidth  = ( (SW_PAD / divisor) + imageWidth + ((dataWidth > 0) ? (SW_SPACE / divisor) + dataWidth : 0) + (SW_PAD / divisor) );

     windowHeight = ( (SW_PAD / divisor) + contentHeight + (SW_PAD / divisor) );
     
 //  Constrain size to max limits.  Adjust data sizes accordingly.
     windowHeight = ( (SW_PAD / divisor) + contentHeight + (SW_PAD / divisor) );
     
 //  Constrain size to max limits.  Adjust data sizes accordingly.


@@ -180,7 +177,7 @@
     [[[self contentView] subviews] makeObjectsPerformSelector:@selector(removeFromSuperview)];
     
 //  Setup, position, fill, and add the image view to the content view.
     [[[self contentView] subviews] makeObjectsPerformSelector:@selector(removeFromSuperview)];
     
 //  Setup, position, fill, and add the image view to the content view.

-    imageRect = NSMakeRect( (SW_PAD / divisor) + 4,
+    imageRect = NSMakeRect( (SW_PAD / divisor) + ((dataWidth > 0) ? 4 : 0),

                             ((SW_PAD / divisor) + ((contentHeight - imageHeight) / 2)),
                             imageWidth,
                             imageHeight );
                             ((SW_PAD / divisor) + ((contentHeight - imageHeight) / 2)),
                             imageWidth,
                             imageHeight );


@@ -196,7 +193,25 @@
                        dataHeight);
 }
 
                        dataHeight);
 }
 

-- (void)buildTextWindowWithString:(NSString *)text
+- (void)buildImageWindowWithImage:(NSImage *)image
+{
+       if (!_locked) {
+               float divisor = 1.0;
+               NSRect dataRect;
+               
+               if (_sizing == ITTransientStatusWindowSmall) {
+                       divisor = SMALL_DIVISOR;
+               } else if (_sizing == ITTransientStatusWindowMini) {
+                       divisor = MINI_DIVISOR;
+               }
+               
+               [self setImage:image];
+               dataRect = [self setupWindowWithDataSize:NSMakeSize(0, 0)]; //We have no text, so there is no data
+               [[self contentView] setNeedsDisplay:YES];
+       }
+}
+
+- (void)buildTextWindowWithString:(id)text

 {
     if ( ! _locked ) {
 
 {
     if ( ! _locked ) {
 


@@ -204,9 +219,9 @@
         float         dataWidth     = 0.0;
         float         dataHeight    = 0.0;
         NSRect        dataRect;
         float         dataWidth     = 0.0;
         float         dataHeight    = 0.0;
         NSRect        dataRect;

-        NSArray      *lines         = [text componentsSeparatedByString:@"\n"];
+        NSArray      *lines                    = [(([text isKindOfClass:[NSString class]]) ? text : [text mutableString]) componentsSeparatedByString:@"\n"];

         id                       oneLine       = nil;
         id                       oneLine       = nil;

-        NSEnumerator *lineEnum      = [lines objectEnumerator];
+        NSEnumerator *lineEnum         = [lines objectEnumerator];

         float         baseFontSize  = 18.0;
         ITTextField  *textField;
         NSFont       *font;
         float         baseFontSize  = 18.0;
         ITTextField  *textField;
         NSFont       *font;


@@ -217,10 +232,10 @@
         } else if ( _sizing == ITTransientStatusWindowMini ) {
             divisor = MINI_DIVISOR;
         }
         } else if ( _sizing == ITTransientStatusWindowMini ) {
             divisor = MINI_DIVISOR;
         }

-
-        font = [NSFont fontWithName:@"Lucida Grande Bold" size:(baseFontSize / divisor)];
-        attr = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName];
-        
+               
+               font = [NSFont fontWithName:@"LucidaGrande-Bold" size:(baseFontSize / divisor)];
+               attr = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName];
+               

 //      Iterate over each line to get text width and height
         while ( (oneLine = [lineEnum nextObject]) ) {
 //          Get the width of one line, adding 8.0 because Apple sucks donkey rectum.
 //      Iterate over each line to get text width and height
         while ( (oneLine = [lineEnum nextObject]) ) {
 //          Get the width of one line, adding 8.0 because Apple sucks donkey rectum.


@@ -247,13 +262,19 @@
         [textField setTextColor:[NSColor whiteColor]];
         [textField setCastsShadow:YES];
         [[textField cell] setWraps:NO];
         [textField setTextColor:[NSColor whiteColor]];
         [textField setCastsShadow:YES];
         [[textField cell] setWraps:NO];

-        [textField setStringValue:text];
+               
+               if ([text isKindOfClass:[NSString class]]) {
+                       [textField setStringValue:text];
+               } else {
+                       [textField setAttributedStringValue:text];
+               }
+               

         [textField setShadowSaturation:SW_SHADOW_SAT];
         [[self contentView] addSubview:textField];
         
 //      Display the window.
         [[self contentView] setNeedsDisplay:YES];
         [textField setShadowSaturation:SW_SHADOW_SAT];
         [[self contentView] addSubview:textField];
         
 //      Display the window.
         [[self contentView] setNeedsDisplay:YES];

-
+               _textField = textField;

     }
 }
 
     }
 }
 


@@ -285,7 +306,7 @@
             divisor = MINI_DIVISOR;
         }
         
             divisor = MINI_DIVISOR;
         }
         

-        font        = [NSFont fontWithName:@"Lucida Grande Bold" size:( size / divisor )];
+        font        = [NSFont fontWithName:@"AppleGothic" size:( size / divisor )];

         attr        = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName];
         charSize    = [character sizeWithAttributes:attr];
         cellHeight  = ( charSize.height + 4.0 );  // Add 4.0 for shadow
         attr        = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName];
         charSize    = [character sizeWithAttributes:attr];
         cellHeight  = ( charSize.height + 4.0 );  // Add 4.0 for shadow


@@ -375,9 +396,9 @@
             divisor = MINI_DIVISOR;
         }
         
             divisor = MINI_DIVISOR;
         }
         

-        font = [NSFont fontWithName:@"Lucida Grande Bold" size:(baseFontSize / divisor)];
+        font = [NSFont fontWithName:@"LucidaGrande-Bold" size:(baseFontSize / divisor)];

         attr = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName];
         attr = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName];

-        buttonFont = [NSFont fontWithName:@"Lucida Grande Bold" size:(14 / divisor)];
+        buttonFont = [NSFont fontWithName:@"LucidaGrande-Bold" size:(14 / divisor)];

         buttonAttr = [NSDictionary dictionaryWithObjectsAndKeys:
             buttonFont , NSFontAttributeName,
             textColor  , NSForegroundColorAttributeName, 
         buttonAttr = [NSDictionary dictionaryWithObjectsAndKeys:
             buttonFont , NSFontAttributeName,
             textColor  , NSForegroundColorAttributeName, 


@@ -405,8 +426,8 @@
         }
         
 //      Make the buttons, set the titles, and size them to fit their titles
         }
         
 //      Make the buttons, set the titles, and size them to fit their titles

-        okButton     = [[ITButton alloc] initWithFrame:NSMakeRect(0, 0, 300, 24)];
-        cancelButton = [[ITButton alloc] initWithFrame:NSMakeRect(0, 0, 300, 24)];
+        okButton     = [[[ITButton alloc] initWithFrame:NSMakeRect(0, 0, 300, 24)] autorelease];
+        cancelButton = [[[ITButton alloc] initWithFrame:NSMakeRect(0, 0, 300, 24)] autorelease];

         [okButton     setTarget:target];
         [cancelButton setTarget:target];
         [okButton     setAction:okAction];
         [okButton     setTarget:target];
         [cancelButton setTarget:target];
         [okButton     setAction:okAction];


@@ -488,6 +509,14 @@
     }
 }
 
     }
 }
 

+- (void)updateTime:(NSString *)time range:(NSRange)range
+{
+       NSMutableAttributedString *string = [[_textField attributedStringValue] mutableCopy];
+       [string replaceCharactersInRange:range withString:time];
+       [_textField setAttributedStringValue:[string autorelease]];
+       [[self contentView] setNeedsDisplay:YES];
+}
+

 - (NSTimeInterval)animationResizeTime:(NSRect)newFrame
 {
     return (NSTimeInterval)0.25;
 - (NSTimeInterval)animationResizeTime:(NSRect)newFrame
 {
     return (NSTimeInterval)0.25;