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 3e7522e..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


@@ -115,14 +114,6 @@ static StatusWindowController *sharedController;
     
     if ( art != nil ) {
         image = art;
     
     if ( art != nil ) {
         image = art;

-        NSSize size = [image size];
-        [image setScalesWhenResized:YES];
-        [image setSize:NSMakeSize(110, 110)];
-        /*if (size.width > 110 && size.width > size.height) {
-            [image setSize:NSMakeSize(110, (size.width / size.height) * 110)];
-        } else if (size.height > 110 && size.height > size.width) {
-            [image setSize:NSMakeSize((size.height / size.width) * 110, 110)];
-        }*/

     } else if ( source == ITMTRemoteLibrarySource ) {
         image = [NSImage imageNamed:@"Library"];
     } else if ( source == ITMTRemoteCDSource ) {
     } else if ( source == ITMTRemoteLibrarySource ) {
         image = [NSImage imageNamed:@"Library"];
     } else if ( source == ITMTRemoteCDSource ) {


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


@@ -272,9 +266,9 @@ 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:@"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"