Tons of changes. Fixed the iPod problem finally. Added composer to

[MenuTunes.git] / StatusWindowController.m

diff --git a/StatusWindowController.m b/StatusWindowController.m
index 117c205..fac506c 100755 (executable)
--- a/StatusWindowController.m
+++ b/StatusWindowController.m
@@ -11,10 +11,8 @@
 #import <ITKit/ITSlideVerticallyWindowEffect.h>
 #import <ITKit/ITPivotWindowEffect.h>
 
 #import <ITKit/ITSlideVerticallyWindowEffect.h>
 #import <ITKit/ITPivotWindowEffect.h>
 

-

 static StatusWindowController *sharedController;
 
 static StatusWindowController *sharedController;
 

-

 @implementation StatusWindowController
 
 
 @implementation StatusWindowController
 
 


@@ -105,6 +103,7 @@ 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


@@ -114,16 +113,7 @@ static StatusWindowController *sharedController;
     NSString *text  = title;
     
     if ( art != 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 ) {
     } else if ( source == ITMTRemoteLibrarySource ) {
         image = [NSImage imageNamed:@"Library"];
     } else if ( source == ITMTRemoteCDSource ) {


@@ -146,6 +136,9 @@ 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 ( time ) {
         text = [text stringByAppendingString:[@"\n" stringByAppendingString:time]];
     }


@@ -275,7 +268,7 @@ static StatusWindowController *sharedController;
 {
     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 setImage:[NSImage imageNamed:@"Register"]];
+    [_window setImage:[NSImage imageNamed:@"Setup"]];

     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildDialogWindowWithMessage:message
                             defaultButton:@"Reconnect"
     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
     [_window buildDialogWindowWithMessage:message
                             defaultButton:@"Reconnect"