Merge branch 'master' of git://github.com/ksuther/MenuTunes

[MenuTunes.git] / StatusWindowController.m

diff --git a/StatusWindowController.m b/StatusWindowController.m
index db04626..aa684a3 100755 (executable)
--- a/StatusWindowController.m
+++ b/StatusWindowController.m
@@ -44,6 +44,8 @@ static StatusWindowController *sharedController;
         ITWindowEffect *entryEffect;
         ITWindowEffect *exitEffect;
         
+               _currentType = StatusWindowNoType;
+               
         _window = [[StatusWindow sharedWindow] retain];
         df = [[NSUserDefaults standardUserDefaults] retain];
         
@@ -96,6 +98,8 @@ static StatusWindowController *sharedController;
         } else {
             [(ITTSWBackgroundView *)[_window contentView] setBackgroundColor:[NSColor blueColor]];
         }
+        
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(screenParametersChanged:) name:NSApplicationDidChangeScreenParametersNotification object:nil];
     }
     
     return self;
@@ -103,10 +107,23 @@ static StatusWindowController *sharedController;
 
 - (void)dealloc
 {
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    
     [_window release];
     [super dealloc];
 }
 
+- (void)screenParametersChanged:(NSNotification *)notification
+{
+    NSArray *screens = [NSScreen screens];
+    int screenIndex = [df integerForKey:@"statusWindowScreenIndex"];
+    
+    if (screenIndex >= [screens count]) {
+        screenIndex = 0;
+    }
+    [_window setScreen:[screens objectAtIndex:screenIndex]];
+}
+
 - (void)showSongInfoWindowWithSource:(ITMTRemotePlayerSource)source
                                title:            (NSString *)title
                                album:            (NSString *)album
@@ -191,11 +208,31 @@ static StatusWindowController *sharedController;
         //text = [text stringByAppendingString:[@"\n" stringByAppendingString:ratingString]];
     }
     
+       _currentType = StatusWindowTrackInfoType;
     [_window buildTextWindowWithString:text];
     [_window appear:self];
        [text release];
 }
 
+- (void)showAlbumArtWindowWithImage:(NSImage *)image
+{
+       if (image) {
+               _currentType = StatusWindowAlbumArtType;
+               [_window setImage:[NSImage imageNamed:@"Library"]];
+               [_window buildImageWindowWithImage:image];
+               [_window appear:self];
+       }
+}
+
+- (void)showAlbumArtWindowWithErrorText:(NSString *)string
+{
+       if (string && [string length] > 0) {
+               _currentType = StatusWindowAlbumArtType;
+               [_window buildTextWindowWithString:string];
+               [_window appear:self];
+       }
+}
+
 - (void)showUpcomingSongsWindowWithTitles:(NSArray *)titleStrings
 {
 //  NSString *bull = [NSString stringWithUTF8String:"‣ "];
@@ -204,6 +241,7 @@ static StatusWindowController *sharedController;
     [_window setImage:[NSImage imageNamed:@"Upcoming"]];
     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildTextWindowWithString:[bull stringByAppendingString:[titleStrings componentsJoinedByString:end]]];
+       _currentType = StatusWindowUpcomingSongsType;
     [_window appear:self];
 }
 
@@ -215,6 +253,7 @@ static StatusWindowController *sharedController;
                                       size:18
                                      count:10
                                     active:( ceil(level * 100) / 10 )];
+       _currentType = StatusWindowVolumeType;
     [_window appear:self];
 }
 
@@ -226,7 +265,8 @@ static StatusWindowController *sharedController;
                                       size:48
                                      count:5
                                     active:( ceil(rating * 100) / 20 )];
-    [_window appear:self];
+    _currentType = StatusWindowRatingType;
+       [_window appear:self];
 }
 
 - (void)showShuffleWindow:(BOOL)shuffle
@@ -234,6 +274,7 @@ static StatusWindowController *sharedController;
     [_window setImage:[NSImage imageNamed:@"Shuffle"]];
     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildTextWindowWithString:( shuffle ? NSLocalizedString(@"shuffleOn", @"Shuffle On") : NSLocalizedString(@"shuffleOff", @"Shuffle Off"))];
+       _currentType = StatusWindowRatingType;
     [_window appear:self];
 }
 
@@ -252,6 +293,7 @@ static StatusWindowController *sharedController;
     [_window setImage:[NSImage imageNamed:@"Repeat"]];
     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildTextWindowWithString:string];
+       _currentType = StatusWindowRepeatType;
     [_window appear:self];
 }
 
@@ -260,6 +302,7 @@ static StatusWindowController *sharedController;
     [_window setImage:[NSImage imageNamed:@"Shuffle"]];
     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildTextWindowWithString:( !shufflable ? NSLocalizedString(@"shufflableOn", @"Current Song Skipped When Shuffling") : NSLocalizedString(@"shufflableOff", @"Current Song Not Skipped When Shuffling"))];
+       _currentType = StatusWindowShufflabilityType;
     [_window appear:self];
 }
 
@@ -276,24 +319,7 @@ static StatusWindowController *sharedController;
                             defaultAction:@selector(autoLaunchOK)
                           alternateAction:@selector(autoLaunchCancel)];
 
-    [_window appear:self];
-    [_window setLocked:YES];
-}
-
-
-- (void)showRegistrationQueryWindow
-{
-    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:NSLocalizedString(@"registernow", @"Register Now")
-                          alternateButton:NSLocalizedString(@"quitmenutunes", @"Quit MenuTunes")
-                                   target:[MainController sharedController]
-                            defaultAction:@selector(registerNowOK)
-                          alternateAction:@selector(registerNowCancel)];
-
+       _currentType = StatusWindowSetupType;
     [_window appear:self];
     [_window setLocked:YES];
 }
@@ -311,6 +337,7 @@ static StatusWindowController *sharedController;
                             defaultAction:@selector(reconnect)
                           alternateAction:@selector(cancelReconnect)];
 
+       _currentType = StatusWindowNetworkType;
     [_window appear:self];
     [_window setLocked:YES];
 }
@@ -328,6 +355,7 @@ static StatusWindowController *sharedController;
                             defaultAction:@selector(cancelReconnect)
                           alternateAction:nil];
 
+       _currentType = StatusWindowNetworkType;
     [_window appear:self];
     [_window setLocked:YES];
 }
@@ -345,6 +373,7 @@ static StatusWindowController *sharedController;
                             defaultAction:@selector(showPreferencesAndClose)
                           alternateAction:@selector(cancelReconnect)];
 
+       _currentType = StatusWindowPreferencesType;
     [_window appear:self];
     [_window setLocked:YES];
 }
@@ -359,10 +388,17 @@ static StatusWindowController *sharedController;
                                    target:[MainController sharedController]
                             defaultAction:@selector(cancelReconnect)
                           alternateAction:nil];
+
+       _currentType = StatusWindowDebugType;
     [_window appear:self];
        [_window setLocked:YES];
 }
 
+- (StatusWindowType)currentStatusWindowType
+{
+       return _currentType;
+}
+
 - (void)updateTime:(NSString *)time
 {
        if (time && [time length]) {