Upgrading MenuTunes to Xcode 2.1 and updating code

[MenuTunes.git] / StatusWindowController.m

diff --git a/StatusWindowController.m b/StatusWindowController.m
index 6ad04a1..e06176f 100755 (executable)
--- a/StatusWindowController.m
+++ b/StatusWindowController.m
@@ -36,6 +36,8 @@ static StatusWindowController *sharedController;
         NSArray  *classList = [ITWindowEffect effectClasses];
         float entrySpeed;
         float exitSpeed;
         NSArray  *classList = [ITWindowEffect effectClasses];
         float entrySpeed;
         float exitSpeed;

+               NSArray *screens = [NSScreen screens];
+               int screenIndex;

         
         NSData *colorData;
         
         
         NSData *colorData;
         


@@ -50,7 +52,13 @@ static StatusWindowController *sharedController;
         exitClass  = [df stringForKey:@"statusWindowVanishEffect"];
         entrySpeed = [df floatForKey:@"statusWindowAppearanceSpeed"];
         exitSpeed  = [df floatForKey:@"statusWindowVanishSpeed"];
         exitClass  = [df stringForKey:@"statusWindowVanishEffect"];
         entrySpeed = [df floatForKey:@"statusWindowAppearanceSpeed"];
         exitSpeed  = [df floatForKey:@"statusWindowVanishSpeed"];

-        
+               
+               screenIndex = [df integerForKey:@"statusWindowScreenIndex"];
+               if (screenIndex >= [screens count]) {
+                       screenIndex = 0;
+               }
+               [_window setScreen:[screens objectAtIndex:screenIndex]];
+               

         [_window setExitMode:ITTransientStatusWindowExitAfterDelay];
         [_window setExitDelay:(exitDelay ? exitDelay : 4.0)];
         
         [_window setExitMode:ITTransientStatusWindowExitAfterDelay];
         [_window setExitDelay:(exitDelay ? exitDelay : 4.0)];
         


@@ -107,10 +115,11 @@ static StatusWindowController *sharedController;
                                 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;

-    NSString *text  = title;
+    NSMutableAttributedString *text = [[NSMutableAttributedString alloc] initWithString:title];

     
     if ( art != nil ) {
         image = art;
     
     if ( art != nil ) {
         image = art;


@@ -129,28 +138,38 @@ static StatusWindowController *sharedController;
     }
     
     [_window setImage:image];
     }
     
     [_window setImage:image];

+       [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];

     
     if ( album ) {
     
     if ( album ) {

-        text = [text stringByAppendingString:[@"\n" stringByAppendingString:album]];
+               [[text mutableString] appendFormat:@"\n%@", album];
+        //text = [text stringByAppendingString:[@"\n" stringByAppendingString:album]];

     }
     if ( artist ) {
     }
     if ( artist ) {

-        text = [text stringByAppendingString:[@"\n" stringByAppendingString:artist]];
+               [[text mutableString] appendFormat:@"\n%@", artist];
+        //text = [text stringByAppendingString:[@"\n" stringByAppendingString:artist]];

     }
     if ( composer ) {
     }
     if ( composer ) {

-        text = [text stringByAppendingString:[@"\n" stringByAppendingString:composer]];
+               [[text mutableString] appendFormat:@"\n%@", composer];
+        //text = [text stringByAppendingString:[@"\n" stringByAppendingString:composer]];

     }
     if ( time ) {
     }
     if ( time ) {

-        text = [text stringByAppendingString:[@"\n" stringByAppendingString:time]];
+               [[text mutableString] appendFormat:@"\n%@", time];
+        //text = [text stringByAppendingString:[@"\n" stringByAppendingString:time]];

     }
     if ( track ) {
     }
     if ( track ) {

-        text = [text stringByAppendingString:[@"\n" stringByAppendingString:track]];
+               [[text mutableString] appendFormat:@"\n%@", track];
+        //text = [text stringByAppendingString:[@"\n" stringByAppendingString:track]];
+    }
+    if (playCount > -1) {
+               [[text mutableString] appendFormat:@"\n%@: %i", NSLocalizedString(@"playCount", @"Play Count"), playCount];
+        //text = [text stringByAppendingString:[NSString stringWithFormat:@"\n%@: %i", NSLocalizedString(@"playCount", @"Play Count"), playCount]];

     }
     if ( rating > -1 ) {
 
         NSString *ratingString = [NSString string];
         NSString *emptyChar    = [NSString stringWithUTF8String:"☆"];
         NSString *fullChar     = [NSString stringWithUTF8String:"★"];
     }
     if ( rating > -1 ) {
 
         NSString *ratingString = [NSString string];
         NSString *emptyChar    = [NSString stringWithUTF8String:"☆"];
         NSString *fullChar     = [NSString stringWithUTF8String:"★"];

-        int       i;
+        int       i, start = [[text mutableString] length], size = 18;

         
         for ( i = 1; i < 6; i++ ) {
                
         
         for ( i = 1; i < 6; i++ ) {
                


@@ -160,12 +179,17 @@ static StatusWindowController *sharedController;
                 ratingString = [ratingString stringByAppendingString:emptyChar];
             }
         }
                 ratingString = [ratingString stringByAppendingString:emptyChar];
             }
         }

-    
-        text = [text stringByAppendingString:[@"\n" stringByAppendingString:ratingString]];
+               
+               [[text mutableString] appendFormat:@"\n%@", ratingString];
+               if ([_window sizing] == ITTransientStatusWindowSmall) {
+                       size /= SMALL_DIVISOR;
+               } else if ([_window sizing] == ITTransientStatusWindowMini) {
+                       size /= MINI_DIVISOR;
+               }
+               [text setAttributes:[NSDictionary dictionaryWithObjectsAndKeys:[NSFont fontWithName:@"AppleGothic" size:size], NSFontAttributeName, nil, nil] range:NSMakeRange(start + 1, 5)];
+        //text = [text stringByAppendingString:[@"\n" stringByAppendingString:ratingString]];

     }
     
     }
     

-    
-    [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];

     [_window buildTextWindowWithString:text];
     [_window appear:self];
 }
     [_window buildTextWindowWithString:text];
     [_window appear:self];
 }


@@ -207,7 +231,7 @@ static StatusWindowController *sharedController;
 {
     [_window setImage:[NSImage imageNamed:@"Shuffle"]];
     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
 {
     [_window setImage:[NSImage imageNamed:@"Shuffle"]];
     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];

-    [_window buildTextWindowWithString:( shuffle ? @"Shuffle On" : @"Shuffle Off")];
+    [_window buildTextWindowWithString:( shuffle ? NSLocalizedString(@"shuffleOn", @"Shuffle On") : NSLocalizedString(@"shuffleOff", @"Shuffle Off"))];

     [_window appear:self];
 }
 
     [_window appear:self];
 }
 


@@ -216,11 +240,11 @@ static StatusWindowController *sharedController;
     NSString *string = nil;
     
     if ( mode == StatusWindowRepeatNone ) {
     NSString *string = nil;
     
     if ( mode == StatusWindowRepeatNone ) {

-        string = @"Repeat Off";
+        string = NSLocalizedString(@"repeatOff", @"Repeat Off");

     } else if ( mode == StatusWindowRepeatGroup ) {
     } else if ( mode == StatusWindowRepeatGroup ) {

-        string = @"Repeat Playlist";
+        string = NSLocalizedString(@"repeatPlaylist", @"Repeat Playlist");

     } else if ( mode == StatusWindowRepeatTrack ) {
     } else if ( mode == StatusWindowRepeatTrack ) {

-        string = @"Repeat One Track";
+        string = NSLocalizedString(@"repeatOneTrack", @"Repeat One Track");;

     }
     
     [_window setImage:[NSImage imageNamed:@"Repeat"]];
     }
     
     [_window setImage:[NSImage imageNamed:@"Repeat"]];


@@ -231,13 +255,13 @@ static StatusWindowController *sharedController;
 
 - (void)showSetupQueryWindow
 {
 
 - (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
 
     [_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)];
                                    target:[PreferencesController sharedPrefs]
                             defaultAction:@selector(autoLaunchOK)
                           alternateAction:@selector(autoLaunchCancel)];


@@ -249,13 +273,13 @@ static StatusWindowController *sharedController;
 
 - (void)showRegistrationQueryWindow
 {
 
 - (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
 
     [_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)];
                                    target:[MainController sharedController]
                             defaultAction:@selector(registerNowOK)
                           alternateAction:@selector(registerNowCancel)];


@@ -266,13 +290,13 @@ 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 = 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
     [_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)];
                                    target:[MainController sharedController]
                             defaultAction:@selector(reconnect)
                           alternateAction:@selector(cancelReconnect)];


@@ -283,7 +307,7 @@ static StatusWindowController *sharedController;
 
 - (void)showNetworkErrorQueryWindow
 {
 
 - (void)showNetworkErrorQueryWindow
 {

-    NSString *message = @"The remote MenuTunes server is unreachable.\nMenuTunes will revert back to the local player.";
+    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 setImage:[NSImage imageNamed:@"Setup"]];
     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];


@@ -300,12 +324,12 @@ static StatusWindowController *sharedController;
 
 - (void)showPreferencesUpdateWindow
 {
 
 - (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
 
     [_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)
                           alternateButton:@"OK"
                                    target:[MainController sharedController]
                             defaultAction:@selector(showPreferencesAndClose)


@@ -315,4 +339,18 @@ static StatusWindowController *sharedController;
     [_window setLocked:YES];
 }
 
     [_window setLocked:YES];
 }
 

+- (void)showDebugModeEnabledWindow
+{
+       [_window setImage:[NSImage imageNamed:@"Setup"]];
+    [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
+    [_window buildDialogWindowWithMessage:NSLocalizedString(@"debugmodeenabled", @"Debug Mode Enabled")
+                            defaultButton:@"OK"
+                          alternateButton:nil
+                                   target:[MainController sharedController]
+                            defaultAction:@selector(cancelReconnect)
+                          alternateAction:nil];
+    [_window appear:self];
+       [_window setLocked:YES];
+}
+

 @end
\ No newline at end of file
 @end
\ No newline at end of file