More bugfixes to networking. Small fix in Preferences. Show Player app launch is...

[MenuTunes.git] / StatusWindowController.m

diff --git a/StatusWindowController.m b/StatusWindowController.m
index 8d9ec8a..cd14b33 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,13 +113,7 @@ static StatusWindowController *sharedController;
     NSString *text  = title;
     
     if ( art != nil ) {
     NSString *text  = title;
     
     if ( art != nil ) {

-       NSSize oldSize, newSize;
-       image = art;
-       [image setScalesWhenResized:YES];
-       oldSize = [image size];
-       if (oldSize.width > oldSize.height) newSize = NSMakeSize(110,oldSize.height * (110.0f / oldSize.width));
-       else newSize = NSMakeSize(oldSize.width * (110.0f / oldSize.height),110);
-       [image setSize:newSize];
+        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 ) {


@@ -143,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]];
     }


@@ -270,7 +266,7 @@ 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 setImage:[NSImage imageNamed:@"Setup"]];
     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
 
     [_window setImage:[NSImage imageNamed:@"Setup"]];
     [_window setSizing:(ITTransientStatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];