Checking in improvements to the effect availability heuristic.

[MenuTunes.git] / StatusWindowController.m

diff --git a/StatusWindowController.m b/StatusWindowController.m
index 9e8ffff..293e35c 100755 (executable)
--- a/StatusWindowController.m
+++ b/StatusWindowController.m
@@ -31,67 +31,65 @@ static StatusWindowController *sharedController;
 - (id)init
 {
     if ( ( self = [super init] ) ) {
 - (id)init
 {
     if ( ( self = [super init] ) ) {

-    
+        

         float exitDelay;
         float exitDelay;

-        int entryTag;
-        int exitTag;
+        NSString *entryClass;
+        NSString *exitClass;
+        NSArray  *classList = [ITWindowEffect effectClasses];

         float entrySpeed;
         float exitSpeed;
         
         float entrySpeed;
         float exitSpeed;
         

+        NSData *colorData;
+        

         ITWindowEffect *entryEffect;
         ITWindowEffect *exitEffect;
         ITWindowEffect *entryEffect;
         ITWindowEffect *exitEffect;

-
+        

         _window = [[StatusWindow sharedWindow] retain];
         df = [[NSUserDefaults standardUserDefaults] retain];
         _window = [[StatusWindow sharedWindow] retain];
         df = [[NSUserDefaults standardUserDefaults] retain];

-
+        

         exitDelay  = [df floatForKey:@"statusWindowVanishDelay"];
         exitDelay  = [df floatForKey:@"statusWindowVanishDelay"];

-        entryTag   = [df integerForKey:@"statusWindowAppearanceEffect"];
-        exitTag    = [df integerForKey:@"statusWindowVanishEffect"];
+        entryClass = [df stringForKey:@"statusWindowAppearanceEffect"];
+        exitClass  = [df stringForKey:@"statusWindowVanishEffect"];

         entrySpeed = [df floatForKey:@"statusWindowAppearanceSpeed"];
         exitSpeed  = [df floatForKey:@"statusWindowVanishSpeed"];
         entrySpeed = [df floatForKey:@"statusWindowAppearanceSpeed"];
         exitSpeed  = [df floatForKey:@"statusWindowVanishSpeed"];

-
+        

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

-
+        

         [_window setHorizontalPosition:[df integerForKey:@"statusWindowHorizontalPosition"]];
         [_window setVerticalPosition:[df integerForKey:@"statusWindowVerticalPosition"]];
         [_window setHorizontalPosition:[df integerForKey:@"statusWindowHorizontalPosition"]];
         [_window setVerticalPosition:[df integerForKey:@"statusWindowVerticalPosition"]];

-
-        if ( entryTag == 2101 ) {
-            entryEffect = [[[ITDissolveWindowEffect alloc] initWithWindow:_window] autorelease];
-        } else if ( entryTag == 2102 ) {
-            entryEffect = [[[ITSlideVerticallyWindowEffect alloc] initWithWindow:_window] autorelease];
-        } else if ( entryTag == 2103 ) {
-            entryEffect = [[[ITSlideHorizontallyWindowEffect alloc] initWithWindow:_window] autorelease];
-        } else if ( entryTag == 2104 ) {
-            entryEffect = [[[ITPivotWindowEffect alloc] initWithWindow:_window] autorelease];
+        
+        [_window setSizing:(StatusWindowSizing)[df integerForKey:@"statusWindowSizing"]];
+        
+        if ( [classList containsObject:NSClassFromString(entryClass)] ) {
+            entryEffect = [[[NSClassFromString(entryClass) alloc] initWithWindow:_window] autorelease];

         } else {
             entryEffect = [[[ITCutWindowEffect alloc] initWithWindow:_window] autorelease];
         }
         } else {
             entryEffect = [[[ITCutWindowEffect alloc] initWithWindow:_window] autorelease];
         }

-
-        [_window setEntryEffect:entryEffect];
-
-        if ( exitTag == 2100 ) {
-            exitEffect = [[[ITCutWindowEffect alloc] initWithWindow:_window] autorelease];
-        } else if ( exitTag == 2102 ) {
-            exitEffect = [[[ITSlideVerticallyWindowEffect alloc] initWithWindow:_window] autorelease];
-        } else if ( exitTag == 2103 ) {
-            exitEffect = [[[ITSlideHorizontallyWindowEffect alloc] initWithWindow:_window] autorelease];
-        } else if ( exitTag == 2104 ) {
-            exitEffect = [[[ITPivotWindowEffect alloc] initWithWindow:_window] autorelease];
+        
+        if ( [classList containsObject:NSClassFromString(exitClass)] ) {
+            exitEffect = [[[NSClassFromString(exitClass) alloc] initWithWindow:_window] autorelease];

         } else {
             exitEffect = [[[ITDissolveWindowEffect alloc] initWithWindow:_window] autorelease];
         }
         } else {
             exitEffect = [[[ITDissolveWindowEffect alloc] initWithWindow:_window] autorelease];
         }

-
+        
+        [_window setEntryEffect:entryEffect];

         [_window setExitEffect:exitEffect];
         [_window setExitEffect:exitEffect];

-
+        

         [[_window entryEffect] setEffectTime:(entrySpeed ? entrySpeed : 0.8)];
         [[_window exitEffect]  setEffectTime:(exitSpeed  ? exitSpeed  : 0.8)];
         
         [(ITTSWBackgroundView *)[_window contentView]setBackgroundMode:
             (ITTSWBackgroundMode)[df integerForKey:@"statusWindowBackgroundMode"]];
         [[_window entryEffect] setEffectTime:(entrySpeed ? entrySpeed : 0.8)];
         [[_window exitEffect]  setEffectTime:(exitSpeed  ? exitSpeed  : 0.8)];
         
         [(ITTSWBackgroundView *)[_window contentView]setBackgroundMode:
             (ITTSWBackgroundMode)[df integerForKey:@"statusWindowBackgroundMode"]];

-            
-        [(ITTSWBackgroundView *)[_window contentView]setBackgroundColor:
-            (NSColor *)[NSUnarchiver unarchiveObjectWithData:[df dataForKey:@"statusWindowBackgroundColor"]]];
+        
+        colorData = [df dataForKey:@"statusWindowBackgroundColor"];
+        
+        if ( colorData ) {
+            [(ITTSWBackgroundView *)[_window contentView] setBackgroundColor:
+                (NSColor *)[NSUnarchiver unarchiveObjectWithData:colorData]];
+        } else {
+            [(ITTSWBackgroundView *)[_window contentView] setBackgroundColor:[NSColor blueColor]];
+        }

     }
     
     return self;
     }
     
     return self;


@@ -161,6 +159,8 @@ static StatusWindowController *sharedController;
         text = [text stringByAppendingString:[@"\n" stringByAppendingString:ratingString]];
     }
     
         text = [text stringByAppendingString:[@"\n" stringByAppendingString:ratingString]];
     }
     

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

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


@@ -171,6 +171,7 @@ static StatusWindowController *sharedController;
     NSString *bull = [NSString stringWithUTF8String:"♪ "];
     NSString *end  = [@"\n" stringByAppendingString:bull];
     [_window setImage:[NSImage imageNamed:@"Upcoming"]];
     NSString *bull = [NSString stringWithUTF8String:"♪ "];
     NSString *end  = [@"\n" stringByAppendingString:bull];
     [_window setImage:[NSImage imageNamed:@"Upcoming"]];

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

     [_window buildTextWindowWithString:[bull stringByAppendingString:[titleStrings componentsJoinedByString:end]]];
     [_window appear:self];
 }
     [_window buildTextWindowWithString:[bull stringByAppendingString:[titleStrings componentsJoinedByString:end]]];
     [_window appear:self];
 }


@@ -178,6 +179,7 @@ static StatusWindowController *sharedController;
 - (void)showVolumeWindowWithLevel:(float)level
 {
     [_window setImage:[NSImage imageNamed:@"Volume"]];
 - (void)showVolumeWindowWithLevel:(float)level
 {
     [_window setImage:[NSImage imageNamed:@"Volume"]];

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

     [_window buildMeterWindowWithCharacter:[NSString stringWithUTF8String:"▊"]
                                       size:18
                                      count:10
     [_window buildMeterWindowWithCharacter:[NSString stringWithUTF8String:"▊"]
                                       size:18
                                      count:10


@@ -188,6 +190,7 @@ static StatusWindowController *sharedController;
 - (void)showRatingWindowWithRating:(float)rating
 {
     [_window setImage:[NSImage imageNamed:@"Rating"]];
 - (void)showRatingWindowWithRating:(float)rating
 {
     [_window setImage:[NSImage imageNamed:@"Rating"]];

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

     [_window buildMeterWindowWithCharacter:[NSString stringWithUTF8String:"★"]
                                       size:48
                                      count:5
     [_window buildMeterWindowWithCharacter:[NSString stringWithUTF8String:"★"]
                                       size:48
                                      count:5


@@ -198,6 +201,7 @@ static StatusWindowController *sharedController;
 - (void)showShuffleWindow:(BOOL)shuffle
 {
     [_window setImage:[NSImage imageNamed:@"Shuffle"]];
 - (void)showShuffleWindow:(BOOL)shuffle
 {
     [_window setImage:[NSImage imageNamed:@"Shuffle"]];

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

     [_window buildTextWindowWithString:( shuffle ? @"Shuffle On" : @"Shuffle Off")];
     [_window appear:self];
 }
     [_window buildTextWindowWithString:( shuffle ? @"Shuffle On" : @"Shuffle Off")];
     [_window appear:self];
 }


@@ -215,6 +219,7 @@ static StatusWindowController *sharedController;
     }
     
     [_window setImage:[NSImage imageNamed:@"Repeat"]];
     }
     
     [_window setImage:[NSImage imageNamed:@"Repeat"]];

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

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


@@ -224,6 +229,7 @@ static StatusWindowController *sharedController;
     NSString *message = @"Would you like MenuTunes to launch\nautomatically at startup?";
 
     [_window setImage:[NSImage imageNamed:@"Setup"]];
     NSString *message = @"Would you like MenuTunes to launch\nautomatically at startup?";
 
     [_window setImage:[NSImage imageNamed:@"Setup"]];

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

     [_window buildDialogWindowWithMessage:message
                             defaultButton:@"Launch at Startup"
                           alternateButton:@"Launch Manually"
     [_window buildDialogWindowWithMessage:message
                             defaultButton:@"Launch at Startup"
                           alternateButton:@"Launch Manually"


@@ -241,6 +247,7 @@ static StatusWindowController *sharedController;
     NSString *message = @"Your 7-day unlimited trial period has elapsed.\nYou must register to continue using MenuTunes.";
 
     [_window setImage:[NSImage imageNamed:@"Register"]];
     NSString *message = @"Your 7-day unlimited trial period has elapsed.\nYou must register to continue using MenuTunes.";
 
     [_window setImage:[NSImage imageNamed:@"Register"]];

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

     [_window buildDialogWindowWithMessage:message
                             defaultButton:@"Register Now"
                           alternateButton:@"Quit MenuTunes"
     [_window buildDialogWindowWithMessage:message
                             defaultButton:@"Register Now"
                           alternateButton:@"Quit MenuTunes"


@@ -257,6 +264,7 @@ static StatusWindowController *sharedController;
     NSString *message = @"The selected shared player is available again.\nWould you like to reconnect to it?.";
 
     [_window setImage:[NSImage imageNamed:@"Register"]];
     NSString *message = @"The selected shared player is available again.\nWould you like to reconnect to it?.";
 
     [_window setImage:[NSImage imageNamed:@"Register"]];

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

     [_window buildDialogWindowWithMessage:message
                             defaultButton:@"Reconnect"
                           alternateButton:@"Ignore"
     [_window buildDialogWindowWithMessage:message
                             defaultButton:@"Reconnect"
                           alternateButton:@"Ignore"


@@ -268,4 +276,5 @@ static StatusWindowController *sharedController;
     [_window setLocked:YES];
 }
 
     [_window setLocked:YES];
 }
 

+

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