More fixes on timeout poop

[MenuTunes.git] / StatusWindowController.m

diff --git a/StatusWindowController.m b/StatusWindowController.m
index 117c205..b89d4e4 100755 (executable)
--- a/StatusWindowController.m
+++ b/StatusWindowController.m
@@ -11,10 +11,8 @@
 #import <ITKit/ITSlideVerticallyWindowEffect.h>
 #import <ITKit/ITPivotWindowEffect.h>
 
-
 static StatusWindowController *sharedController;
 
-
 @implementation StatusWindowController
 
 
@@ -105,25 +103,18 @@ 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
+                           playCount:                   (int)playCount
                                image:             (NSImage *)art
 {
     NSImage  *image = nil;
     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;
     } else if ( source == ITMTRemoteLibrarySource ) {
         image = [NSImage imageNamed:@"Library"];
     } else if ( source == ITMTRemoteCDSource ) {
@@ -146,12 +137,18 @@ 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]];
     }
     if ( track ) {
         text = [text stringByAppendingString:[@"\n" stringByAppendingString:track]];
     }
+    if (playCount > -1) {
+        text = [text stringByAppendingString:[NSString stringWithFormat:@"\nPlay Count: %i", playCount]];
+    }
     if ( rating > -1 ) {
 
         NSString *ratingString = [NSString string];
@@ -171,7 +168,6 @@ static StatusWindowController *sharedController;
         text = [text stringByAppendingString:[@"\n" stringByAppendingString:ratingString]];
     }
     
-    
     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildTextWindowWithString:text];
     [_window appear:self];
@@ -238,13 +234,13 @@ static StatusWindowController *sharedController;
 
 - (void)showSetupQueryWindow
 {
-    NSString *message = @"Would you like MenuTunes to launch\nautomatically at startup?";
+    NSString *message = NSLocalizedString(@"autolaunch_msg", @"Would you like MenuTunes to launch\nautomatically at startup?");
 
     [_window setImage:[NSImage imageNamed:@"Setup"]];
     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildDialogWindowWithMessage:message
-                            defaultButton:@"Launch at Startup"
-                          alternateButton:@"Launch Manually"
+                            defaultButton:NSLocalizedString(@"launch_at_startup", @"Launch at Startup")
+                          alternateButton:NSLocalizedString(@"launch_manually", @"Launch Manually")
                                    target:[PreferencesController sharedPrefs]
                             defaultAction:@selector(autoLaunchOK)
                           alternateAction:@selector(autoLaunchCancel)];
@@ -256,13 +252,13 @@ static StatusWindowController *sharedController;
 
 - (void)showRegistrationQueryWindow
 {
-    NSString *message = @"Your 7-day unlimited trial period has elapsed.\nYou must register to continue using MenuTunes.";
+    NSString *message = NSLocalizedString(@"trialexpired_msg", @"Your 7-day unlimited trial period has elapsed.\nYou must register to continue using MenuTunes.");
 
     [_window setImage:[NSImage imageNamed:@"Register"]];
     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildDialogWindowWithMessage:message
-                            defaultButton:@"Register Now"
-                          alternateButton:@"Quit MenuTunes"
+                            defaultButton:NSLocalizedString(@"registernow", @"Register Now")
+                          alternateButton:NSLocalizedString(@"quitmenutunes", @"Quit MenuTunes")
                                    target:[MainController sharedController]
                             defaultAction:@selector(registerNowOK)
                           alternateAction:@selector(registerNowCancel)];
@@ -273,13 +269,13 @@ static StatusWindowController *sharedController;
 
 - (void)showReconnectQueryWindow
 {
-    NSString *message = @"The selected shared player is available again.\nWould you like to reconnect to it?.";
-
-    [_window setImage:[NSImage imageNamed:@"Register"]];
+    NSString *message = NSLocalizedString(@"sharedplayeravailable_msg", @"The selected shared player is available again.\nWould you like to reconnect to it?");
+    [_window setLocked:NO];
+    [_window setImage:[NSImage imageNamed:@"Setup"]];
     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildDialogWindowWithMessage:message
-                            defaultButton:@"Reconnect"
-                          alternateButton:@"Ignore"
+                            defaultButton:NSLocalizedString(@"reconnect", @"Reconnect")
+                          alternateButton:NSLocalizedString(@"ignore", @"Ignore")
                                    target:[MainController sharedController]
                             defaultAction:@selector(reconnect)
                           alternateAction:@selector(cancelReconnect)];
@@ -288,14 +284,31 @@ static StatusWindowController *sharedController;
     [_window setLocked:YES];
 }
 
+- (void)showNetworkErrorQueryWindow
+{
+    NSString *message = NSLocalizedString(@"sharedplayerunreachable_msg", @"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.";
+    NSString *message = NSLocalizedString(@"reconfigureprefs_msg", @"The new features in this version of MenuTunes\nrequire you to reconfigure your preferences.");
 
     [_window setImage:[NSImage imageNamed:@"Setup"]];
     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildDialogWindowWithMessage:message
-                            defaultButton:@"Show Preferences"
+                            defaultButton:NSLocalizedString(@"showpreferences", @"Show Preferences")
                           alternateButton:@"OK"
                                    target:[MainController sharedController]
                             defaultAction:@selector(showPreferencesAndClose)