#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;
// Set default values.
_image = [[NSImage imageNamed:@"NSApplicationIcon"] retain];
_locked = NO;
- _sizing = StatusWindowRegular;
+ _sizing = ITTransientStatusWindowRegular;
}
return self;
- (void)dealloc
{
- [_image release];
+ [_image release];
[super dealloc];
}
[self setExitMode:(flag ? ITTransientStatusWindowExitOnCommand : ITTransientStatusWindowExitAfterDelay)];
}
-- (void)setSizing:(StatusWindowSizing)newSizing
+- (void)setSizing:(ITTransientStatusWindowSizing)newSizing
{
_sizing = newSizing;
}
-
/*************************************************************************/
#pragma mark -
#pragma mark INSTANCE METHODS
float excessHeight = 0.0;
NSPoint windowOrigin;
ITImageView *imageView;
-
- if ( _sizing == StatusWindowSmall ) {
+ BOOL shouldAnimate = ( ! (([self visibilityState] == ITWindowAppearingState) ||
+ ([self visibilityState] == ITWindowVanishingState)) );
+
+ if ( _sizing == ITTransientStatusWindowSmall ) {
divisor = SMALL_DIVISOR;
- } else if ( _sizing == StatusWindowMini ) {
+ } else if ( _sizing == ITTransientStatusWindowMini ) {
divisor = MINI_DIVISOR;
}
[self setFrame:NSMakeRect( windowOrigin.x,
windowOrigin.y,
windowWidth,
- windowHeight) display:YES animate:YES];
+ windowHeight) display:YES animate:shouldAnimate];
[[[self contentView] subviews] makeObjectsPerformSelector:@selector(removeFromSuperview)];
// Setup, position, fill, and add the image view to the content view.
- imageRect = NSMakeRect( (SW_PAD / divisor),
+ imageRect = NSMakeRect( (SW_PAD / divisor) + 4,
((SW_PAD / divisor) + ((contentHeight - imageHeight) / 2)),
imageWidth,
imageHeight );
- imageView = [[[NSImageView alloc] initWithFrame:imageRect] autorelease];
+ imageView = [[[ITImageView alloc] initWithFrame:imageRect] autorelease];
[imageView setAutoresizingMask:(NSViewMinYMargin | NSViewMaxYMargin)];
[imageView setImage:_image];
+ [imageView setCastsShadow:YES];
[[self contentView] addSubview:imageView];
return NSMakeRect( ((SW_PAD / divisor) + imageWidth + (SW_SPACE / divisor)),
dataHeight);
}
-- (void)buildTextWindowWithString:(NSString *)text
+- (void)buildTextWindowWithString:(id)text
{
if ( ! _locked ) {
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;
- NSEnumerator *lineEnum = [lines objectEnumerator];
+ NSEnumerator *lineEnum = [lines objectEnumerator];
float baseFontSize = 18.0;
ITTextField *textField;
NSFont *font;
NSDictionary *attr;
- if ( _sizing == StatusWindowSmall ) {
+ if ( _sizing == ITTransientStatusWindowSmall ) {
divisor = SMALL_DIVISOR;
- } else if ( _sizing == StatusWindowMini ) {
+ } 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.
[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 = textField;
}
}
NSColor *offColor = [NSColor colorWithCalibratedWhite:0.15 alpha:0.50];
NSMatrix *volMatrix;
- if ( _sizing == StatusWindowSmall ) {
+ if ( _sizing == ITTransientStatusWindowSmall ) {
divisor = SMALL_DIVISOR;
- } else if ( _sizing == StatusWindowMini ) {
+ } else if ( _sizing == ITTransientStatusWindowMini ) {
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
{
if ( ! _locked ) {
+ float divisor = 1.0;
float textWidth = 0.0;
float textHeight = 0.0;
float okWidth = 0.0;
NSArray *lines = [message componentsSeparatedByString:@"\n"];
id oneLine = nil;
NSEnumerator *lineEnum = [lines objectEnumerator];
+ float baseFontSize = 18.0;
ITTextField *textField;
ITButton *okButton;
ITButton *cancelButton;
NSColor *textColor = [NSColor whiteColor];
- NSFont *font = [NSFont fontWithName:@"Lucida Grande Bold" size:18];
- NSDictionary *attr = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName];
- NSFont *buttonFont = [NSFont fontWithName:@"Lucida Grande Bold" size:14];
- NSDictionary *buttonAttr = [NSDictionary dictionaryWithObjectsAndKeys:
+ NSFont *font;
+ NSDictionary *attr;
+ NSFont *buttonFont;
+ NSDictionary *buttonAttr;
+
+ if ( _sizing == ITTransientStatusWindowSmall ) {
+ divisor = SMALL_DIVISOR;
+ } else if ( _sizing == ITTransientStatusWindowMini ) {
+ divisor = MINI_DIVISOR;
+ }
+
+ font = [NSFont fontWithName:@"LucidaGrande-Bold" size:(baseFontSize / divisor)];
+ attr = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName];
+ buttonFont = [NSFont fontWithName:@"LucidaGrande-Bold" size:(14 / divisor)];
+ buttonAttr = [NSDictionary dictionaryWithObjectsAndKeys:
buttonFont , NSFontAttributeName,
textColor , NSForegroundColorAttributeName,
nil];
}
// 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];
wideButtonW,
24.0)];
[[self contentView] addSubview:okButton];
- [[self contentView] addSubview:cancelButton];
+ if (alternateTitle) {
+ [[self contentView] addSubview:cancelButton];
+ }
[self setIgnoresMouseEvents:NO];
}
}
+- (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;
git.ithinksw.org / MenuTunes.git / blobdiff