Added a play count option to track info.

[MenuTunes.git] / StatusWindowController.m

diff --git a/StatusWindowController.m b/StatusWindowController.m
index 2020530..8eaba4f 100755 (executable)
--- a/StatusWindowController.m
+++ b/StatusWindowController.m
@@ -103,9 +103,11 @@ static StatusWindowController *sharedController;
                                title:            (NSString *)title
                                album:            (NSString *)album
                               artist:            (NSString *)artist
                                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
                                 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;
                                image:             (NSImage *)art
 {
     NSImage  *image = nil;


@@ -135,12 +137,18 @@ static StatusWindowController *sharedController;
     if ( artist ) {
         text = [text stringByAppendingString:[@"\n" stringByAppendingString:artist]];
     }
     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 ( 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];
     if ( rating > -1 ) {
 
         NSString *ratingString = [NSString string];


@@ -160,7 +168,6 @@ static StatusWindowController *sharedController;
         text = [text stringByAppendingString:[@"\n" stringByAppendingString:ratingString]];
     }
     
         text = [text stringByAppendingString:[@"\n" stringByAppendingString:ratingString]];
     }
     

-    

     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildTextWindowWithString:text];
     [_window appear:self];
     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildTextWindowWithString:text];
     [_window appear:self];


@@ -262,8 +269,8 @@ static StatusWindowController *sharedController;
 
 - (void)showReconnectQueryWindow
 {
 
 - (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 setLocked:NO];

     [_window setImage:[NSImage imageNamed:@"Setup"]];
     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildDialogWindowWithMessage:message
     [_window setImage:[NSImage imageNamed:@"Setup"]];
     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildDialogWindowWithMessage:message


@@ -277,6 +284,23 @@ static StatusWindowController *sharedController;
     [_window setLocked:YES];
 }
 
     [_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.";
 - (void)showPreferencesUpdateWindow
 {
     NSString *message = @"The new features in this version of MenuTunes\nrequire you to reconfigure your preferences.";