X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/838ed8a4d9d55f146522c24623f981d42b5a1d23..dc685d1d1cffcfd6bb95dd948c30f1dc315919e0:/StatusWindowController.m?ds=inline diff --git a/StatusWindowController.m b/StatusWindowController.m index 8d9ec8a..cd14b33 100755 --- a/StatusWindowController.m +++ b/StatusWindowController.m @@ -11,10 +11,8 @@ #import #import - static StatusWindowController *sharedController; - @implementation StatusWindowController @@ -105,6 +103,7 @@ static StatusWindowController *sharedController; title: (NSString *)title album: (NSString *)album artist: (NSString *)artist + composer: (NSString *)composer time: (NSString *)time // FLOW: Should probably be NSDate or something. track: (NSString *)track rating: (int)rating @@ -114,13 +113,7 @@ static StatusWindowController *sharedController; NSString *text = title; if ( art != nil ) { - NSSize oldSize, newSize; - image = art; - [image setScalesWhenResized:YES]; - oldSize = [image size]; - if (oldSize.width > oldSize.height) newSize = NSMakeSize(110,oldSize.height * (110.0f / oldSize.width)); - else newSize = NSMakeSize(oldSize.width * (110.0f / oldSize.height),110); - [image setSize:newSize]; + image = art; } else if ( source == ITMTRemoteLibrarySource ) { image = [NSImage imageNamed:@"Library"]; } else if ( source == ITMTRemoteCDSource ) { @@ -143,6 +136,9 @@ static StatusWindowController *sharedController; if ( artist ) { text = [text stringByAppendingString:[@"\n" stringByAppendingString:artist]]; } + if ( composer ) { + text = [text stringByAppendingString:[@"\n" stringByAppendingString:composer]]; + } if ( time ) { text = [text stringByAppendingString:[@"\n" stringByAppendingString:time]]; } @@ -270,7 +266,7 @@ static StatusWindowController *sharedController; - (void)showReconnectQueryWindow { - NSString *message = @"The selected shared player is available again.\nWould you like to reconnect to it?."; + NSString *message = @"The selected shared player is available again.\nWould you like to reconnect to it?"; [_window setImage:[NSImage imageNamed:@"Setup"]]; [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];