STATUS WINDOWS NOW EXIST IN MENUTUNES. Some work left to do on them, then positioni...
[MenuTunes.git] / PreferencesController.m
index 1580fb6..1cc9355 100755 (executable)
@@ -1,7 +1,18 @@
 #import "PreferencesController.h"
 #import "MainController.h"
+#import "StatusWindow.h"
+
 #import <ITKit/ITHotKeyCenter.h>
+#import <ITKit/ITKeyCombo.h>
 #import <ITKit/ITWindowPositioning.h>
+#import <ITKit/ITKeyBroadcaster.h>
+
+#import <ITKit/ITCutWindowEffect.h>
+#import <ITKit/ITDissolveWindowEffect.h>
+#import <ITKit/ITSlideHorizontallyWindowEffect.h>
+#import <ITKit/ITSlideVerticallyWindowEffect.h>
+#import <ITKit/ITPivotWindowEffect.h>
+
 
 #define SENDER_STATE (([sender state] == NSOnState) ? YES : NO)
 
@@ -91,10 +102,10 @@ static PreferencesController *prefs = nil;
         [launchPlayerAtLaunchCheckbox setTitle:[NSString stringWithFormat:@"Launch %@ when MenuTunes launches", [[controller currentRemote] playerSimpleName]]]; //This isn't localized...
     }
     
-    [window setLevel:NSStatusWindowLevel];
+//  [window setLevel:NSStatusWindowLevel];
     [window center];
-    [window makeKeyAndOrderFront:self];
     [NSApp activateIgnoringOtherApps:YES];
+    [window makeKeyAndOrderFront:self];
 }
 
 - (IBAction)changeGeneralSetting:(id)sender
@@ -120,11 +131,14 @@ static PreferencesController *prefs = nil;
     } else if ( [sender tag] == 1090) {
         [df setBool:SENDER_STATE forKey:@"showTrackRating"];
     }
+    
     [df synchronize];
 }
 
 - (IBAction)changeStatusWindowSetting:(id)sender
 {
+    StatusWindow *sw = [StatusWindow sharedWindow];
+
     if ( [sender tag] == 2010) {
         [df setInteger:[sender selectedRow] forKey:@"statusWindowVerticalPosition"];
         [df setInteger:[sender selectedColumn] forKey:@"statusWindowHorizontalPosition"];
@@ -132,19 +146,61 @@ static PreferencesController *prefs = nil;
     } else if ( [sender tag] == 2020) {
         // update screen selection
     } else if ( [sender tag] == 2030) {
-        // Update appearance effect
+        int effectTag = [[sender selectedItem] tag];
+        float time = ([df floatForKey:@"statusWindowAppearanceSpeed"] ? [df floatForKey:@"statusWindowAppearanceSpeed"] : 0.8);
+        [df setInteger:effectTag forKey:@"statusWindowAppearanceEffect"];
+
+        if ( effectTag == 2100 ) {
+            [sw setEntryEffect:[[[ITCutWindowEffect alloc] initWithWindow:sw] autorelease]];
+        } else if ( effectTag == 2101 ) {
+            [sw setEntryEffect:[[[ITDissolveWindowEffect alloc] initWithWindow:sw] autorelease]];
+        } else if ( effectTag == 2102 ) {
+            [sw setEntryEffect:[[[ITSlideVerticallyWindowEffect alloc] initWithWindow:sw] autorelease]];
+        } else if ( effectTag == 2103 ) {
+            [sw setEntryEffect:[[[ITSlideHorizontallyWindowEffect alloc] initWithWindow:sw] autorelease]];
+        } else if ( effectTag == 2104 ) {
+            NSLog(@"dflhgldf");
+            [sw setEntryEffect:[[[ITPivotWindowEffect alloc] initWithWindow:sw] autorelease]];
+        }
+
+        [[sw entryEffect] setEffectTime:time];
+        
     } else if ( [sender tag] == 2040) {
-        // Update Vanish Effect
+        int effectTag = [[sender selectedItem] tag];
+        float time = ([df floatForKey:@"statusWindowVanishSpeed"] ? [df floatForKey:@"statusWindowVanishSpeed"] : 0.8);
+        
+        [df setInteger:[[sender selectedItem] tag] forKey:@"statusWindowVanishEffect"];
+        
+        if ( effectTag == 2100 ) {
+            [sw setExitEffect:[[[ITCutWindowEffect alloc] initWithWindow:sw] autorelease]];
+        } else if ( effectTag == 2101 ) {
+            [sw setExitEffect:[[[ITDissolveWindowEffect alloc] initWithWindow:sw] autorelease]];
+        } else if ( effectTag == 2102 ) {
+            [sw setExitEffect:[[[ITSlideVerticallyWindowEffect alloc] initWithWindow:sw] autorelease]];
+        } else if ( effectTag == 2103 ) {
+            [sw setExitEffect:[[[ITSlideHorizontallyWindowEffect alloc] initWithWindow:sw] autorelease]];
+        } else if ( effectTag == 2104 ) {
+            [sw setExitEffect:[[[ITPivotWindowEffect alloc] initWithWindow:sw] autorelease]];
+        }
+
+        [[sw exitEffect] setEffectTime:time];
+
     } else if ( [sender tag] == 2050) {
-        // Update appearance speed
+        float newTime = (-([sender floatValue]));
+        [df setFloat:newTime forKey:@"statusWindowAppearanceSpeed"];
+        [[sw entryEffect] setEffectTime:newTime];
     } else if ( [sender tag] == 2060) {
-        // Update vanish speed
+        float newTime = (-([sender floatValue]));
+        [df setFloat:newTime forKey:@"statusWindowVanishSpeed"];
+        [[sw exitEffect] setEffectTime:newTime];
     } else if ( [sender tag] == 2070) {
-        // Update vanish delay
+        [df setFloat:[sender floatValue] forKey:@"statusWindowVanishDelay"];
+        [sw setExitDelay:[sender floatValue]];
     } else if ( [sender tag] == 2080) {
-        // Update "Song Info window when song changes" setting.
         [df setBool:SENDER_STATE forKey:@"showSongInfoOnChange"];
     }
+    
+    [df synchronize];
 }
 
 - (IBAction)changeHotKey:(id)sender
@@ -301,31 +357,32 @@ static PreferencesController *prefs = nil;
                 if ( NSRunAlertPanel(NSLocalizedString(@"duplicateCombo", @"Duplicate Key Combo") , NSLocalizedString(@"duplicateCombo_msg", @"The specified key combo is already in use..."), NSLocalizedString(@"replace", @"Replace"), NSLocalizedString(@"cancel", @"Cancel"), nil) ) {
                     [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:currentHotKey];
                     if ([enumKey isEqualToString:@"PlayPause"]) {
-                        [playPauseButton setTitle:@""];
+                        [playPauseButton setTitle:@"(None)"];
                     } else if ([enumKey isEqualToString:@"NextTrack"]) {
-                        [nextTrackButton setTitle:@""];
+                        [nextTrackButton setTitle:@"(None)"];
                     } else if ([enumKey isEqualToString:@"PrevTrack"]) {
-                        [previousTrackButton setTitle:@""];
+                        [previousTrackButton setTitle:@"(None)"];
                     } else if ([enumKey isEqualToString:@"ShowPlayer"]) {
-                        [showPlayerButton setTitle:@""];
+                        [showPlayerButton setTitle:@"(None)"];
                     } else if ([enumKey isEqualToString:@"TrackInfo"]) {
-                        [trackInfoButton setTitle:@""];
+                        [trackInfoButton setTitle:@"(None)"];
                     } else if ([enumKey isEqualToString:@"UpcomingSongs"]) {
-                        [upcomingSongsButton setTitle:@""];
+                        [upcomingSongsButton setTitle:@"(None)"];
                     } else if ([enumKey isEqualToString:@"IncrementVolume"]) {
-                        [volumeIncrementButton setTitle:@""];
+                        [volumeIncrementButton setTitle:@"(None)"];
                     } else if ([enumKey isEqualToString:@"DecrementVolume"]) {
-                        [volumeDecrementButton setTitle:@""];
+                        [volumeDecrementButton setTitle:@"(None)"];
                     } else if ([enumKey isEqualToString:@"IncrementRating"]) {
-                        [ratingIncrementButton setTitle:@""];
+                        [ratingIncrementButton setTitle:@"(None)"];
                     } else if ([enumKey isEqualToString:@"DecrementRating"]) {
-                        [ratingDecrementButton setTitle:@""];
+                        [ratingDecrementButton setTitle:@"(None)"];
                     } else if ([enumKey isEqualToString:@"ToggleShuffle"]) {
-                        [toggleShuffleButton setTitle:@""];
+                        [toggleShuffleButton setTitle:@"(None)"];
                     } else if ([enumKey isEqualToString:@"ToggleLoop"]) {
-                        [toggleLoopButton setTitle:@""];
+                        [toggleLoopButton setTitle:@"(None)"];
                     }
                     [df setObject:[[ITKeyCombo clearKeyCombo] plistRepresentation] forKey:enumKey];
+                    [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:enumKey];
                 } else {
                     return;
                 }
@@ -339,40 +396,28 @@ static PreferencesController *prefs = nil;
     
     if ([currentHotKey isEqualToString:@"PlayPause"]) {
         [playPauseButton setTitle:string];
-        //[[ITHotKeyCenter sharedCenter] addHotKey:@"PlayPause" combo:combo target:[MainController sharedController] action:@selector(playPause)];
     } else if ([currentHotKey isEqualToString:@"NextTrack"]) {
         [nextTrackButton setTitle:string];
-        //[[ITHotKeyCenter sharedCenter] addHotKey:@"NextTrack" combo:combo target:[MainController sharedController] action:@selector(nextSong)];
     } else if ([currentHotKey isEqualToString:@"PrevTrack"]) {
         [previousTrackButton setTitle:string];
-        //[[ITHotKeyCenter sharedCenter] addHotKey:@"PrevTrack" combo:combo target:[MainController sharedController] action:@selector(prevSong)];
     } else if ([currentHotKey isEqualToString:@"ShowPlayer"]) {
         [showPlayerButton setTitle:string];
-        //[[ITHotKeyCenter sharedCenter] addHotKey:@"ShowPlayer" combo:combo target:[MainController sharedController] action:@selector(showPlayer)];
     } else if ([currentHotKey isEqualToString:@"TrackInfo"]) {
         [trackInfoButton setTitle:string];
-        //[[ITHotKeyCenter sharedCenter] addHotKey:@"TrackInfo" combo:combo target:[MainController sharedController] action:@selector(showCurrentTrackInfo)];
     } else if ([currentHotKey isEqualToString:@"UpcomingSongs"]) {
         [upcomingSongsButton setTitle:string];
-        //[[ITHotKeyCenter sharedCenter] addHotKey:@"UpcomingSongs" combo:combo target:[MainController sharedController] action:@selector(showUpcomingSongs)];
     } else if ([currentHotKey isEqualToString:@"IncrementVolume"]) {
         [volumeIncrementButton setTitle:string];
-        //[[ITHotKeyCenter sharedCenter] addHotKey:@"IncrementVolume" combo:combo target:[MainController sharedController] action:@selector(incrementVolume)];
     } else if ([currentHotKey isEqualToString:@"DecrementVolume"]) {
         [volumeDecrementButton setTitle:string];
-        //[[ITHotKeyCenter sharedCenter] addHotKey:@"DecrementVolume" combo:combo target:[MainController sharedController] action:@selector(decrementVolume)];
     } else if ([currentHotKey isEqualToString:@"IncrementRating"]) {
         [ratingIncrementButton setTitle:string];
-        //[[ITHotKeyCenter sharedCenter] addHotKey:@"IncrementRating" combo:combo target:[MainController sharedController] action:@selector(incrementRating)];
     } else if ([currentHotKey isEqualToString:@"DecrementRating"]) {
         [ratingDecrementButton setTitle:string];
-        //[[ITHotKeyCenter sharedCenter] addHotKey:@"DecrementRating" combo:combo target:[MainController sharedController] action:@selector(decrementRating)];
     } else if ([currentHotKey isEqualToString:@"ToggleShuffle"]) {
         [toggleShuffleButton setTitle:string];
-        //[[ITHotKeyCenter sharedCenter] addHotKey:@"ToggleShuffle" combo:combo target:[MainController sharedController] action:@selector(toggleShuffle)];
     } else if ([currentHotKey isEqualToString:@"ToggleLoop"]) {
         [toggleLoopButton setTitle:string];
-        //[[ITHotKeyCenter sharedCenter] addHotKey:@"ToggleLoop" combo:combo target:[MainController sharedController] action:@selector(toggleLoop)];
     }
     [controller setupHotKeys];
     [self cancelHotKey:sender];
@@ -389,22 +434,13 @@ static PreferencesController *prefs = nil;
 {
     [currentHotKey autorelease];
     currentHotKey = [key copy];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyEvent:) name:@"KeyBroadcasterEvent" object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyEvent:) name:ITKeyBroadcasterKeyEvent object:nil];
     [NSApp beginSheet:keyComboPanel modalForWindow:window modalDelegate:self didEndSelector:nil contextInfo:nil];
 }
 
 - (void)keyEvent:(NSNotification *)note
 {
-    NSDictionary *info = [note userInfo];
-    short keyCode;
-    long modifiers;
-    ITKeyCombo *newCombo;
-    
-    keyCode = [[info objectForKey:@"KeyCode"] shortValue];
-    modifiers = [[info objectForKey:@"Modifiers"] longValue];
-    
-    newCombo = [[ITKeyCombo alloc] initWithKeyCode:keyCode modifiers:modifiers];
-    [self setKeyCombo:newCombo];
+    [self setKeyCombo:[[[note userInfo] objectForKey:@"keyCombo"] copy]];
 }
 
 - (void)setKeyCombo:(ITKeyCombo *)newCombo
@@ -415,7 +451,7 @@ static PreferencesController *prefs = nil;
     
     string = [combo description];
     if (string == nil) {
-        string = @"";
+        string = @"(None)";
     }
     [keyComboField setStringValue:string];
 }
@@ -512,6 +548,7 @@ static PreferencesController *prefs = nil;
         [playPauseButton setTitle:[anItem description]];
     } else {
         [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"PlayPause"];
+        [playPauseButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"NextTrack"]) {
@@ -520,6 +557,7 @@ static PreferencesController *prefs = nil;
         [nextTrackButton setTitle:[anItem description]];
     } else {
         [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"NextTrack"];
+        [nextTrackButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"PrevTrack"]) {
@@ -528,6 +566,7 @@ static PreferencesController *prefs = nil;
         [previousTrackButton setTitle:[anItem description]];
     } else {
         [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"PrevTrack"];
+        [previousTrackButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"ShowPlayer"]) {
@@ -536,6 +575,7 @@ static PreferencesController *prefs = nil;
         [showPlayerButton setTitle:[anItem description]];
     } else {
         [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"ShowPlayer"];
+        [showPlayerButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"TrackInfo"]) {
@@ -544,6 +584,7 @@ static PreferencesController *prefs = nil;
         [trackInfoButton setTitle:[anItem description]];
     } else {
         [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"TrackInfo"];
+        [trackInfoButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"UpcomingSongs"]) {
@@ -552,6 +593,7 @@ static PreferencesController *prefs = nil;
         [upcomingSongsButton setTitle:[anItem description]];
     } else {
         [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"UpcomingSongs"];
+        [upcomingSongsButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"IncrementVolume"]) {
@@ -560,6 +602,7 @@ static PreferencesController *prefs = nil;
         [volumeIncrementButton setTitle:[anItem description]];
     } else {
         [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"IncrementVolume"];
+        [volumeIncrementButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"DecrementVolume"]) {
@@ -568,6 +611,7 @@ static PreferencesController *prefs = nil;
         [volumeDecrementButton setTitle:[anItem description]];
     } else {
         [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"DecrementVolume"];
+        [volumeDecrementButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"IncrementRating"]) {
@@ -576,6 +620,7 @@ static PreferencesController *prefs = nil;
         [ratingIncrementButton setTitle:[anItem description]];
     } else {
         [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"IncrementRating"];
+        [ratingIncrementButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"DecrementRating"]) {
@@ -584,6 +629,7 @@ static PreferencesController *prefs = nil;
         [ratingDecrementButton setTitle:[anItem description]];
     } else {
         [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"DecrementRating"];
+        [ratingDecrementButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"ToggleLoop"]) {
@@ -592,6 +638,7 @@ static PreferencesController *prefs = nil;
         [toggleLoopButton setTitle:[anItem description]];
     } else {
         [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"ToggleLoop"];
+        [toggleLoopButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"ToggleShuffle"]) {
@@ -600,6 +647,7 @@ static PreferencesController *prefs = nil;
         [toggleShuffleButton setTitle:[anItem description]];
     } else {
         [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"ToggleShuffle"];
+        [toggleShuffleButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     // Check current track info buttons