X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/d6c5534acee4d543ee2c08b279b416ea69de42d8..ca5ccb3472e33cd85f4ba7aee7e3ebe4e348b04e:/StatusWindow.m diff --git a/StatusWindow.m b/StatusWindow.m index ffbc1e6..253f075 100755 --- a/StatusWindow.m +++ b/StatusWindow.m @@ -53,7 +53,7 @@ - (void)dealloc { - [_image release]; + [_image release]; [super dealloc]; } @@ -80,7 +80,6 @@ _sizing = newSizing; } - /*************************************************************************/ #pragma mark - #pragma mark INSTANCE METHODS @@ -123,7 +122,7 @@ ITImageView *imageView; BOOL shouldAnimate = ( ! (([self visibilityState] == ITWindowAppearingState) || ([self visibilityState] == ITWindowVanishingState)) ); - + if ( _sizing == ITTransientStatusWindowSmall ) { divisor = SMALL_DIVISOR; } else if ( _sizing == ITTransientStatusWindowMini ) { @@ -218,7 +217,7 @@ 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]; // Iterate over each line to get text width and height @@ -285,7 +284,7 @@ divisor = MINI_DIVISOR; } - font = [NSFont fontWithName:@"Lucida Grande Bold" size:( size / divisor )]; + font = [NSFont fontWithName:@"LucidaGrande-Bold" size:( size / divisor )]; attr = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName]; charSize = [character sizeWithAttributes:attr]; cellHeight = ( charSize.height + 4.0 ); // Add 4.0 for shadow @@ -375,9 +374,9 @@ 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]; - buttonFont = [NSFont fontWithName:@"Lucida Grande Bold" size:(14 / divisor)]; + buttonFont = [NSFont fontWithName:@"LucidaGrande-Bold" size:(14 / divisor)]; buttonAttr = [NSDictionary dictionaryWithObjectsAndKeys: buttonFont , NSFontAttributeName, textColor , NSForegroundColorAttributeName, @@ -405,8 +404,8 @@ } // 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];