Uncommented the multisource playlist chooser.

[MenuTunes.git] / StatusWindow.m

diff --git a/StatusWindow.m b/StatusWindow.m
index e3dd8a5..8e88f47 100755 (executable)
--- a/StatusWindow.m
+++ b/StatusWindow.m
@@ -45,7 +45,7 @@
      // Set default values.
         _image  = [[NSImage imageNamed:@"NSApplicationIcon"] retain];
         _locked = NO;
      // Set default values.
         _image  = [[NSImage imageNamed:@"NSApplicationIcon"] retain];
         _locked = NO;

-        _sizing = StatusWindowRegular;
+        _sizing = ITTransientStatusWindowRegular;

     }
     
     return self;
     }
     
     return self;


@@ -75,7 +75,7 @@
     [self setExitMode:(flag ? ITTransientStatusWindowExitOnCommand : ITTransientStatusWindowExitAfterDelay)];
 }
 
     [self setExitMode:(flag ? ITTransientStatusWindowExitOnCommand : ITTransientStatusWindowExitAfterDelay)];
 }
 

-- (void)setSizing:(StatusWindowSizing)newSizing
+- (void)setSizing:(ITTransientStatusWindowSizing)newSizing

 {
     _sizing = newSizing;
 }
 {
     _sizing = newSizing;
 }


@@ -124,9 +124,9 @@
     BOOL         shouldAnimate = ( ! (([self visibilityState] == ITWindowAppearingState) ||
                                       ([self visibilityState] == ITWindowVanishingState)) );
         
     BOOL         shouldAnimate = ( ! (([self visibilityState] == ITWindowAppearingState) ||
                                       ([self visibilityState] == ITWindowVanishingState)) );
         

-    if ( _sizing == StatusWindowSmall ) {
+    if ( _sizing == ITTransientStatusWindowSmall ) {

         divisor = SMALL_DIVISOR;
         divisor = SMALL_DIVISOR;

-    } else if ( _sizing == StatusWindowMini ) {
+    } else if ( _sizing == ITTransientStatusWindowMini ) {

         divisor = MINI_DIVISOR;
     }
 
         divisor = MINI_DIVISOR;
     }
 


@@ -180,13 +180,14 @@
     [[[self contentView] subviews] makeObjectsPerformSelector:@selector(removeFromSuperview)];
     
 //  Setup, position, fill, and add the image view to the content view.
     [[[self contentView] subviews] makeObjectsPerformSelector:@selector(removeFromSuperview)];
     
 //  Setup, position, fill, and add the image view to the content view.

-    imageRect = NSMakeRect( (SW_PAD / divisor),
+    imageRect = NSMakeRect( (SW_PAD / divisor) + 4,

                             ((SW_PAD / divisor) + ((contentHeight - imageHeight) / 2)),
                             imageWidth,
                             imageHeight );
                             ((SW_PAD / divisor) + ((contentHeight - imageHeight) / 2)),
                             imageWidth,
                             imageHeight );

-    imageView = [[[NSImageView alloc] initWithFrame:imageRect] autorelease];
+    imageView = [[[ITImageView alloc] initWithFrame:imageRect] autorelease];

     [imageView setAutoresizingMask:(NSViewMinYMargin | NSViewMaxYMargin)];
     [imageView setImage:_image];
     [imageView setAutoresizingMask:(NSViewMinYMargin | NSViewMaxYMargin)];
     [imageView setImage:_image];

+    [imageView setCastsShadow:YES];

     [[self contentView] addSubview:imageView];
 
     return NSMakeRect( ((SW_PAD / divisor) + imageWidth + (SW_SPACE / divisor)),
     [[self contentView] addSubview:imageView];
 
     return NSMakeRect( ((SW_PAD / divisor) + imageWidth + (SW_SPACE / divisor)),


@@ -211,9 +212,9 @@
         NSFont       *font;
         NSDictionary *attr;
 
         NSFont       *font;
         NSDictionary *attr;
 

-        if ( _sizing == StatusWindowSmall ) {
+        if ( _sizing == ITTransientStatusWindowSmall ) {

             divisor = SMALL_DIVISOR;
             divisor = SMALL_DIVISOR;

-        } else if ( _sizing == StatusWindowMini ) {
+        } else if ( _sizing == ITTransientStatusWindowMini ) {

             divisor = MINI_DIVISOR;
         }
 
             divisor = MINI_DIVISOR;
         }
 


@@ -278,9 +279,9 @@
         NSColor      *offColor    = [NSColor colorWithCalibratedWhite:0.15 alpha:0.50];
         NSMatrix     *volMatrix;
         
         NSColor      *offColor    = [NSColor colorWithCalibratedWhite:0.15 alpha:0.50];
         NSMatrix     *volMatrix;
         

-        if ( _sizing == StatusWindowSmall ) {
+        if ( _sizing == ITTransientStatusWindowSmall ) {

             divisor = SMALL_DIVISOR;
             divisor = SMALL_DIVISOR;

-        } else if ( _sizing == StatusWindowMini ) {
+        } else if ( _sizing == ITTransientStatusWindowMini ) {

             divisor = MINI_DIVISOR;
         }
         
             divisor = MINI_DIVISOR;
         }