X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/8d366f34247fb0cda40b9608db52735947c497a9..d6c5534acee4d543ee2c08b279b416ea69de42d8:/StatusWindowController.m diff --git a/StatusWindowController.m b/StatusWindowController.m index 8946095..0cb9b72 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,20 +113,7 @@ static StatusWindowController *sharedController; NSString *text = title; if ( art != nil ) { - /* - NSImageRep *artRep = [art bestRepresentationForDevice:nil]; - image = [[NSImage alloc] initWithSize:NSMakeSize(110, 110)]; - [image lockFocus]; - { - [[NSGraphicsContext currentContext] setImageInterpolation:NSImageInterpolationHigh]; - [[NSGraphicsContext currentContext] setShouldAntialias:YES]; - [artRep drawInRect:NSMakeRect(3, 3, 104, 104)]; - } - [image unlockFocus]; - [image autorelease];*/ - image = art; - [image setScalesWhenResized:YES]; - [image setSize:NSMakeSize(110,110)]; + image = art; } else if ( source == ITMTRemoteLibrarySource ) { image = [NSImage imageNamed:@"Library"]; } else if ( source == ITMTRemoteCDSource ) { @@ -150,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]]; } @@ -277,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"]]; @@ -292,6 +281,23 @@ static StatusWindowController *sharedController; [_window setLocked:YES]; } +- (void)showNetworkErrorQueryWindow +{ + NSString *message = @"The remote MenuTunes server is unreachable.\nMenuTunes will revert back to the local player."; + + [_window setImage:[NSImage imageNamed:@"Setup"]]; + [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]]; + [_window buildDialogWindowWithMessage:message + defaultButton:@" OK " + alternateButton:nil + target:[MainController sharedController] + defaultAction:@selector(cancelReconnect) + alternateAction:nil]; + + [_window appear:self]; + [_window setLocked:YES]; +} + - (void)showPreferencesUpdateWindow { NSString *message = @"The new features in this version of MenuTunes\nrequire you to reconfigure your preferences.";