git.ithinksw.org / MenuTunes.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Added rating checkbox outlet in Prefs nib and controller. Rating shows up
[MenuTunes.git] / PreferencesController.m
diff --git a/PreferencesController.m b/PreferencesController.m
index ea1831f..2f1eb9c 100755 (executable)
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -1,7 +1,18 @@
 #import "PreferencesController.h"
 #import "MainController.h"
 #import "PreferencesController.h"
 #import "MainController.h"
-#import "HotKeyCenter.h"
+#import "StatusWindow.h"
+
+#import <ITKit/ITHotKeyCenter.h>
+#import <ITKit/ITKeyCombo.h>
 #import <ITKit/ITWindowPositioning.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)
 
 
 #define SENDER_STATE (([sender state] == NSOnState) ? YES : NO)
 
@@ -85,12 +96,16 @@ static PreferencesController *prefs = nil;
         [self setupMenuItems];  // Setup the arrays of menu items
         [self setupUI]; // Sets up additional UI
         [window setDelegate:self];
         [self setupMenuItems];  // Setup the arrays of menu items
         [self setupUI]; // Sets up additional UI
         [window setDelegate:self];
+        [menuTableView reloadData];
+        
+        //Change the launch player checkbox to the proper name
+        [launchPlayerAtLaunchCheckbox setTitle:[NSString stringWithFormat:@"Launch %@ when MenuTunes launches", [[controller currentRemote] playerSimpleName]]]; //This isn't localized...
     }
     
     }
     
-    [window setLevel:NSStatusWindowLevel];
+//  [window setLevel:NSStatusWindowLevel];
     [window center];
     [window center];
-    [window makeKeyAndOrderFront:self];
     [NSApp activateIgnoringOtherApps:YES];
     [NSApp activateIgnoringOtherApps:YES];
+    [window makeKeyAndOrderFront:self];
 }
 
 - (IBAction)changeGeneralSetting:(id)sender
 }
 
 - (IBAction)changeGeneralSetting:(id)sender
@@ -116,11 +131,14 @@ static PreferencesController *prefs = nil;
     } else if ( [sender tag] == 1090) {
         [df setBool:SENDER_STATE forKey:@"showTrackRating"];
     }
     } else if ( [sender tag] == 1090) {
         [df setBool:SENDER_STATE forKey:@"showTrackRating"];
     }
+    
     [df synchronize];
 }
 
 - (IBAction)changeStatusWindowSetting:(id)sender
 {
     [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"];
     if ( [sender tag] == 2010) {
         [df setInteger:[sender selectedRow] forKey:@"statusWindowVerticalPosition"];
         [df setInteger:[sender selectedColumn] forKey:@"statusWindowHorizontalPosition"];
@@ -128,19 +146,61 @@ static PreferencesController *prefs = nil;
     } else if ( [sender tag] == 2020) {
         // update screen selection
     } else if ( [sender tag] == 2030) {
     } 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) {
     } 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) {
     } 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) {
     } 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) {
     } else if ( [sender tag] == 2070) {
-        // Update vanish delay
+        [df setFloat:[sender floatValue] forKey:@"statusWindowVanishDelay"];
+        [sw setExitDelay:[sender floatValue]];
     } else if ( [sender tag] == 2080) {
     } else if ( [sender tag] == 2080) {
-        // Update "Song Info window when song changes" setting.
         [df setBool:SENDER_STATE forKey:@"showSongInfoOnChange"];
     }
         [df setBool:SENDER_STATE forKey:@"showSongInfoOnChange"];
     }
+    
+    [df synchronize];
 }
 
 - (IBAction)changeHotKey:(id)sender
 }
 
 - (IBAction)changeHotKey:(id)sender
@@ -276,12 +336,12 @@ static PreferencesController *prefs = nil;
 
 - (IBAction)clearHotKey:(id)sender
 {
 
 - (IBAction)clearHotKey:(id)sender
 {
-    [self setKeyCombo:[KeyCombo clearKeyCombo]];
+    [self setKeyCombo:[ITKeyCombo clearKeyCombo]];
 }
 
 - (IBAction)okHotKey:(id)sender
 {
 }
 
 - (IBAction)okHotKey:(id)sender
 {
-    NSString *string = [combo userDisplayRep];
+    NSString *string = [combo description];
     NSEnumerator *enumerator = [hotKeysDictionary keyEnumerator];
     NSString *enumKey;
     
     NSEnumerator *enumerator = [hotKeysDictionary keyEnumerator];
     NSString *enumKey;
     
@@ -291,37 +351,38 @@ static PreferencesController *prefs = nil;
     
     while ( (enumKey = [enumerator nextObject]) ) {
         if (![enumKey isEqualToString:currentHotKey]) {
     
     while ( (enumKey = [enumerator nextObject]) ) {
         if (![enumKey isEqualToString:currentHotKey]) {
-            if (![combo isEqual:[KeyCombo clearKeyCombo]] &&
+            if (![combo isEqual:[ITKeyCombo clearKeyCombo]] &&
                  [combo isEqual:[hotKeysDictionary objectForKey:enumKey]]) {
                 [window setLevel:NSNormalWindowLevel];
                 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) ) {
                  [combo isEqual:[hotKeysDictionary objectForKey:enumKey]]) {
                 [window setLevel:NSNormalWindowLevel];
                 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:[KeyCombo clearKeyCombo] forKey:currentHotKey];
+                    [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:currentHotKey];
                     if ([enumKey isEqualToString:@"PlayPause"]) {
                     if ([enumKey isEqualToString:@"PlayPause"]) {
-                        [playPauseButton setTitle:@""];
+                        [playPauseButton setTitle:@"(None)"];
                     } else if ([enumKey isEqualToString:@"NextTrack"]) {
                     } else if ([enumKey isEqualToString:@"NextTrack"]) {
-                        [nextTrackButton setTitle:@""];
+                        [nextTrackButton setTitle:@"(None)"];
                     } else if ([enumKey isEqualToString:@"PrevTrack"]) {
                     } else if ([enumKey isEqualToString:@"PrevTrack"]) {
-                        [previousTrackButton setTitle:@""];
+                        [previousTrackButton setTitle:@"(None)"];
                     } else if ([enumKey isEqualToString:@"ShowPlayer"]) {
                     } else if ([enumKey isEqualToString:@"ShowPlayer"]) {
-                        [showPlayerButton setTitle:@""];
+                        [showPlayerButton setTitle:@"(None)"];
                     } else if ([enumKey isEqualToString:@"TrackInfo"]) {
                     } else if ([enumKey isEqualToString:@"TrackInfo"]) {
-                        [trackInfoButton setTitle:@""];
+                        [trackInfoButton setTitle:@"(None)"];
                     } else if ([enumKey isEqualToString:@"UpcomingSongs"]) {
                     } else if ([enumKey isEqualToString:@"UpcomingSongs"]) {
-                        [upcomingSongsButton setTitle:@""];
+                        [upcomingSongsButton setTitle:@"(None)"];
                     } else if ([enumKey isEqualToString:@"IncrementVolume"]) {
                     } else if ([enumKey isEqualToString:@"IncrementVolume"]) {
-                        [volumeIncrementButton setTitle:@""];
+                        [volumeIncrementButton setTitle:@"(None)"];
                     } else if ([enumKey isEqualToString:@"DecrementVolume"]) {
                     } else if ([enumKey isEqualToString:@"DecrementVolume"]) {
-                        [volumeDecrementButton setTitle:@""];
+                        [volumeDecrementButton setTitle:@"(None)"];
                     } else if ([enumKey isEqualToString:@"IncrementRating"]) {
                     } else if ([enumKey isEqualToString:@"IncrementRating"]) {
-                        [ratingIncrementButton setTitle:@""];
+                        [ratingIncrementButton setTitle:@"(None)"];
                     } else if ([enumKey isEqualToString:@"DecrementRating"]) {
                     } else if ([enumKey isEqualToString:@"DecrementRating"]) {
-                        [ratingDecrementButton setTitle:@""];
+                        [ratingDecrementButton setTitle:@"(None)"];
                     } else if ([enumKey isEqualToString:@"ToggleShuffle"]) {
                     } else if ([enumKey isEqualToString:@"ToggleShuffle"]) {
-                        [toggleShuffleButton setTitle:@""];
+                        [toggleShuffleButton setTitle:@"(None)"];
                     } else if ([enumKey isEqualToString:@"ToggleLoop"]) {
                     } else if ([enumKey isEqualToString:@"ToggleLoop"]) {
-                        [toggleLoopButton setTitle:@""];
+                        [toggleLoopButton setTitle:@"(None)"];
                     }
                     }
-                    [df setKeyCombo:[KeyCombo clearKeyCombo] forKey:enumKey];
+                    [df setObject:[[ITKeyCombo clearKeyCombo] plistRepresentation] forKey:enumKey];
+                    [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:enumKey];
                 } else {
                     return;
                 }
                 } else {
                     return;
                 }
@@ -331,44 +392,32 @@ static PreferencesController *prefs = nil;
     }
     
     [hotKeysDictionary setObject:combo forKey:currentHotKey];
     }
     
     [hotKeysDictionary setObject:combo forKey:currentHotKey];
-    [df setKeyCombo:combo forKey:currentHotKey];
+    [df setObject:[combo plistRepresentation] forKey:currentHotKey];
     
     if ([currentHotKey isEqualToString:@"PlayPause"]) {
         [playPauseButton setTitle:string];
     
     if ([currentHotKey isEqualToString:@"PlayPause"]) {
         [playPauseButton setTitle:string];
-        //[[HotKeyCenter sharedCenter] addHotKey:@"PlayPause" combo:combo target:[MainController sharedController] action:@selector(playPause)];
     } else if ([currentHotKey isEqualToString:@"NextTrack"]) {
         [nextTrackButton setTitle:string];
     } else if ([currentHotKey isEqualToString:@"NextTrack"]) {
         [nextTrackButton setTitle:string];
-        //[[HotKeyCenter sharedCenter] addHotKey:@"NextTrack" combo:combo target:[MainController sharedController] action:@selector(nextSong)];
     } else if ([currentHotKey isEqualToString:@"PrevTrack"]) {
         [previousTrackButton setTitle:string];
     } else if ([currentHotKey isEqualToString:@"PrevTrack"]) {
         [previousTrackButton setTitle:string];
-        //[[HotKeyCenter sharedCenter] addHotKey:@"PrevTrack" combo:combo target:[MainController sharedController] action:@selector(prevSong)];
     } else if ([currentHotKey isEqualToString:@"ShowPlayer"]) {
         [showPlayerButton setTitle:string];
     } else if ([currentHotKey isEqualToString:@"ShowPlayer"]) {
         [showPlayerButton setTitle:string];
-        //[[HotKeyCenter sharedCenter] addHotKey:@"ShowPlayer" combo:combo target:[MainController sharedController] action:@selector(showPlayer)];
     } else if ([currentHotKey isEqualToString:@"TrackInfo"]) {
         [trackInfoButton setTitle:string];
     } else if ([currentHotKey isEqualToString:@"TrackInfo"]) {
         [trackInfoButton setTitle:string];
-        //[[HotKeyCenter sharedCenter] addHotKey:@"TrackInfo" combo:combo target:[MainController sharedController] action:@selector(showCurrentTrackInfo)];
     } else if ([currentHotKey isEqualToString:@"UpcomingSongs"]) {
         [upcomingSongsButton setTitle:string];
     } else if ([currentHotKey isEqualToString:@"UpcomingSongs"]) {
         [upcomingSongsButton setTitle:string];
-        //[[HotKeyCenter sharedCenter] addHotKey:@"UpcomingSongs" combo:combo target:[MainController sharedController] action:@selector(showUpcomingSongs)];
     } else if ([currentHotKey isEqualToString:@"IncrementVolume"]) {
         [volumeIncrementButton setTitle:string];
     } else if ([currentHotKey isEqualToString:@"IncrementVolume"]) {
         [volumeIncrementButton setTitle:string];
-        //[[HotKeyCenter sharedCenter] addHotKey:@"IncrementVolume" combo:combo target:[MainController sharedController] action:@selector(incrementVolume)];
     } else if ([currentHotKey isEqualToString:@"DecrementVolume"]) {
         [volumeDecrementButton setTitle:string];
     } else if ([currentHotKey isEqualToString:@"DecrementVolume"]) {
         [volumeDecrementButton setTitle:string];
-        //[[HotKeyCenter sharedCenter] addHotKey:@"DecrementVolume" combo:combo target:[MainController sharedController] action:@selector(decrementVolume)];
     } else if ([currentHotKey isEqualToString:@"IncrementRating"]) {
         [ratingIncrementButton setTitle:string];
     } else if ([currentHotKey isEqualToString:@"IncrementRating"]) {
         [ratingIncrementButton setTitle:string];
-        //[[HotKeyCenter sharedCenter] addHotKey:@"IncrementRating" combo:combo target:[MainController sharedController] action:@selector(incrementRating)];
     } else if ([currentHotKey isEqualToString:@"DecrementRating"]) {
         [ratingDecrementButton setTitle:string];
     } else if ([currentHotKey isEqualToString:@"DecrementRating"]) {
         [ratingDecrementButton setTitle:string];
-        //[[HotKeyCenter sharedCenter] addHotKey:@"DecrementRating" combo:combo target:[MainController sharedController] action:@selector(decrementRating)];
     } else if ([currentHotKey isEqualToString:@"ToggleShuffle"]) {
         [toggleShuffleButton setTitle:string];
     } else if ([currentHotKey isEqualToString:@"ToggleShuffle"]) {
         [toggleShuffleButton setTitle:string];
-        //[[HotKeyCenter sharedCenter] addHotKey:@"ToggleShuffle" combo:combo target:[MainController sharedController] action:@selector(toggleShuffle)];
     } else if ([currentHotKey isEqualToString:@"ToggleLoop"]) {
         [toggleLoopButton setTitle:string];
     } else if ([currentHotKey isEqualToString:@"ToggleLoop"]) {
         [toggleLoopButton setTitle:string];
-        //[[HotKeyCenter sharedCenter] addHotKey:@"ToggleLoop" combo:combo target:[MainController sharedController] action:@selector(toggleLoop)];
     }
     [controller setupHotKeys];
     [self cancelHotKey:sender];
     }
     [controller setupHotKeys];
     [self cancelHotKey:sender];
@@ -385,33 +434,24 @@ static PreferencesController *prefs = nil;
 {
     [currentHotKey autorelease];
     currentHotKey = [key copy];
 {
     [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
 {
     [NSApp beginSheet:keyComboPanel modalForWindow:window modalDelegate:self didEndSelector:nil contextInfo:nil];
 }
 
 - (void)keyEvent:(NSNotification *)note
 {
-    NSDictionary *info = [note userInfo];
-    short keyCode;
-    long modifiers;
-    KeyCombo *newCombo;
-    
-    keyCode = [[info objectForKey:@"KeyCode"] shortValue];
-    modifiers = [[info objectForKey:@"Modifiers"] longValue];
-    
-    newCombo = [[KeyCombo alloc] initWithKeyCode:keyCode andModifiers:modifiers];
-    [self setKeyCombo:newCombo];
+    [self setKeyCombo:[[[note userInfo] objectForKey:@"keyCombo"] copy]];
 }
 
 }
 
-- (void)setKeyCombo:(KeyCombo *)newCombo
+- (void)setKeyCombo:(ITKeyCombo *)newCombo
 {
     NSString *string;
     [combo release];
     combo = [newCombo copy];
     
 {
     NSString *string;
     [combo release];
     combo = [newCombo copy];
     
-    string = [combo userDisplayRep];
+    string = [combo description];
     if (string == nil) {
     if (string == nil) {
-        string = @"";
+        string = @"(None)";
     }
     [keyComboField setStringValue:string];
 }
     }
     [keyComboField setStringValue:string];
 }
@@ -469,6 +509,7 @@ static PreferencesController *prefs = nil;
         @"rewind",
         @"showPlayer",
         @"separator",
         @"rewind",
         @"showPlayer",
         @"separator",
+        @"quit",
         nil];
     
     // Get our preferred menu
         nil];
     
     // Get our preferred menu
@@ -503,99 +544,111 @@ static PreferencesController *prefs = nil;
     
     // Fill in hot key buttons
     if ([df objectForKey:@"PlayPause"]) {
     
     // Fill in hot key buttons
     if ([df objectForKey:@"PlayPause"]) {
-        anItem = [df keyComboForKey:@"PlayPause"];
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PlayPause"]];
         [hotKeysDictionary setObject:anItem forKey:@"PlayPause"];
         [hotKeysDictionary setObject:anItem forKey:@"PlayPause"];
-        [playPauseButton setTitle:[anItem userDisplayRep]];
+        [playPauseButton setTitle:[anItem description]];
     } else {
     } else {
-        [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"PlayPause"];
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"PlayPause"];
+        [playPauseButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"NextTrack"]) {
     }
     
     if ([df objectForKey:@"NextTrack"]) {
-        anItem = [df keyComboForKey:@"NextTrack"];
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"NextTrack"]];
         [hotKeysDictionary setObject:anItem forKey:@"NextTrack"];
         [hotKeysDictionary setObject:anItem forKey:@"NextTrack"];
-        [nextTrackButton setTitle:[anItem userDisplayRep]];
+        [nextTrackButton setTitle:[anItem description]];
     } else {
     } else {
-        [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"NextTrack"];
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"NextTrack"];
+        [nextTrackButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"PrevTrack"]) {
     }
     
     if ([df objectForKey:@"PrevTrack"]) {
-        anItem = [df keyComboForKey:@"PrevTrack"];
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PrevTrack"]];
         [hotKeysDictionary setObject:anItem forKey:@"PrevTrack"];
         [hotKeysDictionary setObject:anItem forKey:@"PrevTrack"];
-        [previousTrackButton setTitle:[anItem userDisplayRep]];
+        [previousTrackButton setTitle:[anItem description]];
     } else {
     } else {
-        [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"PrevTrack"];
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"PrevTrack"];
+        [previousTrackButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"ShowPlayer"]) {
     }
     
     if ([df objectForKey:@"ShowPlayer"]) {
-        anItem = [df keyComboForKey:@"ShowPlayer"];
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ShowPlayer"]];
         [hotKeysDictionary setObject:anItem forKey:@"ShowPlayer"];
         [hotKeysDictionary setObject:anItem forKey:@"ShowPlayer"];
-        [showPlayerButton setTitle:[anItem userDisplayRep]];
+        [showPlayerButton setTitle:[anItem description]];
     } else {
     } else {
-        [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"ShowPlayer"];
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"ShowPlayer"];
+        [showPlayerButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"TrackInfo"]) {
     }
     
     if ([df objectForKey:@"TrackInfo"]) {
-        anItem = [df keyComboForKey:@"TrackInfo"];
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"TrackInfo"]];
         [hotKeysDictionary setObject:anItem forKey:@"TrackInfo"];
         [hotKeysDictionary setObject:anItem forKey:@"TrackInfo"];
-        [trackInfoButton setTitle:[anItem userDisplayRep]];
+        [trackInfoButton setTitle:[anItem description]];
     } else {
     } else {
-        [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"TrackInfo"];
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"TrackInfo"];
+        [trackInfoButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"UpcomingSongs"]) {
     }
     
     if ([df objectForKey:@"UpcomingSongs"]) {
-        anItem = [df keyComboForKey:@"UpcomingSongs"];
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"UpcomingSongs"]];
         [hotKeysDictionary setObject:anItem forKey:@"UpcomingSongs"];
         [hotKeysDictionary setObject:anItem forKey:@"UpcomingSongs"];
-        [upcomingSongsButton setTitle:[anItem userDisplayRep]];
+        [upcomingSongsButton setTitle:[anItem description]];
     } else {
     } else {
-        [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"UpcomingSongs"];
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"UpcomingSongs"];
+        [upcomingSongsButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"IncrementVolume"]) {
     }
     
     if ([df objectForKey:@"IncrementVolume"]) {
-        anItem = [df keyComboForKey:@"IncrementVolume"];
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"IncrementVolume"]];
         [hotKeysDictionary setObject:anItem forKey:@"IncrementVolume"];
         [hotKeysDictionary setObject:anItem forKey:@"IncrementVolume"];
-        [volumeIncrementButton setTitle:[anItem userDisplayRep]];
+        [volumeIncrementButton setTitle:[anItem description]];
     } else {
     } else {
-        [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"IncrementVolume"];
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"IncrementVolume"];
+        [volumeIncrementButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"DecrementVolume"]) {
     }
     
     if ([df objectForKey:@"DecrementVolume"]) {
-        anItem = [df keyComboForKey:@"DecrementVolume"];
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"DecrementVolume"]];
         [hotKeysDictionary setObject:anItem forKey:@"DecrementVolume"];
         [hotKeysDictionary setObject:anItem forKey:@"DecrementVolume"];
-        [volumeDecrementButton setTitle:[anItem userDisplayRep]];
+        [volumeDecrementButton setTitle:[anItem description]];
     } else {
     } else {
-        [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"DecrementVolume"];
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"DecrementVolume"];
+        [volumeDecrementButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"IncrementRating"]) {
     }
     
     if ([df objectForKey:@"IncrementRating"]) {
-        anItem = [df keyComboForKey:@"IncrementRating"];
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"IncrementRating"]];
         [hotKeysDictionary setObject:anItem forKey:@"IncrementRating"];
         [hotKeysDictionary setObject:anItem forKey:@"IncrementRating"];
-        [ratingIncrementButton setTitle:[anItem userDisplayRep]];
+        [ratingIncrementButton setTitle:[anItem description]];
     } else {
     } else {
-        [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"IncrementRating"];
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"IncrementRating"];
+        [ratingIncrementButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"DecrementRating"]) {
     }
     
     if ([df objectForKey:@"DecrementRating"]) {
-        anItem = [df keyComboForKey:@"DecrementRating"];
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"DecrementRating"]];
         [hotKeysDictionary setObject:anItem forKey:@"DecrementRating"];
         [hotKeysDictionary setObject:anItem forKey:@"DecrementRating"];
-        [ratingDecrementButton setTitle:[anItem userDisplayRep]];
+        [ratingDecrementButton setTitle:[anItem description]];
     } else {
     } else {
-        [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"DecrementRating"];
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"DecrementRating"];
+        [ratingDecrementButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"ToggleLoop"]) {
     }
     
     if ([df objectForKey:@"ToggleLoop"]) {
-        anItem = [df keyComboForKey:@"ToggleLoop"];
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleLoop"]];
         [hotKeysDictionary setObject:anItem forKey:@"ToggleLoop"];
         [hotKeysDictionary setObject:anItem forKey:@"ToggleLoop"];
-        [toggleLoopButton setTitle:[anItem userDisplayRep]];
+        [toggleLoopButton setTitle:[anItem description]];
     } else {
     } else {
-        [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"ToggleLoop"];
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"ToggleLoop"];
+        [toggleLoopButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"ToggleShuffle"]) {
     }
     
     if ([df objectForKey:@"ToggleShuffle"]) {
-        anItem = [df keyComboForKey:@"ToggleShuffle"];
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleShuffle"]];
         [hotKeysDictionary setObject:anItem forKey:@"ToggleShuffle"];
         [hotKeysDictionary setObject:anItem forKey:@"ToggleShuffle"];
-        [toggleShuffleButton setTitle:[anItem userDisplayRep]];
+        [toggleShuffleButton setTitle:[anItem description]];
     } else {
     } else {
-        [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"ToggleShuffle"];
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"ToggleShuffle"];
+        [toggleShuffleButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     // Check current track info buttons
     }
     
     // Check current track info buttons
@@ -605,6 +658,7 @@ static PreferencesController *prefs = nil;
     [artistCheckbox setState:[df boolForKey:@"showArtist"] ? NSOnState : NSOffState];
     [trackTimeCheckbox setState:[df boolForKey:@"showTime"] ? NSOnState : NSOffState];
     [trackNumberCheckbox setState:[df boolForKey:@"showTrackNumber"] ? NSOnState : NSOffState];
     [artistCheckbox setState:[df boolForKey:@"showArtist"] ? NSOnState : NSOffState];
     [trackTimeCheckbox setState:[df boolForKey:@"showTime"] ? NSOnState : NSOffState];
     [trackNumberCheckbox setState:[df boolForKey:@"showTrackNumber"] ? NSOnState : NSOffState];
+    [ratingCheckbox setState:[df boolForKey:@"showTrackRating"] ? NSOnState : NSOffState];
     
     // Set the launch at login checkbox state
     [df synchronize];
     
     // Set the launch at login checkbox state
     [df synchronize];
@@ -627,57 +681,31 @@ static PreferencesController *prefs = nil;
 
 - (void)setLaunchesAtLogin:(BOOL)flag
 {
 
 - (void)setLaunchesAtLogin:(BOOL)flag
 {
-    if ( flag ) {
-        NSMutableDictionary *loginwindow;
-        NSMutableArray *loginarray;
-        ComponentInstance temp = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);
-        int i;
-        BOOL skip = NO;
-
-        [df synchronize];
-        loginwindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy];
-        loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
-
-        for (i = 0; i < [loginarray count]; i++) {
-            NSDictionary *tempDict = [loginarray objectAtIndex:i];
-            if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]]) {
-                skip = YES;
-            }
-        }
-
-        if (!skip) {
-            AEDesc scriptDesc, resultDesc;
-            NSString *script = [NSString stringWithFormat:@"tell application \"System Events\"\nmake new login item at end of login items with properties {path:\"%@\", kind:\"APPLICATION\"}\nend tell", [[NSBundle mainBundle] bundlePath]];
-
-            AECreateDesc(typeChar, [script cString], [script cStringLength],
-                         &scriptDesc);
-
-            OSADoScript(temp, &scriptDesc, kOSANullScript, typeChar, kOSAModeCanInteract, &resultDesc);
-
-            AEDisposeDesc(&scriptDesc);
-            AEDisposeDesc(&resultDesc);
-            CloseComponent(temp);
-        }
-
+    NSMutableDictionary *loginwindow;
+    NSMutableArray *loginarray;
+    
+    [df synchronize];
+    loginwindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy];
+    loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
+    
+    if (flag) {
+        NSDictionary *itemDict = [NSDictionary dictionaryWithObjectsAndKeys:
+        [[NSBundle mainBundle] bundlePath], @"Path",
+        [NSNumber numberWithInt:0], @"Hide", nil];
+        [loginarray addObject:itemDict];
     } else {
     } else {
-        NSMutableDictionary *loginwindow;
-        NSMutableArray *loginarray;
         int i;
         int i;
-
-        [df synchronize];
-        loginwindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy];
-        loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
-
         for (i = 0; i < [loginarray count]; i++) {
             NSDictionary *tempDict = [loginarray objectAtIndex:i];
             if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]]) {
                 [loginarray removeObjectAtIndex:i];
         for (i = 0; i < [loginarray count]; i++) {
             NSDictionary *tempDict = [loginarray objectAtIndex:i];
             if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]]) {
                 [loginarray removeObjectAtIndex:i];
-                [df setPersistentDomain:loginwindow forName:@"loginwindow"];
-                [df synchronize];
                 break;
             }
         }
     }
                 break;
             }
         }
     }
+    [df setPersistentDomain:loginwindow forName:@"loginwindow"];
+    [df synchronize];
+    [loginwindow release];
 }
 
 
 }
 
 
@@ -764,6 +792,7 @@ static PreferencesController *prefs = nil;
         dragData = [pb stringForType:@"MenuTableViewPboardType"];
         dragRow = [dragData intValue];
         temp = [myItems objectAtIndex:dragRow];
         dragData = [pb stringForType:@"MenuTableViewPboardType"];
         dragRow = [dragData intValue];
         temp = [myItems objectAtIndex:dragRow];
+        
         if (tableView == menuTableView) {
             [myItems insertObject:temp atIndex:row];
             if (row > dragRow) {
         if (tableView == menuTableView) {
             [myItems insertObject:temp atIndex:row];
             if (row > dragRow) {
@@ -774,8 +803,8 @@ static PreferencesController *prefs = nil;
         } else {
             if (![temp isEqualToString:@"separator"]) {
                 [availableItems addObject:temp];
         } else {
             if (![temp isEqualToString:@"separator"]) {
                 [availableItems addObject:temp];
-                [myItems removeObjectAtIndex:dragRow];
             }
             }
+            [myItems removeObjectAtIndex:dragRow];
         }
     } else if ([[pb types] containsObject:@"AllTableViewPboardType"]) {
         dragData = [pb stringForType:@"AllTableViewPboardType"];
         }
     } else if ([[pb types] containsObject:@"AllTableViewPboardType"]) {
         dragData = [pb stringForType:@"AllTableViewPboardType"];
@@ -804,7 +833,7 @@ static PreferencesController *prefs = nil;
         
         if ([[[info draggingPasteboard] types] containsObject:@"MenuTableViewPboardType"]) {
             NSString *item = [myItems objectAtIndex:[[[info draggingPasteboard] stringForType:@"MenuTableViewPboardType"] intValue]];
         
         if ([[[info draggingPasteboard] types] containsObject:@"MenuTableViewPboardType"]) {
             NSString *item = [myItems objectAtIndex:[[[info draggingPasteboard] stringForType:@"MenuTableViewPboardType"] intValue]];
-            if ([item isEqualToString:@"Preferences"] || [item isEqualToString:@"Quit"]) {
+            if ([item isEqualToString:@"preferences"]) {
                 return NSDragOperationNone;
             }
         }
                 return NSDragOperationNone;
             }
         }
Menu-based iTunes controller.