git.ithinksw.org / MenuTunes.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fixed the F13 key equivalent. Was showing up as F3
[MenuTunes.git] / PreferencesController.m
diff --git a/PreferencesController.m b/PreferencesController.m
index 4a2d389..3d9e815 100755 (executable)
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -1,298 +1,340 @@
 #import "PreferencesController.h"
 #import "PreferencesController.h"
-#import "MenuTunes.h"
-#import "HotKeyCenter.h"
+#import "MainController.h"
+#import "StatusWindow.h"
+#import "StatusWindowController.h"
+#import "CustomMenuTableView.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)
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark PRIVATE INTERFACE
+/*************************************************************************/
+
+@interface PreferencesController (Private)
+- (void)setupWindow;
+- (void)setupCustomizationTables;
+- (void)setupMenuItems;
+- (void)setupUI;
+- (IBAction)changeMenus:(id)sender;
+- (void)setLaunchesAtLogin:(BOOL)flag;
+@end
+
 
 @implementation PreferencesController
 
 
 @implementation PreferencesController
 
-- (id)initWithMenuTunes:(MenuTunes *)tunes;
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark STATIC VARIABLES
+/*************************************************************************/
+
+static PreferencesController *prefs = nil;
+
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark INITIALIZATION METHODS
+/*************************************************************************/
+
++ (PreferencesController *)sharedPrefs;
 {
 {
-    if ( (self = [super init]) )
-    {
-        int i;
-        NSImageCell *imgCell = [[[NSImageCell alloc] init] autorelease];
-        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-        NSString *temp;
-        
-        mt = [tunes retain];
-        
-        //Load the nib
-        [NSBundle loadNibNamed:@"Preferences" owner:self];
-        
-        //Show our window
-        [window setLevel:NSStatusWindowLevel];
-        [window center];
-        [window makeKeyAndOrderFront:nil];
-        
-        //Set the table view cells up
-        [imgCell setImageScaling:NSScaleNone];
-        [[menuTableView tableColumnWithIdentifier:@"submenu"] setDataCell:imgCell];
-        [[allTableView tableColumnWithIdentifier:@"submenu"] setDataCell:imgCell];
-        
-        //Register for drag and drop
-        [menuTableView registerForDraggedTypes:[NSArray arrayWithObjects:@"MenuTableViewPboardType", @"AllTableViewPboardType", nil]];
-        [allTableView registerForDraggedTypes:[NSArray arrayWithObjects:@"MenuTableViewPboardType", @"AllTableViewPboardType", nil]];
-        
-        //Set the list of items you can have.
-        availableItems = [[NSMutableArray alloc] initWithObjects:@"Current Track Info",  @"Upcoming Songs", @"Playlists", @"EQ Presets", @"Play/Pause", @"Next Track", @"Previous Track", @"Fast Forward", @"Rewind", @"<separator>", nil];
-        
-        //Get our preferred menu
-        myItems = [[[NSUserDefaults standardUserDefaults] arrayForKey:@"menu"] mutableCopy];
-        if (myItems == nil)
-        {
-            myItems = [[NSMutableArray alloc] initWithObjects:@"Play/Pause", @"Next Track", @"Previous Track", @"Fast Forward", @"Rewind", @"<separator>", @"Upcoming Songs", @"Playlists", @"EQ Presets", @"<separator>", @"PreferencesÉ", @"Quit", @"<separator>", @"Current Track Info", nil];
-            [[NSUserDefaults standardUserDefaults] setObject:myItems forKey:@"menu"];
-        }
-        
-        //Delete items in the availableItems array that are already part of the menu
-        for (i = 0; i < [myItems count]; i++)
-        {
-            NSString *item = [myItems objectAtIndex:i];
-            if (![item isEqualToString:@"<separator>"])
-            {
-                [availableItems removeObject:item];
-            }
-        }
-        
-        //Items that show should a submenu image
-        submenuItems = [[NSArray alloc] initWithObjects:@"Upcoming Songs", @"Playlists", @"EQ Presets", nil];
-        
-        //Fill in the number of songs in advance to show field
-        if ([defaults integerForKey:@"SongsInAdvance"])
-        {
-            [songsInAdvance setIntValue:[defaults integerForKey:@"SongsInAdvance"]];
-        }
-        else
-        {
-            [songsInAdvance setIntValue:5];
-        }
-        
-        //Fill in hot key buttons
-        if ([defaults objectForKey:@"PlayPause"])
-        {
-            playPauseCombo = [defaults keyComboForKey:@"PlayPause"];
-            [playPauseButton setTitle:[playPauseCombo userDisplayRep]];
-        }
-        else
-        {
-            playPauseCombo = [[KeyCombo alloc] init];
-        }
-        
-        if ([defaults objectForKey:@"NextTrack"])
-        {
-            nextTrackCombo = [defaults keyComboForKey:@"NextTrack"];
-            [nextTrackButton setTitle:[nextTrackCombo userDisplayRep]];
-        }
-        else
-        {
-            nextTrackCombo = [[KeyCombo alloc] init];
-        }
-        
-        if ([defaults objectForKey:@"PrevTrack"])
-        {
-            prevTrackCombo = [defaults keyComboForKey:@"PrevTrack"];
-            [previousTrackButton setTitle:[prevTrackCombo userDisplayRep]];
-        }
-        else
-        {
-            prevTrackCombo = [[KeyCombo alloc] init];
-        }
-        
-        if ([defaults objectForKey:@"TrackInfo"])
-        {
-            trackInfoCombo = [defaults keyComboForKey:@"TrackInfo"];
-            [trackInfoButton setTitle:[trackInfoCombo userDisplayRep]];
-        }
-        else
-        {
-            trackInfoCombo = [[KeyCombo alloc] init];
-        }
-        
-        if ([defaults objectForKey:@"UpcomingSongs"])
-        {
-            upcomingSongsCombo = [defaults keyComboForKey:@"UpcomingSongs"];
-            [upcomingSongsButton setTitle:[upcomingSongsCombo userDisplayRep]];
-        }
-        else
-        {
-            upcomingSongsCombo = [[KeyCombo alloc] init];
-        }
-        
-        //Check current track info buttons
-        
-        //Album and name get special treatment because they are defaults
-        if ( (temp = [defaults stringForKey:@"showAlbum"]) )
-        {
-            if ((temp == nil) || [temp isEqualToString:@"1"])
-            {
-                [albumCheckbox setState:NSOnState];
-            }
-            else
-            {
-                [albumCheckbox setState:NSOffState];
-            }
-        }
-        
-        if ( (temp = [defaults stringForKey:@"showName"]) )
-        {
-            if ((temp == nil) || [temp isEqualToString:@"1"])
-            {
-                [nameCheckbox setState:NSOnState];
-            }
-            else
-            {
-                [nameCheckbox setState:NSOffState];
-            }
-        }
-        
-        [artistCheckbox setState:[defaults boolForKey:@"showArtist"] ? NSOnState : NSOffState];
-        [trackTimeCheckbox setState:[defaults boolForKey:@"showTime"] ? NSOnState : NSOffState];
-        
-        //Set the launch at login checkbox state
-        {
-            NSMutableDictionary *loginwindow;
-            NSMutableArray *loginarray;
-            int i;
-            
-            [defaults synchronize];
-            loginwindow = [[defaults persistentDomainForName:@"loginwindow"] mutableCopy];
-            loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
-            
-            for (i = 0; i < [loginarray count]; i++)
-            {
-                NSDictionary *tempDict = [loginarray objectAtIndex:i];
-                
-                //Here we are seeing if our program is already in loginwindow.plist.
-                //See the problem below for this problem here. We will do the same thing.
-                
-                if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:@"VocabularyBuilder.app"])
-                {
-                    [launchAtLoginCheckbox setState:NSOnState];
-                }
-            }
-        }
+    if (! prefs) {
+        prefs = [[self alloc] init];
+    }
+    return prefs;
+}
+
+- (id)init
+{
+    if ( (self = [super init]) ) {
+        ITDebugLog(@"Preferences initialized.");
+        df = [[NSUserDefaults standardUserDefaults] retain];
+        hotKeysDictionary = [[NSMutableDictionary alloc] init];
+        controller = nil;
     }
     return self;
 }
 
     }
     return self;
 }
 
-- (void)dealloc
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark ACCESSOR METHODS
+/*************************************************************************/
+
+- (id)controller
 {
 {
-    [self setKeyCombo:nil];
-    [playPauseCombo release];
-    [nextTrackCombo release];
-    [prevTrackCombo release];
-    [trackInfoCombo release];
-    [upcomingSongsCombo release];
-    [keyComboPanel release];
-    [menuTableView setDataSource:nil];
-    [allTableView setDataSource:nil];
-    [mt release];
-    [availableItems release];
-    [submenuItems release];
-    [myItems release];
+    return controller;
 }
 
 }
 
-- (IBAction)apply:(id)sender
+- (void)setController:(id)object
 {
 {
-    ProcessSerialNumber psn;
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    [defaults setObject:myItems forKey:@"menu"];
-    
-    //Set key combos
-    [defaults setKeyCombo:playPauseCombo forKey:@"PlayPause"];
-    [defaults setKeyCombo:nextTrackCombo forKey:@"NextTrack"];
-    [defaults setKeyCombo:prevTrackCombo forKey:@"PrevTrack"];
-    [defaults setKeyCombo:trackInfoCombo forKey:@"TrackInfo"];
-    [defaults setKeyCombo:upcomingSongsCombo forKey:@"UpcomingSongs"];
-    
-    //Set info checkboxes
-    [defaults setBool:[albumCheckbox state] forKey:@"showAlbum"];
-    [defaults setBool:[nameCheckbox state] forKey:@"showName"];
-    [defaults setBool:[artistCheckbox state] forKey:@"showArtist"];
-    [defaults setBool:[trackTimeCheckbox state] forKey:@"showTime"];
-    
-    //Here we set whether we will launch at login by modifying loginwindow.plist
-    if ([launchAtLoginCheckbox state] == NSOnState)
-    {
-        NSMutableDictionary *loginwindow;
-        NSMutableArray *loginarray;
-        int i;
-        BOOL skip = NO;
-        
-        [defaults synchronize];
-        loginwindow = [[defaults persistentDomainForName:@"loginwindow"] mutableCopy];
-        loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
+    [controller autorelease];
+    controller = [object retain];
+}
+
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark INSTANCE METHODS
+/*************************************************************************/
+
+- (IBAction)showPrefsWindow:(id)sender
+{
+    ITDebugLog(@"Showing preferences window.");
+    if (! window) {  // If window does not exist yet, then the nib hasn't been loaded.
+        ITDebugLog(@"Window doesn't exist, initial setup.");
+        [self setupWindow];  // Load in the nib, and perform any initial setup.
+        [self setupCustomizationTables];  // Setup the DnD manu config tables.
+        [self setupMenuItems];  // Setup the arrays of menu items
+        [self setupUI]; // Sets up additional UI
+        [window setDelegate:self];
+        [menuTableView reloadData];
         
         
-        for (i = 0; i < [loginarray count]; i++)
-        {
-            NSDictionary *tempDict = [loginarray objectAtIndex:i];
-            
-            //Here we are seeing if our program is already in loginwindow.plist.
-            //See the problem below for this problem here. We will do the same thing.
-            
-            if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:@"VocabularyBuilder.app"])
-            {
-                skip = YES;
-            }
+        //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 center];
+    [NSApp activateIgnoringOtherApps:YES];
+    [window performSelector:@selector(makeKeyAndOrderFront:) withObject:self afterDelay:0.0];
+}
+
+- (IBAction)changeGeneralSetting:(id)sender
+{
+    ITDebugLog(@"Changing general setting of tag %i.", [sender tag]);
+    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"];
+
+    } 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] == 1050) {
+        [df setBool:SENDER_STATE forKey:@"showArtist"];
+    } else if ( [sender tag] == 1060) {
+        [df setBool:SENDER_STATE forKey:@"showAlbum"];
+    } else if ( [sender tag] == 1070) {
+        [df setBool:SENDER_STATE forKey:@"showTime"];
+    } else if ( [sender tag] == 1080) {
+        [df setBool:SENDER_STATE forKey:@"showTrackNumber"];
+    } else if ( [sender tag] == 1090) {
+        [df setBool:SENDER_STATE forKey:@"showTrackRating"];
+    }
+    [df synchronize];
+}
+
+- (IBAction)changeStatusWindowSetting:(id)sender
+{
+    StatusWindow *sw = [StatusWindow sharedWindow];
+    ITDebugLog(@"Changing status window setting of tag %i", [sender tag]);
+    if ( [sender tag] == 2010) {
+        [df setInteger:[sender selectedRow] forKey:@"statusWindowVerticalPosition"];
+        [df setInteger:[sender selectedColumn] forKey:@"statusWindowHorizontalPosition"];
+        // update the window's position here
+    } else if ( [sender tag] == 2020) {
+        // update screen selection
+    } else if ( [sender tag] == 2030) {
+        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];
         
         
-        if (!skip)
-        {
-            [loginarray addObject:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:NO], @"Hide", [[NSBundle mainBundle] bundlePath], @"Path", nil]];
-            
-            [defaults setPersistentDomain:loginwindow forName:@"loginwindow"];
-            [defaults synchronize];
-        }
-    }
-    else
-    {
-        NSMutableDictionary *loginwindow;
-        NSMutableArray *loginarray;
-        int i;
+    } else if ( [sender tag] == 2040) {
+        int effectTag = [[sender selectedItem] tag];
+        float time = ([df floatForKey:@"statusWindowVanishSpeed"] ? [df floatForKey:@"statusWindowVanishSpeed"] : 0.8);
         
         
-        [[NSUserDefaults standardUserDefaults] synchronize];
-        loginwindow = [[[NSUserDefaults standardUserDefaults] persistentDomainForName:@"loginwindow"] mutableCopy];
-        loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
+        [df setInteger:[[sender selectedItem] tag] forKey:@"statusWindowVanishEffect"];
         
         
-        for (i = 0; i < [loginarray count]; i++)
-        {
-            NSDictionary *tempDict = [loginarray objectAtIndex:i];
-            
-            if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:@"VocabularyBuilder.app"])
-            {
-                [loginarray removeObjectAtIndex:i];
-                [defaults setPersistentDomain:loginwindow forName:@"loginwindow"];
-                [defaults synchronize];
-                break;
-            }
+        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) {
+        float newTime = (-([sender floatValue]));
+        [df setFloat:newTime forKey:@"statusWindowAppearanceSpeed"];
+        [[sw entryEffect] setEffectTime:newTime];
+    } else if ( [sender tag] == 2060) {
+        float newTime = (-([sender floatValue]));
+        [df setFloat:newTime forKey:@"statusWindowVanishSpeed"];
+        [[sw exitEffect] setEffectTime:newTime];
+    } else if ( [sender tag] == 2070) {
+        [df setFloat:[sender floatValue] forKey:@"statusWindowVanishDelay"];
+        [sw setExitDelay:[sender floatValue]];
+    } else if ( [sender tag] == 2080) {
+        [df setBool:SENDER_STATE forKey:@"showSongInfoOnChange"];
     }
     }
-    
-    //Set songs in advance
-    if ([songsInAdvance intValue])
+    [df synchronize];
+}
+
+- (IBAction)changeHotKey:(id)sender
+{
+    ITDebugLog(@"Changing hot keys.");
+    [controller clearHotKeys];
+    switch ([sender tag])
     {
     {
-        [defaults setInteger:[songsInAdvance intValue] forKey:@"SongsInAdvance"];
+        case 4010:
+            [self setKeyCombo:[hotKeysDictionary objectForKey:@"PlayPause"]];
+            [self setCurrentHotKey:@"PlayPause"];
+            break;
+        case 4020:
+            [self setKeyCombo:[hotKeysDictionary objectForKey:@"NextTrack"]];
+            [self setCurrentHotKey:@"NextTrack"];
+            break;
+        case 4030:
+            [self setKeyCombo:[hotKeysDictionary objectForKey:@"PrevTrack"]];
+            [self setCurrentHotKey:@"PrevTrack"];
+            break;
+        case 4035:
+            [self setKeyCombo:[hotKeysDictionary objectForKey:@"ShowPlayer"]];
+            [self setCurrentHotKey:@"ShowPlayer"];
+            break;
+        case 4040:
+            [self setKeyCombo:[hotKeysDictionary objectForKey:@"ToggleLoop"]];
+            [self setCurrentHotKey:@"ToggleLoop"];
+            break;
+        case 4050:
+            [self setKeyCombo:[hotKeysDictionary objectForKey:@"ToggleShuffle"]];
+            [self setCurrentHotKey:@"ToggleShuffle"];
+            break;
+        case 4060:
+            [self setKeyCombo:[hotKeysDictionary objectForKey:@"TrackInfo"]];
+            [self setCurrentHotKey:@"TrackInfo"];
+            break;
+        case 4070:
+            [self setKeyCombo:[hotKeysDictionary objectForKey:@"UpcomingSongs"]];
+            [self setCurrentHotKey:@"UpcomingSongs"];
+            break;
+        case 4080:
+            [self setKeyCombo:[hotKeysDictionary objectForKey:@"IncrementVolume"]];
+            [self setCurrentHotKey:@"IncrementVolume"];
+            break;
+        case 4090:
+            [self setKeyCombo:[hotKeysDictionary objectForKey:@"DecrementVolume"]];
+            [self setCurrentHotKey:@"DecrementVolume"];
+            break;
+        case 4100:
+            [self setKeyCombo:[hotKeysDictionary objectForKey:@"IncrementRating"]];
+            [self setCurrentHotKey:@"IncrementRating"];
+            break;
+        case 4110:
+            [self setKeyCombo:[hotKeysDictionary objectForKey:@"DecrementRating"]];
+            [self setCurrentHotKey:@"DecrementRating"];
+            break;
     }
     }
-    else
-    {
-        [defaults setInteger:5 forKey:@"SongsInAdvance"];
+}
+
+- (void)registerDefaults
+{
+    BOOL found = NO;
+    NSMutableDictionary *loginWindow;
+    NSMutableArray *loginArray;
+    NSEnumerator *loginEnum;
+    id anItem;
+    ITDebugLog(@"Registering defaults.");
+    [df setObject:[NSArray arrayWithObjects:
+        @"trackInfo",
+        @"separator",
+        @"playPause",
+        @"prevTrack",
+        @"nextTrack",
+        @"separator",
+        @"playlists",
+        @"upcomingSongs",
+        @"separator",
+        @"preferences",
+        @"quit",
+        nil] forKey:@"menu"];
+
+    [df setInteger:5 forKey:@"SongsInAdvance"];
+    // [df setBool:YES forKey:@"showName"];  // Song info will always show song title.
+    [df setBool:YES forKey:@"showArtist"];
+    [df setBool:NO forKey:@"showAlbum"];
+    [df setBool:NO forKey:@"showTime"];
+
+    [df setInteger:2100 forKey:@"statusWindowAppearanceEffect"];
+    [df setInteger:2101 forKey:@"statusWindowVanishEffect"];
+    [df setFloat:0.8 forKey:@"statusWindowAppearanceSpeed"];
+    [df setFloat:0.8 forKey:@"statusWindowVanishSpeed"];
+    [df setFloat:4.0 forKey:@"statusWindowVanishDelay"];
+    [df setBool:YES forKey:@"showSongInfoOnChange"];
+
+    [df synchronize];
+    
+    loginWindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy];
+    loginArray = [loginWindow objectForKey:@"AutoLaunchedApplicationDictionary"];
+    loginEnum = [loginArray objectEnumerator];
+
+    while ( (anItem = [loginEnum nextObject]) ) {
+        if ( [[[anItem objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]] ) {
+            found = YES;
+        }
     }
     }
+    [loginWindow release];
     
     
-    psn = [mt iTunesPSN];
-    if (!((psn.highLongOfPSN == kNoProcess) && (psn.lowLongOfPSN == 0)))
-    {
-        [mt rebuildMenu];
+    if (!found) {
+        [[StatusWindowController sharedController] showSetupQueryWindow];
     }
     }
-    [mt clearHotKeys];
 }
 
 }
 
-- (IBAction)cancel:(id)sender
+- (void)autoLaunchOK
 {
 {
-    [window close];
-    [mt closePreferences];
+    [[StatusWindow sharedWindow] setLocked:NO];
+    [[StatusWindow sharedWindow] vanish:self];
+    [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
+    
+    [self setLaunchesAtLogin:YES];
+}
+
+- (void)autoLaunchCancel
+{
+    [[StatusWindow sharedWindow] setLocked:NO];
+    [[StatusWindow sharedWindow] vanish:self];
+    [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
 }
 
 - (IBAction)cancelHotKey:(id)sender
 {
 }
 
 - (IBAction)cancelHotKey:(id)sender
 {
+    ITDebugLog(@"Hot key canceled.");
     [[NSNotificationCenter defaultCenter] removeObserver:self];
     [NSApp endSheet:keyComboPanel];
     [keyComboPanel orderOut:nil];
     [[NSNotificationCenter defaultCenter] removeObserver:self];
     [NSApp endSheet:keyComboPanel];
     [keyComboPanel orderOut:nil];
@@ -300,223 +342,496 @@
 
 - (IBAction)clearHotKey:(id)sender
 {
 
 - (IBAction)clearHotKey:(id)sender
 {
-    [self setKeyCombo:[KeyCombo clearKeyCombo]];
+    ITDebugLog(@"Hot key cleared.");
+    [self setKeyCombo:[ITKeyCombo clearKeyCombo]];
 }
 
 - (IBAction)okHotKey:(id)sender
 {
 }
 
 - (IBAction)okHotKey:(id)sender
 {
-    NSString *string;
-    if (([combo modifiers] <= 0) && ([combo keyCode] >= 0))
-    {
-        [window setLevel:NSNormalWindowLevel];
-        NSRunAlertPanel(@"Bad Key Combo", @"Please enter a valid key combo. A valid combo must have a modifier key in it. (Command, option, shift, control).", @"OK", nil, nil, nil);
-        [window setLevel:NSStatusWindowLevel];
-        return;
-    }
+    NSString *string = [combo description];
+    NSEnumerator *enumerator = [hotKeysDictionary keyEnumerator];
+    NSString *enumKey;
     
     
-    string = [combo userDisplayRep];
+    ITDebugLog(@"Hot key ok'd, saving.");
     
     
-    if (string == nil)
-    {
-        string = @"None";
+    if (string == nil) {
+        string = @"";
     }
     }
-    if ([setHotKey isEqualToString:@"PlayPause"])
-    {
-        if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] ||
-            [combo isEqual:trackInfoCombo] || [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;
+    
+    ITDebugLog(@"Checking for duplicate hot keys.");
+    while ( (enumKey = [enumerator nextObject]) ) {
+        if (![enumKey isEqualToString:currentHotKey]) {
+            if (![combo isEqual:[ITKeyCombo clearKeyCombo]] &&
+                 [combo isEqual:[hotKeysDictionary objectForKey:enumKey]]) {
+                [window setLevel:NSNormalWindowLevel];
+                ITDebugLog(@"Duplicate hot key found: %@", enumKey);
+                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:@"(None)"];
+                    } else if ([enumKey isEqualToString:@"NextTrack"]) {
+                        [nextTrackButton setTitle:@"(None)"];
+                    } else if ([enumKey isEqualToString:@"PrevTrack"]) {
+                        [previousTrackButton setTitle:@"(None)"];
+                    } else if ([enumKey isEqualToString:@"ShowPlayer"]) {
+                        [showPlayerButton setTitle:@"(None)"];
+                    } else if ([enumKey isEqualToString:@"TrackInfo"]) {
+                        [trackInfoButton setTitle:@"(None)"];
+                    } else if ([enumKey isEqualToString:@"UpcomingSongs"]) {
+                        [upcomingSongsButton setTitle:@"(None)"];
+                    } else if ([enumKey isEqualToString:@"IncrementVolume"]) {
+                        [volumeIncrementButton setTitle:@"(None)"];
+                    } else if ([enumKey isEqualToString:@"DecrementVolume"]) {
+                        [volumeDecrementButton setTitle:@"(None)"];
+                    } else if ([enumKey isEqualToString:@"IncrementRating"]) {
+                        [ratingIncrementButton setTitle:@"(None)"];
+                    } else if ([enumKey isEqualToString:@"DecrementRating"]) {
+                        [ratingDecrementButton setTitle:@"(None)"];
+                    } else if ([enumKey isEqualToString:@"ToggleShuffle"]) {
+                        [toggleShuffleButton setTitle:@"(None)"];
+                    } else if ([enumKey isEqualToString:@"ToggleLoop"]) {
+                        [toggleLoopButton setTitle:@"(None)"];
+                    }
+                    ITDebugLog(@"Saved hot key named %@.", enumKey);
+                    [df setObject:[[ITKeyCombo clearKeyCombo] plistRepresentation] forKey:enumKey];
+                    [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:enumKey];
+                } else {
+                    return;
+                }
+                [window setLevel:NSStatusWindowLevel];
+            }
         }
         }
-        playPauseCombo = [combo copy];
-        [playPauseButton setTitle:string];
     }
     }
-    else if ([setHotKey isEqualToString:@"NextTrack"])
-    {
-        if (([combo isEqual:playPauseCombo] || [combo isEqual:prevTrackCombo] ||
-            [combo isEqual:trackInfoCombo] || [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;
-        }
-        nextTrackCombo = [combo copy];
+    
+    ITDebugLog(@"Saved hot key named %@.", currentHotKey);
+    [hotKeysDictionary setObject:combo forKey:currentHotKey];
+    [df setObject:[combo plistRepresentation] forKey:currentHotKey];
+    
+    ITDebugLog(@"Setting button name.");
+    if ([currentHotKey isEqualToString:@"PlayPause"]) {
+        [playPauseButton setTitle:string];
+    } 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 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 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 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];
+    } else if ([currentHotKey isEqualToString:@"IncrementVolume"]) {
+        [volumeIncrementButton setTitle:string];
+    } else if ([currentHotKey isEqualToString:@"DecrementVolume"]) {
+        [volumeDecrementButton setTitle:string];
+    } else if ([currentHotKey isEqualToString:@"IncrementRating"]) {
+        [ratingIncrementButton setTitle:string];
+    } else if ([currentHotKey isEqualToString:@"DecrementRating"]) {
+        [ratingDecrementButton setTitle:string];
+    } else if ([currentHotKey isEqualToString:@"ToggleShuffle"]) {
+        [toggleShuffleButton setTitle:string];
+    } else if ([currentHotKey isEqualToString:@"ToggleLoop"]) {
+        [toggleLoopButton setTitle:string];
     }
     }
+    [controller setupHotKeys];
     [self cancelHotKey:sender];
 }
 
     [self cancelHotKey:sender];
 }
 
-- (IBAction)save:(id)sender
+- (void)deletePressedInTableView:(NSTableView *)tableView
 {
 {
-    [self apply:nil];
-    [window close];
-    [mt closePreferences];
+    if (tableView == menuTableView) {
+        int selRow = [tableView selectedRow];
+        ITDebugLog(@"Delete pressed in menu table view.");
+        if (selRow != - 1) {
+            NSString *object = [myItems objectAtIndex:selRow];
+            
+            if ([object isEqualToString:@"preferences"]) {
+                NSBeep();
+                return;
+            }
+            
+            if (![object isEqualToString:@"separator"])
+                [availableItems addObject:object];
+            ITDebugLog(@"Removing object named %@", object);
+            [myItems removeObjectAtIndex:selRow];
+            [menuTableView reloadData];
+            [allTableView reloadData];
+        }
+        [self changeMenus:self];
+    }
 }
 
 }
 
-- (IBAction)setCurrentTrackInfo:(id)sender
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark HOTKEY SUPPORT METHODS
+/*************************************************************************/
+
+- (void)setCurrentHotKey:(NSString *)key
 {
 {
-    [self setKeyCombo:trackInfoCombo];
-    [self setHotKey:@"TrackInfo"];
+    ITDebugLog(@"Setting current hot key to %@", key);
+    [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];
 }
 
 }
 
-- (IBAction)setNextTrack:(id)sender
+- (void)keyEvent:(NSNotification *)note
 {
 {
-    [self setKeyCombo:nextTrackCombo];
-    [self setHotKey:@"NextTrack"];
+    [self setKeyCombo:[[[note userInfo] objectForKey:@"keyCombo"] copy]];
 }
 
 }
 
-- (IBAction)setPlayPause:(id)sender
+- (void)setKeyCombo:(ITKeyCombo *)newCombo
 {
 {
-    [self setKeyCombo:playPauseCombo];
-    [self setHotKey:@"PlayPause"];
+    NSString *string;
+    [combo release];
+    combo = [newCombo copy];
+    ITDebugLog(@"Setting key combo to %@", newCombo);
+    string = [combo description];
+    if (string == nil) {
+        string = @"(None)";
+    }
+    [keyComboField setStringValue:string];
 }
 
 }
 
-- (IBAction)setPreviousTrack:(id)sender
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark PRIVATE METHOD IMPLEMENTATIONS
+/*************************************************************************/
+
+- (void)setupWindow
 {
 {
-    [self setKeyCombo:prevTrackCombo];
-    [self setHotKey:@"PrevTrack"];
+    ITDebugLog(@"Loading Preferences.nib.");
+    if (![NSBundle loadNibNamed:@"Preferences" owner:self]) {
+        ITDebugLog(@"Failed to load Preferences.nib.");
+        NSBeep();
+        return;
+    }
 }
 
 }
 
-- (IBAction)setUpcomingSongs:(id)sender
+- (void)setupCustomizationTables
 {
 {
-    [self setKeyCombo:upcomingSongsCombo];
-    [self setHotKey:@"UpcomingSongs"];
+    NSImageCell *imgCell = [[[NSImageCell alloc] initImageCell:nil] autorelease];
+    ITDebugLog(@"Setting up table views.");
+    // Set the table view cells up
+    [imgCell setImageScaling:NSScaleNone];
+    [[menuTableView tableColumnWithIdentifier:@"submenu"] setDataCell:imgCell];
+    [[allTableView tableColumnWithIdentifier:@"submenu"] setDataCell:imgCell];
+
+    // Register for drag and drop
+    [menuTableView registerForDraggedTypes:[NSArray arrayWithObjects:
+        @"MenuTableViewPboardType",
+        @"AllTableViewPboardType",
+        nil]];
+    [allTableView registerForDraggedTypes:[NSArray arrayWithObjects:
+        @"MenuTableViewPboardType",
+        @"AllTableViewPboardType",
+        nil]];
 }
 
 }
 
-- (void)setHotKey:(NSString *)key
+- (void)setupMenuItems
 {
 {
-    setHotKey = key;
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyEvent:) name:@"KeyBroadcasterEvent" object:nil];
-    [NSApp beginSheet:keyComboPanel modalForWindow:window modalDelegate:self didEndSelector:nil contextInfo:nil];
+    NSEnumerator *itemEnum;
+    id            anItem;
+    ITDebugLog(@"Setting up table view arrays.");
+    // Set the list of items you can have.
+    availableItems = [[NSMutableArray alloc] initWithObjects:
+        @"separator",
+        @"trackInfo",
+        @"upcomingSongs",
+        @"playlists",
+        @"eqPresets",
+        @"songRating",
+        @"playPause",
+        @"nextTrack",
+        @"prevTrack",
+        @"fastForward",
+        @"rewind",
+        @"showPlayer",
+        @"quit",
+        nil];
+    
+    // Get our preferred menu
+    myItems = [[df arrayForKey:@"menu"] mutableCopy];
+    
+    // Delete items in the availableItems array that are already part of the menu
+    itemEnum = [myItems objectEnumerator];
+    while ( (anItem = [itemEnum nextObject]) ) {
+        if (![anItem isEqualToString:@"separator"]) {
+            [availableItems removeObject:anItem];
+        }
+    }
+    
+    // Items that show should a submenu image
+    submenuItems = [[NSArray alloc] initWithObjects:
+        @"upcomingSongs",
+        @"playlists",
+        @"eqPresets",
+        @"songRating",
+        nil];
 }
 
 }
 
-- (void)keyEvent:(NSNotification *)note
+- (void)setupUI
 {
 {
-    NSDictionary *info = [note userInfo];
-    short keyCode;
-    long modifiers;
-    KeyCombo *newCombo;
+    NSMutableDictionary *loginwindow;
+    NSMutableArray *loginarray;
+    NSEnumerator *loginEnum;
+    id anItem;
+    ITDebugLog(@"Setting up preferences UI.");
+    // 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"]) {
+        ITDebugLog(@"Setting up \"PlayPause\" hot key.");
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PlayPause"]];
+        [hotKeysDictionary setObject:anItem forKey:@"PlayPause"];
+        [playPauseButton setTitle:[anItem description]];
+    } else {
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"PlayPause"];
+        [playPauseButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
+    }
+    
+    if ([df objectForKey:@"NextTrack"]) {
+        ITDebugLog(@"Setting up \"NextTrack\" hot key.");
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"NextTrack"]];
+        [hotKeysDictionary setObject:anItem forKey:@"NextTrack"];
+        [nextTrackButton setTitle:[anItem description]];
+    } else {
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"NextTrack"];
+        [nextTrackButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
+    }
+    
+    if ([df objectForKey:@"PrevTrack"]) {
+        ITDebugLog(@"Setting up \"PrevTrack\" hot key.");
+        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"]) {
+        ITDebugLog(@"Setting up \"ShowPlayer\" hot key.");
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ShowPlayer"]];
+        [hotKeysDictionary setObject:anItem forKey:@"ShowPlayer"];
+        [showPlayerButton setTitle:[anItem description]];
+    } else {
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"ShowPlayer"];
+        [showPlayerButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
+    }
+    
+    if ([df objectForKey:@"TrackInfo"]) {
+        ITDebugLog(@"Setting up \"TrackInfo\" hot key.");
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"TrackInfo"]];
+        [hotKeysDictionary setObject:anItem forKey:@"TrackInfo"];
+        [trackInfoButton setTitle:[anItem description]];
+    } else {
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"TrackInfo"];
+        [trackInfoButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
+    }
+    
+    if ([df objectForKey:@"UpcomingSongs"]) {
+        ITDebugLog(@"Setting up \"UpcomingSongs\" hot key.");
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"UpcomingSongs"]];
+        [hotKeysDictionary setObject:anItem forKey:@"UpcomingSongs"];
+        [upcomingSongsButton setTitle:[anItem description]];
+    } else {
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"UpcomingSongs"];
+        [upcomingSongsButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
+    }
+    
+    if ([df objectForKey:@"IncrementVolume"]) {
+        ITDebugLog(@"Setting up \"IncrementVolume\" hot key.");
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"IncrementVolume"]];
+        [hotKeysDictionary setObject:anItem forKey:@"IncrementVolume"];
+        [volumeIncrementButton setTitle:[anItem description]];
+    } else {
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"IncrementVolume"];
+        [volumeIncrementButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
+    }
+    
+    if ([df objectForKey:@"DecrementVolume"]) {
+        ITDebugLog(@"Setting up \"DecrementVolume\" hot key.");
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"DecrementVolume"]];
+        [hotKeysDictionary setObject:anItem forKey:@"DecrementVolume"];
+        [volumeDecrementButton setTitle:[anItem description]];
+    } else {
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"DecrementVolume"];
+        [volumeDecrementButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
+    }
+    
+    if ([df objectForKey:@"IncrementRating"]) {
+        ITDebugLog(@"Setting up \"IncrementRating\" hot key.");
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"IncrementRating"]];
+        [hotKeysDictionary setObject:anItem forKey:@"IncrementRating"];
+        [ratingIncrementButton setTitle:[anItem description]];
+    } else {
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"IncrementRating"];
+        [ratingIncrementButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
+    }
+    
+    if ([df objectForKey:@"DecrementRating"]) {
+        ITDebugLog(@"Setting up \"DecrementRating\" hot key.");
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"DecrementRating"]];
+        [hotKeysDictionary setObject:anItem forKey:@"DecrementRating"];
+        [ratingDecrementButton setTitle:[anItem description]];
+    } else {
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"DecrementRating"];
+        [ratingDecrementButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
+    }
+    
+    if ([df objectForKey:@"ToggleLoop"]) {
+        ITDebugLog(@"Setting up \"ToggleLoop\" hot key.");
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleLoop"]];
+        [hotKeysDictionary setObject:anItem forKey:@"ToggleLoop"];
+        [toggleLoopButton setTitle:[anItem description]];
+    } else {
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"ToggleLoop"];
+        [toggleLoopButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
+    }
+    
+    if ([df objectForKey:@"ToggleShuffle"]) {
+        ITDebugLog(@"Setting up \"ToggleShuffle\" hot key.");
+        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleShuffle"]];
+        [hotKeysDictionary setObject:anItem forKey:@"ToggleShuffle"];
+        [toggleShuffleButton setTitle:[anItem description]];
+    } else {
+        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"ToggleShuffle"];
+        [toggleShuffleButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
+    }
+    
+    ITDebugLog(@"Setting up track info checkboxes.");
+    // Check current track info buttons
+    [albumCheckbox setState:[df boolForKey:@"showAlbum"] ? NSOnState : NSOffState];
+    [nameCheckbox setState:NSOnState];  // Song info will ALWAYS show song title.
+    [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];
+    [ratingCheckbox setState:[df boolForKey:@"showTrackRating"] ? NSOnState : NSOffState];
     
     
-    keyCode = [[info objectForKey:@"KeyCode"] shortValue];
-    modifiers = [[info objectForKey:@"Modifiers"] longValue];
+    // Set the launch at login checkbox state
+    ITDebugLog(@"Setting launch at login state.");
+    [df synchronize];
+    loginwindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy];
+    loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
     
     
-    newCombo = [[KeyCombo alloc] initWithKeyCode:keyCode andModifiers:modifiers];
-    [self setKeyCombo:newCombo];
+    loginEnum = [loginarray objectEnumerator];
+    while ( (anItem = [loginEnum nextObject]) ) {
+        if ([[[anItem objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]]) {
+            [launchAtLoginCheckbox setState:NSOnState];
+        }
+    }
+    
+    // Set the launch player checkbox state
+    ITDebugLog(@"Setting launch player with MenuTunes state.");
+    [launchPlayerAtLaunchCheckbox setState:[df boolForKey:@"LaunchPlayerWithMT"] ? NSOnState : NSOffState];
+    
+    // Setup the positioning controls
+    
+    // Setup effects controls
+    [appearanceEffectPopup selectItem:[appearanceEffectPopup itemAtIndex:[appearanceEffectPopup indexOfItemWithTag:[df integerForKey:@"statusWindowAppearanceEffect"]]]];
+    [vanishEffectPopup     selectItem:[vanishEffectPopup     itemAtIndex:[vanishEffectPopup     indexOfItemWithTag:[df integerForKey:@"statusWindowVanishEffect"]]]];
+    [appearanceSpeedSlider setFloatValue:-([df floatForKey:@"statusWindowAppearanceSpeed"])];
+    [vanishSpeedSlider     setFloatValue:-([df floatForKey:@"statusWindowVanishSpeed"])];
+    [vanishDelaySlider     setFloatValue:[df floatForKey:@"statusWindowVanishDelay"]];
+    [showOnChangeCheckbox  setState:([df boolForKey:@"showSongInfoOnChange"] ? NSOnState : NSOffState)];
 }
 
 }
 
-- (void)setKeyCombo:(KeyCombo *)newCombo
+- (IBAction)changeMenus:(id)sender
 {
 {
-    NSString *string;
-    [combo release];
-    combo = [newCombo copy];
+    ITDebugLog(@"Synchronizing menus");
+    [df setObject:myItems forKey:@"menu"];
+    [df synchronize];
+}
+
+- (void)setLaunchesAtLogin:(BOOL)flag
+{
+    NSMutableDictionary *loginwindow;
+    NSMutableArray *loginarray;
+    ITDebugLog(@"Setting launches at login: %i", flag);
+    [df synchronize];
+    loginwindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy];
+    loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
     
     
-    string = [combo userDisplayRep];
-    if (string == nil)
-    {
-        string = @"";
+    if (flag) {
+        NSDictionary *itemDict = [NSDictionary dictionaryWithObjectsAndKeys:
+        [[NSBundle mainBundle] bundlePath], @"Path",
+        [NSNumber numberWithInt:0], @"Hide", nil];
+        [loginarray addObject:itemDict];
+    } else {
+        int 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];
+                break;
+            }
+        }
     }
     }
-    [keyComboField setStringValue:string];
+    [df setPersistentDomain:loginwindow forName:@"loginwindow"];
+    [df synchronize];
+    [loginwindow release];
+    ITDebugLog(@"Finished setting launches at login.");
 }
 
 }
 
-//
-//
-// Table View Datasource Methods
-//
-//
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark NSWindow DELEGATE METHODS
+/*************************************************************************/
+
+- (void)windowWillClose:(NSNotification *)note
+{
+    [(MainController *)controller closePreferences]; 
+}
+
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark NSTableView DATASOURCE METHODS
+/*************************************************************************/
 
 - (int)numberOfRowsInTableView:(NSTableView *)aTableView
 {
 
 - (int)numberOfRowsInTableView:(NSTableView *)aTableView
 {
-    if (aTableView == menuTableView)
-    {
+    if (aTableView == menuTableView) {
         return [myItems count];
         return [myItems count];
-    }
-    else
-    {
+    } else {
         return [availableItems count];
     }
 }
 
 - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex
 {
         return [availableItems count];
     }
 }
 
 - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex
 {
-    if (aTableView == menuTableView)
-    {
-        if ([[aTableColumn identifier] isEqualToString:@"name"])
-        {
-            return [myItems objectAtIndex:rowIndex];
-        }
-        else
-        {
-            if ([submenuItems containsObject:[myItems objectAtIndex:rowIndex]])
-            {
-                return [NSImage imageNamed:@"submenu"];
+    if (aTableView == menuTableView) {
+        NSString *object = [myItems objectAtIndex:rowIndex];
+        if ([[aTableColumn identifier] isEqualToString:@"name"]) {
+            if ([object isEqualToString:@"showPlayer"]) {
+                return [NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"show", @"Show"), [[controller currentRemote] playerSimpleName]];
             }
             }
-            else
+            return NSLocalizedString(object, @"ERROR");
+        } else {
+            if ([submenuItems containsObject:object])
             {
             {
+                return [NSImage imageNamed:@"submenu"];
+            } else {
                 return nil;
             }
         }
                 return nil;
             }
         }
-    }
-    else
-    {
-        if ([[aTableColumn identifier] isEqualToString:@"name"])
-        {
-            return [availableItems objectAtIndex:rowIndex];
-        }
-        else
-        {
-            if ([submenuItems containsObject:[availableItems objectAtIndex:rowIndex]])
-            {
-                return [NSImage imageNamed:@"submenu"];
+    } else {
+        NSString *object = [availableItems objectAtIndex:rowIndex];
+        if ([[aTableColumn identifier] isEqualToString:@"name"]) {
+            if ([object isEqualToString:@"showPlayer"]) {
+                return [NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"show", @"Show"), [[controller currentRemote] playerSimpleName]];
             }
             }
-            else
-            {
+            return NSLocalizedString(object, @"ERROR");
+        } else {
+            if ([submenuItems containsObject:object]) {
+                return [NSImage imageNamed:@"submenu"];
+            } else {
                 return nil;
             }
         }
                 return nil;
             }
         }
@@ -525,15 +840,13 @@
 
 - (BOOL)tableView:(NSTableView *)tableView writeRows:(NSArray*)rows toPasteboard:(NSPasteboard*)pboard
 {
 
 - (BOOL)tableView:(NSTableView *)tableView writeRows:(NSArray*)rows toPasteboard:(NSPasteboard*)pboard
 {
-    if (tableView == menuTableView)
-    {
+    if (tableView == menuTableView) {
         [pboard declareTypes:[NSArray arrayWithObjects:@"MenuTableViewPboardType", nil] owner:self];
         [pboard setString:[[rows objectAtIndex:0] stringValue] forType:@"MenuTableViewPboardType"];
         return YES;
     }
     
         [pboard declareTypes:[NSArray arrayWithObjects:@"MenuTableViewPboardType", nil] owner:self];
         [pboard setString:[[rows objectAtIndex:0] stringValue] forType:@"MenuTableViewPboardType"];
         return YES;
     }
     
-    if (tableView == allTableView)
-    {
+    if (tableView == allTableView) {
         [pboard declareTypes:[NSArray arrayWithObjects:@"AllTableViewPboardType", nil] owner:self];
         [pboard setString:[[rows objectAtIndex:0] stringValue] forType:@"AllTableViewPboardType"];
         return YES;
         [pboard declareTypes:[NSArray arrayWithObjects:@"AllTableViewPboardType", nil] owner:self];
         [pboard setString:[[rows objectAtIndex:0] stringValue] forType:@"AllTableViewPboardType"];
         return YES;
@@ -549,64 +862,52 @@
     
     pb = [info draggingPasteboard];
     
     
     pb = [info draggingPasteboard];
     
-    if ([[pb types] containsObject:@"MenuTableViewPboardType"])
-    {
+    if ([[pb types] containsObject:@"MenuTableViewPboardType"]) {
         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 (row > dragRow)
-            {
-                [myItems insertObject:temp atIndex:row - 1];
-            }
-            else
-            {
-                [myItems insertObject:temp atIndex:row];
+        if (tableView == menuTableView) {
+            [myItems insertObject:temp atIndex:row];
+            if (row > dragRow) {
+                [myItems removeObjectAtIndex:dragRow];
+            } else {
+                [myItems removeObjectAtIndex:dragRow + 1];
             }
             }
-        }
-        else
-        {
-            if (![temp isEqualToString:@"<separator>"])
-            {
+        } else {
+            if (![temp isEqualToString:@"separator"]) {
                 [availableItems addObject:temp];
             }
                 [availableItems addObject:temp];
             }
+            [myItems removeObjectAtIndex:dragRow];
         }
         }
-    }
-    else if ([[pb types] containsObject:@"AllTableViewPboardType"])
-    {
+    } else if ([[pb types] containsObject:@"AllTableViewPboardType"]) {
         dragData = [pb stringForType:@"AllTableViewPboardType"];
         dragRow = [dragData intValue];
         temp = [availableItems objectAtIndex:dragRow];
         
         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];
     [allTableView reloadData];
     }
     
     [menuTableView reloadData];
     [allTableView reloadData];
+    [self changeMenus:self];
     return YES;
 }
 
 - (NSDragOperation)tableView:(NSTableView*)tableView validateDrop:(id <NSDraggingInfo>)info proposedRow:(int)row proposedDropOperation:(NSTableViewDropOperation)operation
 {
     return YES;
 }
 
 - (NSDragOperation)tableView:(NSTableView*)tableView validateDrop:(id <NSDraggingInfo>)info proposedRow:(int)row proposedDropOperation:(NSTableViewDropOperation)operation
 {
-    if (tableView == allTableView)
-    {
-        if ([[[info draggingPasteboard] types] containsObject:@"AllTableViewPboardType"])
-        {
+    if (tableView == allTableView) {
+        if ([[[info draggingPasteboard] types] containsObject:@"AllTableViewPboardType"]) {
             return NSDragOperationNone;
         }
         
             return NSDragOperationNone;
         }
         
-        if ([[[info draggingPasteboard] types] containsObject:@"MenuTableViewPboardType"])
-        {
+        if ([[[info draggingPasteboard] types] containsObject:@"MenuTableViewPboardType"]) {
             NSString *item = [myItems objectAtIndex:[[[info draggingPasteboard] stringForType:@"MenuTableViewPboardType"] intValue]];
             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;
             }
         }
@@ -623,4 +924,25 @@
     return NSDragOperationGeneric;
 }
 
     return NSDragOperationGeneric;
 }
 
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark DEALLOCATION METHODS
+/*************************************************************************/
+
+- (void)dealloc
+{
+    [self setKeyCombo:nil];
+    [hotKeysDictionary release];
+    [keyComboPanel release];
+    [menuTableView setDataSource:nil];
+    [allTableView setDataSource:nil];
+    [controller release];
+    [availableItems release];
+    [submenuItems release];
+    [myItems release];
+    [df release];
+}
+
+
 @end
 @end
Menu-based iTunes controller.