Added a play count option to track info.

[MenuTunes.git] / StatusWindowController.m

diff --git a/StatusWindowController.m b/StatusWindowController.m
index 2ee7342..8eaba4f 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
 
 
@@ -33,8 +31,9 @@ static StatusWindowController *sharedController;
     if ( ( self = [super init] ) ) {
         
         float exitDelay;
-        int entryTag;
-        int exitTag;
+        NSString *entryClass;
+        NSString *exitClass;
+        NSArray  *classList = [ITWindowEffect effectClasses];
         float entrySpeed;
         float exitSpeed;
         
@@ -47,8 +46,8 @@ static StatusWindowController *sharedController;
         df = [[NSUserDefaults standardUserDefaults] retain];
         
         exitDelay  = [df floatForKey:@"statusWindowVanishDelay"];
-        entryTag   = [df integerForKey:@"statusWindowAppearanceEffect"];
-        exitTag    = [df integerForKey:@"statusWindowVanishEffect"];
+        entryClass = [df stringForKey:@"statusWindowAppearanceEffect"];
+        exitClass  = [df stringForKey:@"statusWindowVanishEffect"];
         entrySpeed = [df floatForKey:@"statusWindowAppearanceSpeed"];
         exitSpeed  = [df floatForKey:@"statusWindowVanishSpeed"];
         
@@ -58,34 +57,21 @@ static StatusWindowController *sharedController;
         [_window setHorizontalPosition:[df integerForKey:@"statusWindowHorizontalPosition"]];
         [_window setVerticalPosition:[df integerForKey:@"statusWindowVerticalPosition"]];
         
-        [_window setSizing:(StatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
+        [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
         
-        if ( entryTag == 2101 ) {
-            entryEffect = [[[ITDissolveWindowEffect alloc] initWithWindow:_window] autorelease];
-        } else if ( entryTag == 2102 ) {
-            entryEffect = [[[ITSlideVerticallyWindowEffect alloc] initWithWindow:_window] autorelease];
-        } else if ( entryTag == 2103 ) {
-            entryEffect = [[[ITSlideHorizontallyWindowEffect alloc] initWithWindow:_window] autorelease];
-        } else if ( entryTag == 2104 ) {
-            entryEffect = [[[ITPivotWindowEffect alloc] initWithWindow:_window] autorelease];
+        if ( [classList containsObject:NSClassFromString(entryClass)] ) {
+            entryEffect = [[[NSClassFromString(entryClass) alloc] initWithWindow:_window] autorelease];
         } else {
             entryEffect = [[[ITCutWindowEffect alloc] initWithWindow:_window] autorelease];
         }
         
-        [_window setEntryEffect:entryEffect];
-        
-        if ( exitTag == 2100 ) {
-            exitEffect = [[[ITCutWindowEffect alloc] initWithWindow:_window] autorelease];
-        } else if ( exitTag == 2102 ) {
-            exitEffect = [[[ITSlideVerticallyWindowEffect alloc] initWithWindow:_window] autorelease];
-        } else if ( exitTag == 2103 ) {
-            exitEffect = [[[ITSlideHorizontallyWindowEffect alloc] initWithWindow:_window] autorelease];
-        } else if ( exitTag == 2104 ) {
-            exitEffect = [[[ITPivotWindowEffect alloc] initWithWindow:_window] autorelease];
+        if ( [classList containsObject:NSClassFromString(exitClass)] ) {
+            exitEffect = [[[NSClassFromString(exitClass) alloc] initWithWindow:_window] autorelease];
         } else {
             exitEffect = [[[ITDissolveWindowEffect alloc] initWithWindow:_window] autorelease];
         }
         
+        [_window setEntryEffect:entryEffect];
         [_window setExitEffect:exitEffect];
         
         [[_window entryEffect] setEffectTime:(entrySpeed ? entrySpeed : 0.8)];
@@ -117,14 +103,19 @@ 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 ( source == ITMTRemoteLibrarySource ) {
+    if ( art != nil ) {
+        image = art;
+    } else if ( source == ITMTRemoteLibrarySource ) {
         image = [NSImage imageNamed:@"Library"];
     } else if ( source == ITMTRemoteCDSource ) {
         image = [NSImage imageNamed:@"CD"];
@@ -137,21 +128,27 @@ static StatusWindowController *sharedController;
     } else if ( source == ITMTRemoteSharedLibrarySource ) {
         image = [NSImage imageNamed:@"Library"];
     }
-
+    
     [_window setImage:image];
-
+    
     if ( album ) {
         text = [text stringByAppendingString:[@"\n" stringByAppendingString:album]];
     }
     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,8 +168,7 @@ static StatusWindowController *sharedController;
         text = [text stringByAppendingString:[@"\n" stringByAppendingString:ratingString]];
     }
     
-    
-    [_window setSizing:(StatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
+    [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildTextWindowWithString:text];
     [_window appear:self];
 }
@@ -183,7 +179,7 @@ static StatusWindowController *sharedController;
     NSString *bull = [NSString stringWithUTF8String:"♪ "];
     NSString *end  = [@"\n" stringByAppendingString:bull];
     [_window setImage:[NSImage imageNamed:@"Upcoming"]];
-    [_window setSizing:(StatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
+    [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildTextWindowWithString:[bull stringByAppendingString:[titleStrings componentsJoinedByString:end]]];
     [_window appear:self];
 }
@@ -191,7 +187,7 @@ static StatusWindowController *sharedController;
 - (void)showVolumeWindowWithLevel:(float)level
 {
     [_window setImage:[NSImage imageNamed:@"Volume"]];
-    [_window setSizing:(StatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
+    [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildMeterWindowWithCharacter:[NSString stringWithUTF8String:"▊"]
                                       size:18
                                      count:10
@@ -202,7 +198,7 @@ static StatusWindowController *sharedController;
 - (void)showRatingWindowWithRating:(float)rating
 {
     [_window setImage:[NSImage imageNamed:@"Rating"]];
-    [_window setSizing:(StatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
+    [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildMeterWindowWithCharacter:[NSString stringWithUTF8String:"★"]
                                       size:48
                                      count:5
@@ -213,7 +209,7 @@ static StatusWindowController *sharedController;
 - (void)showShuffleWindow:(BOOL)shuffle
 {
     [_window setImage:[NSImage imageNamed:@"Shuffle"]];
-    [_window setSizing:(StatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
+    [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildTextWindowWithString:( shuffle ? @"Shuffle On" : @"Shuffle Off")];
     [_window appear:self];
 }
@@ -231,7 +227,7 @@ static StatusWindowController *sharedController;
     }
     
     [_window setImage:[NSImage imageNamed:@"Repeat"]];
-    [_window setSizing:(StatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
+    [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildTextWindowWithString:string];
     [_window appear:self];
 }
@@ -241,7 +237,7 @@ static StatusWindowController *sharedController;
     NSString *message = @"Would you like MenuTunes to launch\nautomatically at startup?";
 
     [_window setImage:[NSImage imageNamed:@"Setup"]];
-    [_window setSizing:(StatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
+    [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildDialogWindowWithMessage:message
                             defaultButton:@"Launch at Startup"
                           alternateButton:@"Launch Manually"
@@ -259,7 +255,7 @@ static StatusWindowController *sharedController;
     NSString *message = @"Your 7-day unlimited trial period has elapsed.\nYou must register to continue using MenuTunes.";
 
     [_window setImage:[NSImage imageNamed:@"Register"]];
-    [_window setSizing:(StatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
+    [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildDialogWindowWithMessage:message
                             defaultButton:@"Register Now"
                           alternateButton:@"Quit MenuTunes"
@@ -273,10 +269,10 @@ 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"]];
-    [_window setSizing:(StatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
+    NSString *message = @"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"
@@ -288,5 +284,38 @@ 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.";
+
+    [_window setImage:[NSImage imageNamed:@"Setup"]];
+    [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
+    [_window buildDialogWindowWithMessage:message
+                            defaultButton:@"Show Preferences"
+                          alternateButton:@"OK"
+                                   target:[MainController sharedController]
+                            defaultAction:@selector(showPreferencesAndClose)
+                          alternateAction:@selector(cancelReconnect)];
+
+    [_window appear:self];
+    [_window setLocked:YES];
+}
 
 @end
\ No newline at end of file