git.ithinksw.org / MenuTunes.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Adding initial work on new plugin API. THIS BREAKS MT. We are working to
[MenuTunes.git] / PreferencesController.m
diff --git a/PreferencesController.m b/PreferencesController.m
index af1838b..086e2ec 100755 (executable)
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -1,7 +1,9 @@
 #import "PreferencesController.h"
 #import "MainController.h"
 #import "PreferencesController.h"
 #import "MainController.h"
-#import "HotKeyCenter.h"
+#import <ITKit/ITHotKeyCenter.h>
+#import <ITKit/ITKeyCombo.h>
 #import <ITKit/ITWindowPositioning.h>
 #import <ITKit/ITWindowPositioning.h>
+#import <ITKit/ITKeyBroadcaster.h>
 
 #define SENDER_STATE (([sender state] == NSOnState) ? YES : NO)
 
 
 #define SENDER_STATE (([sender state] == NSOnState) ? YES : NO)
 
@@ -48,6 +50,7 @@ static PreferencesController *prefs = nil;
 {
     if ( (self = [super init]) ) {
         df = [[NSUserDefaults standardUserDefaults] retain];
 {
     if ( (self = [super init]) ) {
         df = [[NSUserDefaults standardUserDefaults] retain];
+        hotKeysDictionary = [[NSMutableDictionary alloc] init];
         controller = nil;
     }
     return self;
         controller = nil;
     }
     return self;
@@ -84,6 +87,10 @@ 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];
@@ -94,41 +101,27 @@ static PreferencesController *prefs = nil;
 
 - (IBAction)changeGeneralSetting:(id)sender
 {
 
 - (IBAction)changeGeneralSetting:(id)sender
 {
-    BOOL rebuildRequired = NO;
-
     if ( [sender tag] == 1010) {
         [self setLaunchesAtLogin:SENDER_STATE];
     } else if ( [sender tag] == 1020) {
         [df setBool:SENDER_STATE forKey:@"LaunchPlayerWithMT"];
     } else if ( [sender tag] == 1030) {
         [df setInteger:[sender intValue] forKey:@"SongsInAdvance"];
     if ( [sender tag] == 1010) {
         [self setLaunchesAtLogin:SENDER_STATE];
     } else if ( [sender tag] == 1020) {
         [df setBool:SENDER_STATE forKey:@"LaunchPlayerWithMT"];
     } else if ( [sender tag] == 1030) {
         [df setInteger:[sender intValue] forKey:@"SongsInAdvance"];
-        rebuildRequired = YES;
+
     } else if ( [sender tag] == 1040) {
         // This will not be executed.  Song info always shows the title of the song.
         // [df setBool:SENDER_STATE forKey:@"showName"];
     } else if ( [sender tag] == 1040) {
         // This will not be executed.  Song info always shows the title of the song.
         // [df setBool:SENDER_STATE forKey:@"showName"];
-        // rebuildRequired = YES;
     } else if ( [sender tag] == 1050) {
         [df setBool:SENDER_STATE forKey:@"showArtist"];
     } else if ( [sender tag] == 1050) {
         [df setBool:SENDER_STATE forKey:@"showArtist"];
-        rebuildRequired = YES;
     } else if ( [sender tag] == 1060) {
         [df setBool:SENDER_STATE forKey:@"showAlbum"];
     } else if ( [sender tag] == 1060) {
         [df setBool:SENDER_STATE forKey:@"showAlbum"];
-        rebuildRequired = YES;
     } else if ( [sender tag] == 1070) {
         [df setBool:SENDER_STATE forKey:@"showTime"];
     } else if ( [sender tag] == 1070) {
         [df setBool:SENDER_STATE forKey:@"showTime"];
-        rebuildRequired = YES;
     } else if ( [sender tag] == 1080) {
         [df setBool:SENDER_STATE forKey:@"showTrackNumber"];
     } else if ( [sender tag] == 1080) {
         [df setBool:SENDER_STATE forKey:@"showTrackNumber"];
-        rebuildRequired = YES;
     } else if ( [sender tag] == 1090) {
         [df setBool:SENDER_STATE forKey:@"showTrackRating"];
     } else if ( [sender tag] == 1090) {
         [df setBool:SENDER_STATE forKey:@"showTrackRating"];
-        rebuildRequired = YES;
-    }
-
-    if ( rebuildRequired ) {
-        [controller rebuildMenu];
-        // redraw song info status window, or upcoming songs here
     }
     }
-
     [df synchronize];
 }
 
     [df synchronize];
 }
 
@@ -152,56 +145,62 @@ static PreferencesController *prefs = nil;
         // Update vanish delay
     } else if ( [sender tag] == 2080) {
         // Update "Song Info window when song changes" setting.
         // Update vanish delay
     } else if ( [sender tag] == 2080) {
         // Update "Song Info window when song changes" setting.
+        [df setBool:SENDER_STATE forKey:@"showSongInfoOnChange"];
     }
 }
 
 - (IBAction)changeHotKey:(id)sender
 {
     }
 }
 
 - (IBAction)changeHotKey:(id)sender
 {
+    [controller clearHotKeys];
     switch ([sender tag])
     {
         case 4010:
     switch ([sender tag])
     {
         case 4010:
-            [self setKeyCombo:playPauseCombo];
-            [self setHotKey:@"PlayPause"];
+            [self setKeyCombo:[hotKeysDictionary objectForKey:@"PlayPause"]];
+            [self setCurrentHotKey:@"PlayPause"];
             break;
         case 4020:
             break;
         case 4020:
-            [self setKeyCombo:nextTrackCombo];
-            [self setHotKey:@"NextTrack"];
+            [self setKeyCombo:[hotKeysDictionary objectForKey:@"NextTrack"]];
+            [self setCurrentHotKey:@"NextTrack"];
             break;
         case 4030:
             break;
         case 4030:
-            [self setKeyCombo:prevTrackCombo];
-            [self setHotKey:@"PrevTrack"];
+            [self setKeyCombo:[hotKeysDictionary objectForKey:@"PrevTrack"]];
+            [self setCurrentHotKey:@"PrevTrack"];
+            break;
+        case 4035:
+            [self setKeyCombo:[hotKeysDictionary objectForKey:@"ShowPlayer"]];
+            [self setCurrentHotKey:@"ShowPlayer"];
             break;
         case 4040:
             break;
         case 4040:
-            [self setKeyCombo:toggleLoopCombo];
-            [self setHotKey:@"ToggleLoop"];
+            [self setKeyCombo:[hotKeysDictionary objectForKey:@"ToggleLoop"]];
+            [self setCurrentHotKey:@"ToggleLoop"];
             break;
         case 4050:
             break;
         case 4050:
-            [self setKeyCombo:toggleShuffleCombo];
-            [self setHotKey:@"ToggleShuffle"];
+            [self setKeyCombo:[hotKeysDictionary objectForKey:@"ToggleShuffle"]];
+            [self setCurrentHotKey:@"ToggleShuffle"];
             break;
         case 4060:
             break;
         case 4060:
-            [self setKeyCombo:trackInfoCombo];
-            [self setHotKey:@"TrackInfo"];
+            [self setKeyCombo:[hotKeysDictionary objectForKey:@"TrackInfo"]];
+            [self setCurrentHotKey:@"TrackInfo"];
             break;
         case 4070:
             break;
         case 4070:
-            [self setKeyCombo:upcomingSongsCombo];
-            [self setHotKey:@"UpcomingSongs"];
+            [self setKeyCombo:[hotKeysDictionary objectForKey:@"UpcomingSongs"]];
+            [self setCurrentHotKey:@"UpcomingSongs"];
             break;
         case 4080:
             break;
         case 4080:
-            [self setKeyCombo:volumeIncrementCombo];
-            [self setHotKey:@"IncrementVolume"];
+            [self setKeyCombo:[hotKeysDictionary objectForKey:@"IncrementVolume"]];
+            [self setCurrentHotKey:@"IncrementVolume"];
             break;
         case 4090:
             break;
         case 4090:
-            [self setKeyCombo:volumeDecrementCombo];
-            [self setHotKey:@"DecrementVolume"];
+            [self setKeyCombo:[hotKeysDictionary objectForKey:@"DecrementVolume"]];
+            [self setCurrentHotKey:@"DecrementVolume"];
             break;
         case 4100:
             break;
         case 4100:
-            [self setKeyCombo:ratingIncrementCombo];
-            [self setHotKey:@"IncrementRating"];
+            [self setKeyCombo:[hotKeysDictionary objectForKey:@"IncrementRating"]];
+            [self setCurrentHotKey:@"IncrementRating"];
             break;
         case 4110:
             break;
         case 4110:
-            [self setKeyCombo:ratingDecrementCombo];
-            [self setHotKey:@"DecrementRating"];
+            [self setKeyCombo:[hotKeysDictionary objectForKey:@"DecrementRating"]];
+            [self setCurrentHotKey:@"DecrementRating"];
             break;
     }
 }
             break;
     }
 }
@@ -215,21 +214,22 @@ static PreferencesController *prefs = nil;
     id anItem;
 
     [df setObject:[NSArray arrayWithObjects:
     id anItem;
 
     [df setObject:[NSArray arrayWithObjects:
-        @"Play/Pause",
-        @"Next Track",
-        @"Previous Track",
-        @"Fast Forward",
-        @"Rewind",
-        @"Show Player",
-        @"<separator>",
-        @"Upcoming Songs",
-        @"Playlists",
-        @"Song Rating",
-        @"<separator>",
-        @"PreferencesÉ",
-        @"Quit",
-        @"<separator>",
-        @"Current Track Info",
+        @"playPause",
+        @"prevTrack",
+        @"nextTrack",
+        @"fastForward",
+        @"rewind",
+        @"showPlayer",
+        @"separator",
+        @"songRating",
+        @"eqPresets",
+        @"playlists",
+        @"upcomingSongs",
+        @"separator",
+        @"preferences",
+        @"quit",
+        @"separator",
+        @"trackInfo",
         nil] forKey:@"menu"];
 
     [df setInteger:5 forKey:@"SongsInAdvance"];
         nil] forKey:@"menu"];
 
     [df setInteger:5 forKey:@"SongsInAdvance"];
@@ -255,7 +255,7 @@ static PreferencesController *prefs = nil;
     // This is teh sux
     // We must fix it so it is no longer suxy
     if (!found) {
     // This is teh sux
     // We must fix it so it is no longer suxy
     if (!found) {
-        if (NSRunInformationalAlertPanel(@"Auto-launch MenuTunes", @"Would you like MenuTunes to automatically launch at login?", @"Yes", @"No", nil) == NSOKButton) {
+        if (NSRunInformationalAlertPanel(NSLocalizedString(@"autolaunch", @"Auto-launch MenuTunes"), NSLocalizedString(@"autolaunch_msg", @"Would you like MenuTunes to automatically launch at login?"), @"Yes", @"No", nil) == NSOKButton) {
             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]];
             ComponentInstance asComponent = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);
             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]];
             ComponentInstance asComponent = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);
@@ -282,183 +282,89 @@ 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;
     
     if (string == nil) {
         string = @"";
     }
     
     if (string == nil) {
         string = @"";
     }
-    if ([setHotKey isEqualToString:@"PlayPause"]) {
-        if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] ||
-            [combo isEqual:trackInfoCombo] || [combo isEqual:upcomingSongsCombo] ||
-            [combo isEqual:ratingIncrementCombo] || [combo isEqual:ratingDecrementCombo] ||
-            [combo isEqual:volumeIncrementCombo] || [combo isEqual:volumeDecrementCombo] ||
-            [combo isEqual:toggleLoopCombo] || [combo isEqual:toggleShuffleCombo]) &&
-            !(([combo modifiers] == -1) && ([combo keyCode] == -1))) {
-            
-            [window setLevel:NSNormalWindowLevel];
-            NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil);
-            [window setLevel:NSStatusWindowLevel];
-            return;
+    
+    while ( (enumKey = [enumerator nextObject]) ) {
+        if (![enumKey isEqualToString:currentHotKey]) {
+            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) ) {
+                    [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:currentHotKey];
+                    if ([enumKey isEqualToString:@"PlayPause"]) {
+                        [playPauseButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"NextTrack"]) {
+                        [nextTrackButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"PrevTrack"]) {
+                        [previousTrackButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"ShowPlayer"]) {
+                        [showPlayerButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"TrackInfo"]) {
+                        [trackInfoButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"UpcomingSongs"]) {
+                        [upcomingSongsButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"IncrementVolume"]) {
+                        [volumeIncrementButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"DecrementVolume"]) {
+                        [volumeDecrementButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"IncrementRating"]) {
+                        [ratingIncrementButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"DecrementRating"]) {
+                        [ratingDecrementButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"ToggleShuffle"]) {
+                        [toggleShuffleButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"ToggleLoop"]) {
+                        [toggleLoopButton setTitle:@""];
+                    }
+                    [df setObject:[[ITKeyCombo clearKeyCombo] plistRepresentation] forKey:enumKey];
+                } else {
+                    return;
+                }
+                [window setLevel:NSStatusWindowLevel];
+            }
         }
         }
-        playPauseCombo = [combo copy];
+    }
+    
+    [hotKeysDictionary setObject:combo forKey:currentHotKey];
+    [df setObject:[combo plistRepresentation] forKey:currentHotKey];
+    
+    if ([currentHotKey isEqualToString:@"PlayPause"]) {
         [playPauseButton setTitle:string];
         [playPauseButton setTitle:string];
-    } else if ([setHotKey isEqualToString:@"NextTrack"]) {
-        if (([combo isEqual:playPauseCombo] || [combo isEqual:prevTrackCombo] ||
-            [combo isEqual:trackInfoCombo] || [combo isEqual:upcomingSongsCombo] ||
-            [combo isEqual:ratingIncrementCombo] || [combo isEqual:ratingDecrementCombo] ||
-            [combo isEqual:volumeIncrementCombo] || [combo isEqual:volumeDecrementCombo] ||
-            [combo isEqual:toggleLoopCombo] || [combo isEqual:toggleShuffleCombo]) && 
-            !(([combo modifiers] == -1) && ([combo keyCode] == -1))) {
-            
-            [window setLevel:NSNormalWindowLevel];
-            NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil);
-            [window setLevel:NSStatusWindowLevel];
-            return;
-        }
-        nextTrackCombo = [combo copy];
+    } else if ([currentHotKey isEqualToString:@"NextTrack"]) {
         [nextTrackButton setTitle:string];
         [nextTrackButton setTitle:string];
-    } else if ([setHotKey isEqualToString:@"PrevTrack"]) {
-        if (([combo isEqual:nextTrackCombo] || [combo isEqual:playPauseCombo] ||
-            [combo isEqual:trackInfoCombo] || [combo isEqual:upcomingSongsCombo] ||
-            [combo isEqual:ratingIncrementCombo] || [combo isEqual:ratingDecrementCombo] ||
-            [combo isEqual:volumeIncrementCombo] || [combo isEqual:volumeDecrementCombo] ||
-            [combo isEqual:toggleLoopCombo] || [combo isEqual:toggleShuffleCombo]) && 
-            !(([combo modifiers] == -1) && ([combo keyCode] == -1))) {
-            
-            [window setLevel:NSNormalWindowLevel];
-            NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil);
-            [window setLevel:NSStatusWindowLevel];
-            return;
-        }
-        prevTrackCombo = [combo copy];
+    } else if ([currentHotKey isEqualToString:@"PrevTrack"]) {
         [previousTrackButton setTitle:string];
         [previousTrackButton setTitle:string];
-    } else if ([setHotKey isEqualToString:@"TrackInfo"]) {
-        if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] ||
-            [combo isEqual:playPauseCombo] || [combo isEqual:upcomingSongsCombo] ||
-            [combo isEqual:ratingIncrementCombo] || [combo isEqual:ratingDecrementCombo] ||
-            [combo isEqual:volumeIncrementCombo] || [combo isEqual:volumeDecrementCombo] ||
-            [combo isEqual:toggleLoopCombo] || [combo isEqual:toggleShuffleCombo]) && 
-            !(([combo modifiers] == -1) && ([combo keyCode] == -1))) {
-            
-            [window setLevel:NSNormalWindowLevel];
-            NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil);
-            [window setLevel:NSStatusWindowLevel];
-            return;
-        }
-        trackInfoCombo = [combo copy];
+    } else if ([currentHotKey isEqualToString:@"ShowPlayer"]) {
+        [showPlayerButton setTitle:string];
+    } else if ([currentHotKey isEqualToString:@"TrackInfo"]) {
         [trackInfoButton setTitle:string];
         [trackInfoButton setTitle:string];
-    } else if ([setHotKey isEqualToString:@"UpcomingSongs"]) {
-        if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] ||
-            [combo isEqual:trackInfoCombo] || [combo isEqual:playPauseCombo] ||
-            [combo isEqual:ratingIncrementCombo] || [combo isEqual:ratingDecrementCombo] ||
-            [combo isEqual:volumeIncrementCombo] || [combo isEqual:volumeDecrementCombo] ||
-            [combo isEqual:toggleLoopCombo] || [combo isEqual:toggleShuffleCombo]) && 
-            !(([combo modifiers] == -1) && ([combo keyCode] == -1))) {
-            
-            [window setLevel:NSNormalWindowLevel];
-            NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil);
-            [window setLevel:NSStatusWindowLevel];
-            return;
-        }
-        upcomingSongsCombo = [combo copy];
+    } else if ([currentHotKey isEqualToString:@"UpcomingSongs"]) {
         [upcomingSongsButton setTitle:string];
         [upcomingSongsButton setTitle:string];
-    //THE NEW COMBOS!
-    } else if ([setHotKey isEqualToString:@"IncrementVolume"]) {
-        if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] ||
-            [combo isEqual:trackInfoCombo] || [combo isEqual:playPauseCombo] ||
-            [combo isEqual:ratingIncrementCombo] || [combo isEqual:ratingDecrementCombo] ||
-            [combo isEqual:upcomingSongsCombo] || [combo isEqual:volumeDecrementCombo] ||
-            [combo isEqual:toggleLoopCombo] || [combo isEqual:toggleShuffleCombo]) && 
-            !(([combo modifiers] == -1) && ([combo keyCode] == -1))) {
-            
-            [window setLevel:NSNormalWindowLevel];
-            NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil);
-            [window setLevel:NSStatusWindowLevel];
-            return;
-        }
-        volumeIncrementCombo = [combo copy];
+    } else if ([currentHotKey isEqualToString:@"IncrementVolume"]) {
         [volumeIncrementButton setTitle:string];
         [volumeIncrementButton setTitle:string];
-    } else if ([setHotKey isEqualToString:@"DecrementVolume"]) {
-        if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] ||
-            [combo isEqual:trackInfoCombo] || [combo isEqual:playPauseCombo] ||
-            [combo isEqual:ratingIncrementCombo] || [combo isEqual:ratingDecrementCombo] ||
-            [combo isEqual:volumeIncrementCombo] || [combo isEqual:upcomingSongsCombo] ||
-            [combo isEqual:toggleLoopCombo] || [combo isEqual:toggleShuffleCombo]) && 
-            !(([combo modifiers] == -1) && ([combo keyCode] == -1))) {
-            
-            [window setLevel:NSNormalWindowLevel];
-            NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil);
-            [window setLevel:NSStatusWindowLevel];
-            return;
-        }
-        volumeDecrementCombo = [combo copy];
+    } else if ([currentHotKey isEqualToString:@"DecrementVolume"]) {
         [volumeDecrementButton setTitle:string];
         [volumeDecrementButton setTitle:string];
-    } else if ([setHotKey isEqualToString:@"IncrementRating"]) {
-        if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] ||
-            [combo isEqual:trackInfoCombo] || [combo isEqual:playPauseCombo] ||
-            [combo isEqual:upcomingSongsCombo] || [combo isEqual:ratingDecrementCombo] ||
-            [combo isEqual:volumeIncrementCombo] || [combo isEqual:volumeDecrementCombo] ||
-            [combo isEqual:toggleLoopCombo] || [combo isEqual:toggleShuffleCombo]) && 
-            !(([combo modifiers] == -1) && ([combo keyCode] == -1))) {
-            
-            [window setLevel:NSNormalWindowLevel];
-            NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil);
-            [window setLevel:NSStatusWindowLevel];
-            return;
-        }
-        ratingIncrementCombo = [combo copy];
+    } else if ([currentHotKey isEqualToString:@"IncrementRating"]) {
         [ratingIncrementButton setTitle:string];
         [ratingIncrementButton setTitle:string];
-    } else if ([setHotKey isEqualToString:@"DecrementRating"]) {
-        if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] ||
-            [combo isEqual:trackInfoCombo] || [combo isEqual:playPauseCombo] ||
-            [combo isEqual:ratingIncrementCombo] || [combo isEqual:upcomingSongsCombo] ||
-            [combo isEqual:volumeIncrementCombo] || [combo isEqual:volumeDecrementCombo] ||
-            [combo isEqual:toggleLoopCombo] || [combo isEqual:toggleShuffleCombo]) && 
-            !(([combo modifiers] == -1) && ([combo keyCode] == -1))) {
-            
-            [window setLevel:NSNormalWindowLevel];
-            NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil);
-            [window setLevel:NSStatusWindowLevel];
-            return;
-        }
-        ratingDecrementCombo = [combo copy];
+    } else if ([currentHotKey isEqualToString:@"DecrementRating"]) {
         [ratingDecrementButton setTitle:string];
         [ratingDecrementButton setTitle:string];
-    } else if ([setHotKey isEqualToString:@"ToggleLoop"]) {
-        if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] ||
-            [combo isEqual:trackInfoCombo] || [combo isEqual:playPauseCombo] ||
-            [combo isEqual:ratingIncrementCombo] || [combo isEqual:ratingDecrementCombo] ||
-            [combo isEqual:volumeIncrementCombo] || [combo isEqual:volumeDecrementCombo] ||
-            [combo isEqual:upcomingSongsCombo] || [combo isEqual:toggleShuffleCombo]) && 
-            !(([combo modifiers] == -1) && ([combo keyCode] == -1))) {
-            
-            [window setLevel:NSNormalWindowLevel];
-            NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil);
-            [window setLevel:NSStatusWindowLevel];
-            return;
-        }
-        toggleLoopCombo = [combo copy];
-        [toggleLoopButton setTitle:string];
-    } else if ([setHotKey isEqualToString:@"ToggleShuffle"]) {
-        if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] ||
-            [combo isEqual:trackInfoCombo] || [combo isEqual:playPauseCombo] ||
-            [combo isEqual:ratingIncrementCombo] || [combo isEqual:ratingDecrementCombo] ||
-            [combo isEqual:volumeIncrementCombo] || [combo isEqual:volumeDecrementCombo] ||
-            [combo isEqual:toggleLoopCombo] || [combo isEqual:upcomingSongsCombo]) && 
-            !(([combo modifiers] == -1) && ([combo keyCode] == -1))) {
-            
-            [window setLevel:NSNormalWindowLevel];
-            NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil);
-            [window setLevel:NSStatusWindowLevel];
-            return;
-        }
-        toggleShuffleCombo = [combo copy];
+    } else if ([currentHotKey isEqualToString:@"ToggleShuffle"]) {
         [toggleShuffleButton setTitle:string];
         [toggleShuffleButton setTitle:string];
+    } else if ([currentHotKey isEqualToString:@"ToggleLoop"]) {
+        [toggleLoopButton setTitle:string];
     }
     }
+    [controller setupHotKeys];
     [self cancelHotKey:sender];
 }
 
     [self cancelHotKey:sender];
 }
 
@@ -469,34 +375,26 @@ static PreferencesController *prefs = nil;
 #pragma mark HOTKEY SUPPORT METHODS
 /*************************************************************************/
 
 #pragma mark HOTKEY SUPPORT METHODS
 /*************************************************************************/
 
-- (void)setHotKey:(NSString *)key
+- (void)setCurrentHotKey:(NSString *)key
 {
 {
-    setHotKey = key;
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyEvent:) name:@"KeyBroadcasterEvent" object:nil];
+    [currentHotKey autorelease];
+    currentHotKey = [key copy];
+    [[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) {
         string = @"";
     }
     if (string == nil) {
         string = @"";
     }
@@ -511,8 +409,8 @@ static PreferencesController *prefs = nil;
 
 - (void)setupWindow
 {
 
 - (void)setupWindow
 {
-    if ( ! [NSBundle loadNibNamed:@"Preferences" owner:self] ) {
-        NSLog( @"Failed to load Preferences.nib" );
+    if (![NSBundle loadNibNamed:@"Preferences" owner:self]) {
+        NSLog(@"MenuTunes: Failed to load Preferences.nib");
         NSBeep();
         return;
     }
         NSBeep();
         return;
     }
@@ -544,18 +442,18 @@ static PreferencesController *prefs = nil;
     id            anItem;
     // Set the list of items you can have.
     availableItems = [[NSMutableArray alloc] initWithObjects:
     id            anItem;
     // Set the list of items you can have.
     availableItems = [[NSMutableArray alloc] initWithObjects:
-        @"Current Track Info",
-        @"Upcoming Songs",
-        @"Playlists",
-        @"EQ Presets",
-        @"Song Rating",
-        @"Play/Pause",
-        @"Next Track",
-        @"Previous Track",
-        @"Fast Forward",
-        @"Rewind",
-        @"Show Player",
-        @"<separator>",
+        @"trackInfo",
+        @"upcomingSongs",
+        @"playlists",
+        @"eqPresets",
+        @"songRating",
+        @"playPause",
+        @"nextTrack",
+        @"prevTrack",
+        @"fastForward",
+        @"rewind",
+        @"showPlayer",
+        @"separator",
         nil];
     
     // Get our preferred menu
         nil];
     
     // Get our preferred menu
@@ -564,17 +462,17 @@ static PreferencesController *prefs = nil;
     // Delete items in the availableItems array that are already part of the menu
     itemEnum = [myItems objectEnumerator];
     while ( (anItem = [itemEnum nextObject]) ) {
     // Delete items in the availableItems array that are already part of the menu
     itemEnum = [myItems objectEnumerator];
     while ( (anItem = [itemEnum nextObject]) ) {
-        if ( ! [anItem isEqualToString:@"<separator>"] ) {
+        if (![anItem isEqualToString:@"separator"]) {
             [availableItems removeObject:anItem];
         }
     }
     
     // Items that show should a submenu image
     submenuItems = [[NSArray alloc] initWithObjects:
             [availableItems removeObject:anItem];
         }
     }
     
     // Items that show should a submenu image
     submenuItems = [[NSArray alloc] initWithObjects:
-        @"Upcoming Songs",
-        @"Playlists",
-        @"EQ Presets",
-        @"Song Rating",
+        @"upcomingSongs",
+        @"playlists",
+        @"eqPresets",
+        @"songRating",
         nil];
 }
 
         nil];
 }
 
@@ -584,86 +482,117 @@ static PreferencesController *prefs = nil;
     NSMutableArray *loginarray;
     NSEnumerator *loginEnum;
     id anItem;
     NSMutableArray *loginarray;
     NSEnumerator *loginEnum;
     id anItem;
-
+    
     // Fill in the number of songs in advance to show field
     [songsInAdvance setIntValue:[df integerForKey:@"SongsInAdvance"]];
     
     // Fill in hot key buttons
     // Fill in the number of songs in advance to show field
     [songsInAdvance setIntValue:[df integerForKey:@"SongsInAdvance"]];
     
     // Fill in hot key buttons
-    if ([df objectForKey:@"PlayPause"]){
-        playPauseCombo = [df keyComboForKey:@"PlayPause"];
-        [playPauseButton setTitle:[playPauseCombo userDisplayRep]];
+    if ([df objectForKey:@"PlayPause"]) {
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PlayPause"]];
+        [hotKeysDictionary setObject:anItem forKey:@"PlayPause"];
+        [playPauseButton setTitle:[anItem description]];
     } else {
     } else {
-        playPauseCombo = [[KeyCombo alloc] init];
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"PlayPause"];
+        [playPauseButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"NextTrack"]) {
     }
     
     if ([df objectForKey:@"NextTrack"]) {
-        nextTrackCombo = [df keyComboForKey:@"NextTrack"];
-        [nextTrackButton setTitle:[nextTrackCombo userDisplayRep]];
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"NextTrack"]];
+        [hotKeysDictionary setObject:anItem forKey:@"NextTrack"];
+        [nextTrackButton setTitle:[anItem description]];
     } else {
     } else {
-        nextTrackCombo = [[KeyCombo alloc] init];
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"NextTrack"];
+        [nextTrackButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"PrevTrack"]) {
     }
     
     if ([df objectForKey:@"PrevTrack"]) {
-        prevTrackCombo = [df keyComboForKey:@"PrevTrack"];
-        [previousTrackButton setTitle:[prevTrackCombo userDisplayRep]];
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PrevTrack"]];
+        [hotKeysDictionary setObject:anItem forKey:@"PrevTrack"];
+        [previousTrackButton setTitle:[anItem description]];
+    } else {
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"PrevTrack"];
+        [previousTrackButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
+    }
+    
+    if ([df objectForKey:@"ShowPlayer"]) {
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ShowPlayer"]];
+        [hotKeysDictionary setObject:anItem forKey:@"ShowPlayer"];
+        [showPlayerButton setTitle:[anItem description]];
     } else {
     } else {
-        prevTrackCombo = [[KeyCombo alloc] init];
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"ShowPlayer"];
+        [showPlayerButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"TrackInfo"]) {
     }
     
     if ([df objectForKey:@"TrackInfo"]) {
-        trackInfoCombo = [df keyComboForKey:@"TrackInfo"];
-        [trackInfoButton setTitle:[trackInfoCombo userDisplayRep]];
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"TrackInfo"]];
+        [hotKeysDictionary setObject:anItem forKey:@"TrackInfo"];
+        [trackInfoButton setTitle:[anItem description]];
     } else {
     } else {
-        trackInfoCombo = [[KeyCombo alloc] init];
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"TrackInfo"];
+        [trackInfoButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"UpcomingSongs"]) {
     }
     
     if ([df objectForKey:@"UpcomingSongs"]) {
-        upcomingSongsCombo = [df keyComboForKey:@"UpcomingSongs"];
-        [upcomingSongsButton setTitle:[upcomingSongsCombo userDisplayRep]];
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"UpcomingSongs"]];
+        [hotKeysDictionary setObject:anItem forKey:@"UpcomingSongs"];
+        [upcomingSongsButton setTitle:[anItem description]];
     } else {
     } else {
-        upcomingSongsCombo = [[KeyCombo alloc] init];
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"UpcomingSongs"];
+        [upcomingSongsButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"IncrementVolume"]) {
     }
     
     if ([df objectForKey:@"IncrementVolume"]) {
-        volumeIncrementCombo = [df keyComboForKey:@"IncrementVolume"];
-        [volumeIncrementButton setTitle:[volumeIncrementCombo userDisplayRep]];
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"IncrementVolume"]];
+        [hotKeysDictionary setObject:anItem forKey:@"IncrementVolume"];
+        [volumeIncrementButton setTitle:[anItem description]];
     } else {
     } else {
-        volumeIncrementCombo = [[KeyCombo alloc] init];
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"IncrementVolume"];
+        [volumeIncrementButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"DecrementVolume"]) {
     }
     
     if ([df objectForKey:@"DecrementVolume"]) {
-        volumeDecrementCombo = [df keyComboForKey:@"DecrementVolume"];
-        [volumeDecrementButton setTitle:[volumeDecrementCombo userDisplayRep]];
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"DecrementVolume"]];
+        [hotKeysDictionary setObject:anItem forKey:@"DecrementVolume"];
+        [volumeDecrementButton setTitle:[anItem description]];
     } else {
     } else {
-        volumeDecrementCombo = [[KeyCombo alloc] init];
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"DecrementVolume"];
+        [volumeDecrementButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"IncrementRating"]) {
     }
     
     if ([df objectForKey:@"IncrementRating"]) {
-        ratingIncrementCombo = [df keyComboForKey:@"IncrementRating"];
-        [ratingIncrementButton setTitle:[ratingIncrementCombo userDisplayRep]];
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"IncrementRating"]];
+        [hotKeysDictionary setObject:anItem forKey:@"IncrementRating"];
+        [ratingIncrementButton setTitle:[anItem description]];
     } else {
     } else {
-        ratingIncrementCombo = [[KeyCombo alloc] init];
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"IncrementRating"];
+        [ratingIncrementButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"DecrementRating"]) {
     }
     
     if ([df objectForKey:@"DecrementRating"]) {
-        ratingDecrementCombo = [df keyComboForKey:@"DecrementRating"];
-        [ratingDecrementButton setTitle:[ratingDecrementCombo userDisplayRep]];
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"DecrementRating"]];
+        [hotKeysDictionary setObject:anItem forKey:@"DecrementRating"];
+        [ratingDecrementButton setTitle:[anItem description]];
     } else {
     } else {
-        ratingDecrementCombo = [[KeyCombo alloc] init];
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"DecrementRating"];
+        [ratingDecrementButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"ToggleLoop"]) {
     }
     
     if ([df objectForKey:@"ToggleLoop"]) {
-        toggleLoopCombo = [df keyComboForKey:@"ToggleLoop"];
-        [toggleLoopButton setTitle:[toggleLoopCombo userDisplayRep]];
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleLoop"]];
+        [hotKeysDictionary setObject:anItem forKey:@"ToggleLoop"];
+        [toggleLoopButton setTitle:[anItem description]];
     } else {
     } else {
-        toggleLoopCombo = [[KeyCombo alloc] init];
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"ToggleLoop"];
+        [toggleLoopButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     if ([df objectForKey:@"ToggleShuffle"]) {
     }
     
     if ([df objectForKey:@"ToggleShuffle"]) {
-        toggleShuffleCombo = [df keyComboForKey:@"ToggleShuffle"];
-        [toggleShuffleButton setTitle:[toggleShuffleCombo userDisplayRep]];
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleShuffle"]];
+        [hotKeysDictionary setObject:anItem forKey:@"ToggleShuffle"];
+        [toggleShuffleButton setTitle:[anItem description]];
     } else {
     } else {
-        toggleShuffleCombo = [[KeyCombo alloc] init];
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"ToggleShuffle"];
+        [toggleShuffleButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
     }
     
     // Check current track info buttons
     }
     
     // Check current track info buttons
@@ -672,6 +601,7 @@ static PreferencesController *prefs = nil;
     [nameCheckbox setEnabled:NO];  // Song info will ALWAYS show song title.
     [artistCheckbox setState:[df boolForKey:@"showArtist"] ? NSOnState : NSOffState];
     [trackTimeCheckbox setState:[df boolForKey:@"showTime"] ? NSOnState : NSOffState];
     [nameCheckbox setEnabled:NO];  // Song info will ALWAYS show song title.
     [artistCheckbox setState:[df boolForKey:@"showArtist"] ? NSOnState : NSOffState];
     [trackTimeCheckbox setState:[df boolForKey:@"showTime"] ? NSOnState : NSOffState];
+    [trackNumberCheckbox setState:[df boolForKey:@"showTrackNumber"] ? NSOnState : NSOffState];
     
     // Set the launch at login checkbox state
     [df synchronize];
     
     // Set the launch at login checkbox state
     [df synchronize];
@@ -690,7 +620,6 @@ static PreferencesController *prefs = nil;
 {
     [df setObject:myItems forKey:@"menu"];
     [df synchronize];
 {
     [df setObject:myItems forKey:@"menu"];
     [df synchronize];
-    [controller rebuildMenu];
 }
 
 - (void)setLaunchesAtLogin:(BOOL)flag
 }
 
 - (void)setLaunchesAtLogin:(BOOL)flag
@@ -698,7 +627,7 @@ static PreferencesController *prefs = nil;
     if ( flag ) {
         NSMutableDictionary *loginwindow;
         NSMutableArray *loginarray;
     if ( flag ) {
         NSMutableDictionary *loginwindow;
         NSMutableArray *loginarray;
-        ComponentInstance temp = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);;
+        ComponentInstance temp = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);
         int i;
         BOOL skip = NO;
 
         int i;
         BOOL skip = NO;
 
@@ -780,9 +709,9 @@ static PreferencesController *prefs = nil;
         if ([[aTableColumn identifier] isEqualToString:@"name"]) {
             NSString *object = [myItems objectAtIndex:rowIndex];
             if ([object isEqualToString:@"Show Player"]) {
         if ([[aTableColumn identifier] isEqualToString:@"name"]) {
             NSString *object = [myItems objectAtIndex:rowIndex];
             if ([object isEqualToString:@"Show Player"]) {
-                return [NSString stringWithFormat:@"Show %@", [[controller currentRemote] playerSimpleName]];
+                return [NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"show", @"Show"), [[controller currentRemote] playerSimpleName]];
             }
             }
-            return object;
+            return NSLocalizedString(object, @"ERROR");
         } else {
             if ([submenuItems containsObject:[myItems objectAtIndex:rowIndex]])
             {
         } else {
             if ([submenuItems containsObject:[myItems objectAtIndex:rowIndex]])
             {
@@ -793,7 +722,7 @@ static PreferencesController *prefs = nil;
         }
     } else {
         if ([[aTableColumn identifier] isEqualToString:@"name"]) {
         }
     } else {
         if ([[aTableColumn identifier] isEqualToString:@"name"]) {
-            return [availableItems objectAtIndex:rowIndex];
+            return NSLocalizedString([availableItems objectAtIndex:rowIndex], @"ERROR");
         } else {
             if ([submenuItems containsObject:[availableItems objectAtIndex:rowIndex]]) {
                 return [NSImage imageNamed:@"submenu"];
         } else {
             if ([submenuItems containsObject:[availableItems objectAtIndex:rowIndex]]) {
                 return [NSImage imageNamed:@"submenu"];
@@ -832,28 +761,30 @@ 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];
-        [myItems removeObjectAtIndex:dragRow];
         
         if (tableView == menuTableView) {
         
         if (tableView == menuTableView) {
+            [myItems insertObject:temp atIndex:row];
             if (row > dragRow) {
             if (row > dragRow) {
-                [myItems insertObject:temp atIndex:row - 1];
+                [myItems removeObjectAtIndex:dragRow];
             } else {
             } else {
-                [myItems insertObject:temp atIndex:row];
+                [myItems removeObjectAtIndex:dragRow + 1];
             }
         } else {
             }
         } else {
-            if (![temp isEqualToString:@"<separator>"]) {
+            if (![temp isEqualToString:@"separator"]) {
                 [availableItems addObject:temp];
             }
                 [availableItems addObject:temp];
             }
+            [myItems removeObjectAtIndex:dragRow];
         }
     } else if ([[pb types] containsObject:@"AllTableViewPboardType"]) {
         dragData = [pb stringForType:@"AllTableViewPboardType"];
         dragRow = [dragData intValue];
         temp = [availableItems objectAtIndex:dragRow];
         
         }
     } else if ([[pb types] containsObject:@"AllTableViewPboardType"]) {
         dragData = [pb stringForType:@"AllTableViewPboardType"];
         dragRow = [dragData intValue];
         temp = [availableItems objectAtIndex:dragRow];
         
-        if (![temp isEqualToString:@"<separator>"]) {
+        [myItems insertObject:temp atIndex:row];
+        
+        if (![temp isEqualToString:@"separator"]) {
             [availableItems removeObjectAtIndex:dragRow];
         }
             [availableItems removeObjectAtIndex:dragRow];
         }
-        [myItems insertObject:temp atIndex:row];
     }
     
     [menuTableView reloadData];
     }
     
     [menuTableView reloadData];
@@ -871,7 +802,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"] || [item isEqualToString:@"Quit"]) {
                 return NSDragOperationNone;
             }
         }
                 return NSDragOperationNone;
             }
         }
@@ -897,11 +828,7 @@ static PreferencesController *prefs = nil;
 - (void)dealloc
 {
     [self setKeyCombo:nil];
 - (void)dealloc
 {
     [self setKeyCombo:nil];
-    [playPauseCombo release];
-    [nextTrackCombo release];
-    [prevTrackCombo release];
-    [trackInfoCombo release];
-    [upcomingSongsCombo release];
+    [hotKeysDictionary release];
     [keyComboPanel release];
     [menuTableView setDataSource:nil];
     [allTableView setDataSource:nil];
     [keyComboPanel release];
     [menuTableView setDataSource:nil];
     [allTableView setDataSource:nil];
Menu-based iTunes controller.