X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/ea3dc416d45e5e72dc83a757a2031a2a763bbe51..5b0ebb88485736909eeb1072739ad42af1529cd7:/PreferencesController.m?ds=inline

diff --git a/PreferencesController.m b/PreferencesController.m
index b4cba9e..af1838b 100755
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -1,226 +1,276 @@
 #import "PreferencesController.h"
-#import "MenuTunes.h"
+#import "MainController.h"
 #import "HotKeyCenter.h"
+#import <ITKit/ITWindowPositioning.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
 
-- (id)initWithMenuTunes:(MenuTunes *)tunes;
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark STATIC VARIABLES
+/*************************************************************************/
+
+static PreferencesController *prefs = nil;
+
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark INITIALIZATION METHODS
+/*************************************************************************/
+
++ (PreferencesController *)sharedPrefs;
+{
+    if (! prefs) {
+        prefs = [[self alloc] init];
+    }
+    return prefs;
+}
+
+- (id)init
 {
     if ( (self = [super init]) ) {
-        int i;
-        NSImageCell *imgCell = [[[NSImageCell alloc] init] autorelease];
-        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-        
-        mt = [tunes retain];
-        [mt registerDefaultsIfNeeded];
-        
-        //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];
-        
-        //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
-        [songsInAdvance setIntValue:[defaults integerForKey:@"SongsInAdvance"]];
-        
-        //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
-        [albumCheckbox setState:[defaults boolForKey:@"showAlbum"] ? NSOnState : NSOffState];
-        [nameCheckbox setState:[defaults boolForKey:@"showName"] ? NSOnState : 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];
-                if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]]) {
-                    [launchAtLoginCheckbox setState:NSOnState];
-                }
-            }
-        }
+        df = [[NSUserDefaults standardUserDefaults] retain];
+        controller = nil;
     }
     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"];
+    [controller autorelease];
+    controller = [object retain];
+}
+
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark INSTANCE METHODS
+/*************************************************************************/
+
+- (IBAction)showPrefsWindow:(id)sender
+{
+    if (! window) {  // If window does not exist yet, then the nib hasn't been loaded.
+        [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];
+    }
     
-    //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"];
+    [window setLevel:NSStatusWindowLevel];
+    [window center];
+    [window makeKeyAndOrderFront:self];
+    [NSApp activateIgnoringOtherApps:YES];
+}
+
+- (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"];
+        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"];
+        // rebuildRequired = YES;
+    } else if ( [sender tag] == 1050) {
+        [df setBool:SENDER_STATE forKey:@"showArtist"];
+        rebuildRequired = YES;
+    } else if ( [sender tag] == 1060) {
+        [df setBool:SENDER_STATE forKey:@"showAlbum"];
+        rebuildRequired = YES;
+    } else if ( [sender tag] == 1070) {
+        [df setBool:SENDER_STATE forKey:@"showTime"];
+        rebuildRequired = YES;
+    } else if ( [sender tag] == 1080) {
+        [df setBool:SENDER_STATE forKey:@"showTrackNumber"];
+        rebuildRequired = YES;
+    } 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];
+}
+
+- (IBAction)changeStatusWindowSetting:(id)sender
+{
+    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) {
+        // Update appearance effect
+    } else if ( [sender tag] == 2040) {
+        // Update Vanish Effect
+    } else if ( [sender tag] == 2050) {
+        // Update appearance speed
+    } else if ( [sender tag] == 2060) {
+        // Update vanish speed
+    } else if ( [sender tag] == 2070) {
+        // Update vanish delay
+    } else if ( [sender tag] == 2080) {
+        // Update "Song Info window when song changes" setting.
+    }
+}
+
+- (IBAction)changeHotKey:(id)sender
+{
+    switch ([sender tag])
+    {
+        case 4010:
+            [self setKeyCombo:playPauseCombo];
+            [self setHotKey:@"PlayPause"];
+            break;
+        case 4020:
+            [self setKeyCombo:nextTrackCombo];
+            [self setHotKey:@"NextTrack"];
+            break;
+        case 4030:
+            [self setKeyCombo:prevTrackCombo];
+            [self setHotKey:@"PrevTrack"];
+            break;
+        case 4040:
+            [self setKeyCombo:toggleLoopCombo];
+            [self setHotKey:@"ToggleLoop"];
+            break;
+        case 4050:
+            [self setKeyCombo:toggleShuffleCombo];
+            [self setHotKey:@"ToggleShuffle"];
+            break;
+        case 4060:
+            [self setKeyCombo:trackInfoCombo];
+            [self setHotKey:@"TrackInfo"];
+            break;
+        case 4070:
+            [self setKeyCombo:upcomingSongsCombo];
+            [self setHotKey:@"UpcomingSongs"];
+            break;
+        case 4080:
+            [self setKeyCombo:volumeIncrementCombo];
+            [self setHotKey:@"IncrementVolume"];
+            break;
+        case 4090:
+            [self setKeyCombo:volumeDecrementCombo];
+            [self setHotKey:@"DecrementVolume"];
+            break;
+        case 4100:
+            [self setKeyCombo:ratingIncrementCombo];
+            [self setHotKey:@"IncrementRating"];
+            break;
+        case 4110:
+            [self setKeyCombo:ratingDecrementCombo];
+            [self setHotKey:@"DecrementRating"];
+            break;
+    }
+}
+
+- (void)registerDefaults
+{
+    BOOL found = NO;
+    NSMutableDictionary *loginWindow;
+    NSMutableArray *loginArray;
+    NSEnumerator *loginEnum;
+    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",
+        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 synchronize];
     
-    //Here we set whether we will launch at login by modifying loginwindow.plist
-    if ([launchAtLoginCheckbox state] == NSOnState) {
-        NSMutableDictionary *loginwindow;
-        NSMutableArray *loginarray;
-        ComponentInstance temp = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);;
-        int i;
-        BOOL skip = NO;
-        
-        [defaults synchronize];
-        loginwindow = [[defaults persistentDomainForName:@"loginwindow"] mutableCopy];
-        loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
-        
-        for (i = 0; i < [loginarray count]; i++) {
-            NSDictionary *tempDict = [loginarray objectAtIndex:i];
-            if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]]) {
-                skip = YES;
-            }
+    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;
         }
-        
-        if (!skip) {
+    }
+
+    [loginWindow release];
+    
+    // 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) {
             AEDesc scriptDesc, resultDesc;
             NSString *script = [NSString stringWithFormat:@"tell application \"System Events\"\nmake new login item at end of login items with properties {path:\"%@\", kind:\"APPLICATION\"}\nend tell", [[NSBundle mainBundle] bundlePath]];
-            
-            AECreateDesc(typeChar, [script cString], [script cStringLength], 
-        &scriptDesc);
-            
-            OSADoScript(temp, &scriptDesc, kOSANullScript, typeChar, kOSAModeCanInteract, &resultDesc);
-            
+            ComponentInstance asComponent = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);
+
+            AECreateDesc(typeChar, [script cString], [script cStringLength],
+                         &scriptDesc);
+
+            OSADoScript(asComponent, &scriptDesc, kOSANullScript, typeChar, kOSAModeCanInteract, &resultDesc);
+
             AEDisposeDesc(&scriptDesc);
             AEDisposeDesc(&resultDesc);
-            CloseComponent(temp);
-        }
-    } else {
-        NSMutableDictionary *loginwindow;
-        NSMutableArray *loginarray;
-        int i;
-        
-        [[NSUserDefaults standardUserDefaults] synchronize];
-        loginwindow = [[[NSUserDefaults standardUserDefaults] persistentDomainForName:@"loginwindow"] mutableCopy];
-        loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
-        
-        for (i = 0; i < [loginarray count]; i++) {
-            NSDictionary *tempDict = [loginarray objectAtIndex:i];
-            if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]]) {
-                [loginarray removeObjectAtIndex:i];
-                [defaults setPersistentDomain:loginwindow forName:@"loginwindow"];
-                [defaults synchronize];
-                break;
-            }
+
+            CloseComponent(asComponent);
         }
     }
-    
-    //Set songs in advance
-    if ([songsInAdvance intValue]) {
-        [defaults setInteger:[songsInAdvance intValue] forKey:@"SongsInAdvance"];
-    } else {
-        [defaults setInteger:5 forKey:@"SongsInAdvance"];
-    }
-    
-    psn = [mt iTunesPSN];
-    if (!((psn.highLongOfPSN == kNoProcess) && (psn.lowLongOfPSN == 0))) {
-        [mt rebuildMenu];
-    }
-    [mt clearHotKeys];
-}
-
-- (IBAction)cancel:(id)sender
-{
-    [window close];
-    [mt closePreferences];
 }
 
 - (IBAction)cancelHotKey:(id)sender
@@ -237,22 +287,17 @@
 
 - (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;
-    }
-    
-    string = [combo userDisplayRep];
+    NSString *string = [combo userDisplayRep];
     
     if (string == nil) {
-        string = @"None";
+        string = @"";
     }
     if ([setHotKey isEqualToString:@"PlayPause"]) {
         if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] ||
-            [combo isEqual:trackInfoCombo] || [combo isEqual:upcomingSongsCombo]) &&
+            [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];
@@ -262,11 +307,12 @@
         }
         playPauseCombo = [combo copy];
         [playPauseButton setTitle:string];
-    }
-    else if ([setHotKey isEqualToString:@"NextTrack"])
-    {
+    } else if ([setHotKey isEqualToString:@"NextTrack"]) {
         if (([combo isEqual:playPauseCombo] || [combo isEqual:prevTrackCombo] ||
-            [combo isEqual:trackInfoCombo] || [combo isEqual:upcomingSongsCombo]) && 
+            [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];
@@ -276,11 +322,12 @@
         }
         nextTrackCombo = [combo copy];
         [nextTrackButton setTitle:string];
-    }
-    else if ([setHotKey isEqualToString:@"PrevTrack"])
-    {
+    } else if ([setHotKey isEqualToString:@"PrevTrack"]) {
         if (([combo isEqual:nextTrackCombo] || [combo isEqual:playPauseCombo] ||
-            [combo isEqual:trackInfoCombo] || [combo isEqual:upcomingSongsCombo]) && 
+            [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];
@@ -290,11 +337,12 @@
         }
         prevTrackCombo = [combo copy];
         [previousTrackButton setTitle:string];
-    }
-    else if ([setHotKey isEqualToString:@"TrackInfo"])
-    {
+    } else if ([setHotKey isEqualToString:@"TrackInfo"]) {
         if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] ||
-            [combo isEqual:playPauseCombo] || [combo isEqual:upcomingSongsCombo]) && 
+            [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];
@@ -304,11 +352,12 @@
         }
         trackInfoCombo = [combo copy];
         [trackInfoButton setTitle:string];
-    }
-    else if ([setHotKey isEqualToString:@"UpcomingSongs"])
-    {
+    } else if ([setHotKey isEqualToString:@"UpcomingSongs"]) {
         if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] ||
-            [combo isEqual:trackInfoCombo] || [combo isEqual:playPauseCombo]) && 
+            [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];
@@ -318,46 +367,107 @@
         }
         upcomingSongsCombo = [combo copy];
         [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];
+        [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];
+        [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];
+        [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];
+        [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];
+        [toggleShuffleButton setTitle:string];
     }
     [self cancelHotKey:sender];
 }
 
-- (IBAction)save:(id)sender
-{
-    [self apply:nil];
-    [window close];
-    [mt closePreferences];
-}
-
-- (IBAction)setCurrentTrackInfo:(id)sender
-{
-    [self setKeyCombo:trackInfoCombo];
-    [self setHotKey:@"TrackInfo"];
-}
-
-- (IBAction)setNextTrack:(id)sender
-{
-    [self setKeyCombo:nextTrackCombo];
-    [self setHotKey:@"NextTrack"];
-}
-
-- (IBAction)setPlayPause:(id)sender
-{
-    [self setKeyCombo:playPauseCombo];
-    [self setHotKey:@"PlayPause"];
-}
 
-- (IBAction)setPreviousTrack:(id)sender
-{
-    [self setKeyCombo:prevTrackCombo];
-    [self setHotKey:@"PrevTrack"];
-}
 
-- (IBAction)setUpcomingSongs:(id)sender
-{
-    [self setKeyCombo:upcomingSongsCombo];
-    [self setHotKey:@"UpcomingSongs"];
-}
+/*************************************************************************/
+#pragma mark -
+#pragma mark HOTKEY SUPPORT METHODS
+/*************************************************************************/
 
 - (void)setHotKey:(NSString *)key
 {
@@ -393,11 +503,267 @@
     [keyComboField setStringValue:string];
 }
 
-//
-//
-// Table View Datasource Methods
-//
-//
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark PRIVATE METHOD IMPLEMENTATIONS
+/*************************************************************************/
+
+- (void)setupWindow
+{
+    if ( ! [NSBundle loadNibNamed:@"Preferences" owner:self] ) {
+        NSLog( @"Failed to load Preferences.nib" );
+        NSBeep();
+        return;
+    }
+}
+
+- (void)setupCustomizationTables
+{
+    NSImageCell *imgCell = [[[NSImageCell alloc] initImageCell:nil] autorelease];
+    
+    // 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)setupMenuItems
+{
+    NSEnumerator *itemEnum;
+    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>",
+        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:
+        @"Upcoming Songs",
+        @"Playlists",
+        @"EQ Presets",
+        @"Song Rating",
+        nil];
+}
+
+- (void)setupUI
+{
+    NSMutableDictionary *loginwindow;
+    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
+    if ([df objectForKey:@"PlayPause"]){
+        playPauseCombo = [df keyComboForKey:@"PlayPause"];
+        [playPauseButton setTitle:[playPauseCombo userDisplayRep]];
+    } else {
+        playPauseCombo = [[KeyCombo alloc] init];
+    }
+    
+    if ([df objectForKey:@"NextTrack"]) {
+        nextTrackCombo = [df keyComboForKey:@"NextTrack"];
+        [nextTrackButton setTitle:[nextTrackCombo userDisplayRep]];
+    } else {
+        nextTrackCombo = [[KeyCombo alloc] init];
+    }
+    
+    if ([df objectForKey:@"PrevTrack"]) {
+        prevTrackCombo = [df keyComboForKey:@"PrevTrack"];
+        [previousTrackButton setTitle:[prevTrackCombo userDisplayRep]];
+    } else {
+        prevTrackCombo = [[KeyCombo alloc] init];
+    }
+    
+    if ([df objectForKey:@"TrackInfo"]) {
+        trackInfoCombo = [df keyComboForKey:@"TrackInfo"];
+        [trackInfoButton setTitle:[trackInfoCombo userDisplayRep]];
+    } else {
+        trackInfoCombo = [[KeyCombo alloc] init];
+    }
+    
+    if ([df objectForKey:@"UpcomingSongs"]) {
+        upcomingSongsCombo = [df keyComboForKey:@"UpcomingSongs"];
+        [upcomingSongsButton setTitle:[upcomingSongsCombo userDisplayRep]];
+    } else {
+        upcomingSongsCombo = [[KeyCombo alloc] init];
+    }
+    
+    if ([df objectForKey:@"IncrementVolume"]) {
+        volumeIncrementCombo = [df keyComboForKey:@"IncrementVolume"];
+        [volumeIncrementButton setTitle:[volumeIncrementCombo userDisplayRep]];
+    } else {
+        volumeIncrementCombo = [[KeyCombo alloc] init];
+    }
+    
+    if ([df objectForKey:@"DecrementVolume"]) {
+        volumeDecrementCombo = [df keyComboForKey:@"DecrementVolume"];
+        [volumeDecrementButton setTitle:[volumeDecrementCombo userDisplayRep]];
+    } else {
+        volumeDecrementCombo = [[KeyCombo alloc] init];
+    }
+    
+    if ([df objectForKey:@"IncrementRating"]) {
+        ratingIncrementCombo = [df keyComboForKey:@"IncrementRating"];
+        [ratingIncrementButton setTitle:[ratingIncrementCombo userDisplayRep]];
+    } else {
+        ratingIncrementCombo = [[KeyCombo alloc] init];
+    }
+    
+    if ([df objectForKey:@"DecrementRating"]) {
+        ratingDecrementCombo = [df keyComboForKey:@"DecrementRating"];
+        [ratingDecrementButton setTitle:[ratingDecrementCombo userDisplayRep]];
+    } else {
+        ratingDecrementCombo = [[KeyCombo alloc] init];
+    }
+    
+    if ([df objectForKey:@"ToggleLoop"]) {
+        toggleLoopCombo = [df keyComboForKey:@"ToggleLoop"];
+        [toggleLoopButton setTitle:[toggleLoopCombo userDisplayRep]];
+    } else {
+        toggleLoopCombo = [[KeyCombo alloc] init];
+    }
+    
+    if ([df objectForKey:@"ToggleShuffle"]) {
+        toggleShuffleCombo = [df keyComboForKey:@"ToggleShuffle"];
+        [toggleShuffleButton setTitle:[toggleShuffleCombo userDisplayRep]];
+    } else {
+        toggleShuffleCombo = [[KeyCombo alloc] init];
+    }
+    
+    // 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];
+    
+    // Set the launch at login checkbox state
+    [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]]) {
+            [launchAtLoginCheckbox setState:NSOnState];
+        }
+    }
+}
+
+- (IBAction)changeMenus:(id)sender
+{
+    [df setObject:myItems forKey:@"menu"];
+    [df synchronize];
+    [controller rebuildMenu];
+}
+
+- (void)setLaunchesAtLogin:(BOOL)flag
+{
+    if ( flag ) {
+        NSMutableDictionary *loginwindow;
+        NSMutableArray *loginarray;
+        ComponentInstance temp = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);;
+        int i;
+        BOOL skip = NO;
+
+        [df synchronize];
+        loginwindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy];
+        loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
+
+        for (i = 0; i < [loginarray count]; i++) {
+            NSDictionary *tempDict = [loginarray objectAtIndex:i];
+            if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]]) {
+                skip = YES;
+            }
+        }
+
+        if (!skip) {
+            AEDesc scriptDesc, resultDesc;
+            NSString *script = [NSString stringWithFormat:@"tell application \"System Events\"\nmake new login item at end of login items with properties {path:\"%@\", kind:\"APPLICATION\"}\nend tell", [[NSBundle mainBundle] bundlePath]];
+
+            AECreateDesc(typeChar, [script cString], [script cStringLength],
+                         &scriptDesc);
+
+            OSADoScript(temp, &scriptDesc, kOSANullScript, typeChar, kOSAModeCanInteract, &resultDesc);
+
+            AEDisposeDesc(&scriptDesc);
+            AEDisposeDesc(&resultDesc);
+            CloseComponent(temp);
+        }
+
+    } else {
+        NSMutableDictionary *loginwindow;
+        NSMutableArray *loginarray;
+        int i;
+
+        [df synchronize];
+        loginwindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy];
+        loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
+
+        for (i = 0; i < [loginarray count]; i++) {
+            NSDictionary *tempDict = [loginarray objectAtIndex:i];
+            if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]]) {
+                [loginarray removeObjectAtIndex:i];
+                [df setPersistentDomain:loginwindow forName:@"loginwindow"];
+                [df synchronize];
+                break;
+            }
+        }
+    }
+}
+
+
+/*************************************************************************/
+#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
 {
@@ -412,7 +778,11 @@
 {
     if (aTableView == menuTableView) {
         if ([[aTableColumn identifier] isEqualToString:@"name"]) {
-            return [myItems objectAtIndex:rowIndex];
+            NSString *object = [myItems objectAtIndex:rowIndex];
+            if ([object isEqualToString:@"Show Player"]) {
+                return [NSString stringWithFormat:@"Show %@", [[controller currentRemote] playerSimpleName]];
+            }
+            return object;
         } else {
             if ([submenuItems containsObject:[myItems objectAtIndex:rowIndex]])
             {
@@ -488,6 +858,7 @@
     
     [menuTableView reloadData];
     [allTableView reloadData];
+    [self changeMenus:self];
     return YES;
 }
 
@@ -517,4 +888,29 @@
     return NSDragOperationGeneric;
 }
 
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark DEALLOCATION METHODS
+/*************************************************************************/
+
+- (void)dealloc
+{
+    [self setKeyCombo:nil];
+    [playPauseCombo release];
+    [nextTrackCombo release];
+    [prevTrackCombo release];
+    [trackInfoCombo release];
+    [upcomingSongsCombo release];
+    [keyComboPanel release];
+    [menuTableView setDataSource:nil];
+    [allTableView setDataSource:nil];
+    [controller release];
+    [availableItems release];
+    [submenuItems release];
+    [myItems release];
+    [df release];
+}
+
+
 @end