Added localizability. Gotta delete you prefs for it to work. Some
[MenuTunes.git] / PreferencesController.m
index 113f883..e1c47d1 100755 (executable)
@@ -1,6 +1,9 @@
 #import "PreferencesController.h"
-#import "MainController.h"
+#import "NewMainController.h"
 #import "HotKeyCenter.h"
+#import <ITKit/ITWindowPositioning.h>
+
+#define SENDER_STATE (([sender state] == NSOnState) ? YES : NO)
 
 /*************************************************************************/
 #pragma mark -
@@ -12,6 +15,8 @@
 - (void)setupCustomizationTables;
 - (void)setupMenuItems;
 - (void)setupUI;
+- (IBAction)changeMenus:(id)sender;
+- (void)setLaunchesAtLogin:(BOOL)flag;
 @end
 
 
@@ -43,6 +48,7 @@ static PreferencesController *prefs = nil;
 {
     if ( (self = [super init]) ) {
         df = [[NSUserDefaults standardUserDefaults] retain];
+        hotKeysDictionary = [[NSMutableDictionary alloc] init];
         controller = nil;
     }
     return self;
@@ -61,10 +67,8 @@ static PreferencesController *prefs = nil;
 
 - (void)setController:(id)object
 {
-NSLog(@"foo");
     [controller autorelease];
     controller = [object retain];
-NSLog(@"bar");
 }
 
 
@@ -73,7 +77,6 @@ NSLog(@"bar");
 #pragma mark INSTANCE METHODS
 /*************************************************************************/
 
-
 - (IBAction)showPrefsWindow:(id)sender
 {
     if (! window) {  // If window does not exist yet, then the nib hasn't been loaded.
@@ -90,94 +93,177 @@ NSLog(@"bar");
     [NSApp activateIgnoringOtherApps:YES];
 }
 
-- (IBAction)apply:(id)sender
+- (IBAction)changeGeneralSetting:(id)sender
 {
-    [df setObject:myItems forKey:@"menu"];
+    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
+{
+    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.
+        [df setBool:SENDER_STATE forKey:@"showSongInfoOnChange"];
+    }
+}
+
+- (IBAction)changeHotKey:(id)sender
+{
+    switch ([sender tag])
+    {
+        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;
+    }
+}
+
+- (void)registerDefaults
+{
+    BOOL found = NO;
+    NSMutableDictionary *loginWindow;
+    NSMutableArray *loginArray;
+    NSEnumerator *loginEnum;
+    id anItem;
+
+    [df setObject:[NSArray arrayWithObjects:
+        @"playPause",
+        @"nextTrack",
+        @"prevTrack",
+        @"fastForward",
+        @"rewind",
+        @"showPlayer",
+        @"separator",
+        @"songRating",
+        @"eqPresets",
+        @"playlists",
+        @"upcomingSongs",
+        @"separator",
+        @"preferences",
+        @"quit",
+        @"separator",
+        @"trackInfo",
+        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];
     
-    //Set key combos
-    [df setKeyCombo:playPauseCombo forKey:@"PlayPause"];
-    [df setKeyCombo:nextTrackCombo forKey:@"NextTrack"];
-    [df setKeyCombo:prevTrackCombo forKey:@"PrevTrack"];
-    [df setKeyCombo:trackInfoCombo forKey:@"TrackInfo"];
-    [df setKeyCombo:upcomingSongsCombo forKey:@"UpcomingSongs"];
-    
-    //Set info checkboxes
-    [df setBool:[albumCheckbox state] forKey:@"showAlbum"];
-    [df setBool:[nameCheckbox state] forKey:@"showName"];
-    [df setBool:[artistCheckbox state] forKey:@"showArtist"];
-    [df 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;
-        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;
-            }
+    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(NSLocalizedString(@"autolaunch", @"Auto-launch MenuTunes"), NSLocalizedString(@"autolaunch_msg", @"Would you like MenuTunes to automatically launch at login?"), @"Yes", @"No", nil) == NSOKButton) {
             AEDesc scriptDesc, resultDesc;
             NSString *script = [NSString stringWithFormat:@"tell application \"System Events\"\nmake new login item at end of login items with properties {path:\"%@\", kind:\"APPLICATION\"}\nend tell", [[NSBundle mainBundle] bundlePath]];
-            
-            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;
-        
-        [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;
-            }
+
+            CloseComponent(asComponent);
         }
     }
-    
-    //Set songs in advance
-    if ([songsInAdvance intValue]) {
-        [df setInteger:[songsInAdvance intValue] forKey:@"SongsInAdvance"];
-    } else {
-        [df setInteger:5 forKey:@"SongsInAdvance"];
-    }
-    
-    /*{
-        NSArray *apps = [[NSWorkspace sharedWorkspace] launchedApplications];
-        int i;
-        
-        for (i = 0; i < [apps count]; i++) {
-            if ([[[apps objectAtIndex:i] objectForKey:@"NSApplicationName"]
-                    isEqualToString:@"iTunes"]) {
-                [controller rebuildMenu];
-            }
-        }
-    }*/
-    [controller clearHotKeys];
 }
 
 - (IBAction)cancelHotKey:(id)sender
@@ -195,103 +281,97 @@ NSLog(@"bar");
 - (IBAction)okHotKey:(id)sender
 {
     NSString *string = [combo userDisplayRep];
+    NSEnumerator *enumerator = [hotKeysDictionary keyEnumerator];
+    NSString *enumKey;
     
     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;
+    
+    while ( (enumKey = [enumerator nextObject]) ) {
+        if (![enumKey isEqualToString:currentHotKey]) {
+            if (![combo isEqual:[KeyCombo clearKeyCombo]] &&
+                 [combo isEqual:[hotKeysDictionary objectForKey:enumKey]]) {
+                [window setLevel:NSNormalWindowLevel];
+                if ( NSRunAlertPanel(NSLocalizedString(@"duplicateCombo", @"Duplicate Key Combo") , NSLocalizedString(@"duplicateCombo_msg", @"The specified key combo is already in use..."), NSLocalizedString(@"replace", @"Replace"), NSLocalizedString(@"cancel", @"Cancel"), nil) ) {
+                    [hotKeysDictionary setObject:[KeyCombo clearKeyCombo] forKey:currentHotKey];
+                    if ([enumKey isEqualToString:@"PlayPause"]) {
+                        [playPauseButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"NextTrack"]) {
+                        [nextTrackButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"PrevTrack"]) {
+                        [previousTrackButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"ShowPlayer"]) {
+                        [showPlayerButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"TrackInfo"]) {
+                        [trackInfoButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"UpcomingSongs"]) {
+                        [upcomingSongsButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"IncrementVolume"]) {
+                        [volumeIncrementButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"DecrementVolume"]) {
+                        [volumeDecrementButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"IncrementRating"]) {
+                        [ratingIncrementButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"DecrementRating"]) {
+                        [ratingDecrementButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"ToggleShuffle"]) {
+                        [toggleShuffleButton setTitle:@""];
+                    } else if ([enumKey isEqualToString:@"ToggleLoop"]) {
+                        [toggleLoopButton setTitle:@""];
+                    }
+                    [df setKeyCombo:[KeyCombo clearKeyCombo] forKey:enumKey];
+                } else {
+                    return;
+                }
+                [window setLevel:NSStatusWindowLevel];
+            }
         }
-        playPauseCombo = [combo copy];
+    }
+    
+    [hotKeysDictionary setObject:combo forKey:currentHotKey];
+    [df setKeyCombo:combo forKey:currentHotKey];
+    
+    if ([currentHotKey isEqualToString:@"PlayPause"]) {
         [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];
+        [[HotKeyCenter sharedCenter] addHotKey:@"PlayPause" combo:combo target:[MainController sharedController] action:@selector(playPause)];
+    } else if ([currentHotKey isEqualToString:@"NextTrack"]) {
         [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];
+        [[HotKeyCenter sharedCenter] addHotKey:@"NextTrack" combo:combo target:[MainController sharedController] action:@selector(nextSong)];
+    } else if ([currentHotKey isEqualToString:@"PrevTrack"]) {
         [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];
+        [[HotKeyCenter sharedCenter] addHotKey:@"PrevTrack" combo:combo target:[MainController sharedController] action:@selector(prevSong)];
+    } else if ([currentHotKey isEqualToString:@"ShowPlayer"]) {
+        [showPlayerButton setTitle:string];
+        [[HotKeyCenter sharedCenter] addHotKey:@"ShowPlayer" combo:combo target:[MainController sharedController] action:@selector(showPlayer)];
+    } else if ([currentHotKey isEqualToString:@"TrackInfo"]) {
         [trackInfoButton setTitle:string];
-    } else if ([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];
+        [[HotKeyCenter sharedCenter] addHotKey:@"TrackInfo" combo:combo target:[MainController sharedController] action:@selector(showCurrentTrackInfo)];
+    } else if ([currentHotKey isEqualToString:@"UpcomingSongs"]) {
         [upcomingSongsButton setTitle:string];
+        [[HotKeyCenter sharedCenter] addHotKey:@"UpcomingSongs" combo:combo target:[MainController sharedController] action:@selector(showUpcomingSongs)];
+    } else if ([currentHotKey isEqualToString:@"IncrementVolume"]) {
+        [volumeIncrementButton setTitle:string];
+        [[HotKeyCenter sharedCenter] addHotKey:@"IncrementVolume" combo:combo target:[MainController sharedController] action:@selector(incrementVolume)];
+    } else if ([currentHotKey isEqualToString:@"DecrementVolume"]) {
+        [volumeDecrementButton setTitle:string];
+        [[HotKeyCenter sharedCenter] addHotKey:@"DecrementVolume" combo:combo target:[MainController sharedController] action:@selector(decrementVolume)];
+    } else if ([currentHotKey isEqualToString:@"IncrementRating"]) {
+        [ratingIncrementButton setTitle:string];
+        [[HotKeyCenter sharedCenter] addHotKey:@"IncrementRating" combo:combo target:[MainController sharedController] action:@selector(incrementRating)];
+    } else if ([currentHotKey isEqualToString:@"DecrementRating"]) {
+        [ratingDecrementButton setTitle:string];
+        [[HotKeyCenter sharedCenter] addHotKey:@"DecrementRating" combo:combo target:[MainController sharedController] action:@selector(decrementRating)];
+    } else if ([currentHotKey isEqualToString:@"ToggleShuffle"]) {
+        [toggleShuffleButton setTitle:string];
+        [[HotKeyCenter sharedCenter] addHotKey:@"ToggleShuffle" combo:combo target:[MainController sharedController] action:@selector(toggleShuffle)];
+    } else if ([currentHotKey isEqualToString:@"ToggleLoop"]) {
+        [toggleLoopButton setTitle:string];
+        [[HotKeyCenter sharedCenter] addHotKey:@"ToggleLoop" combo:combo target:[MainController sharedController] action:@selector(toggleLoop)];
     }
     [self cancelHotKey:sender];
 }
 
-- (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"];
-}
 
 
 /*************************************************************************/
@@ -299,9 +379,10 @@ NSLog(@"bar");
 #pragma mark HOTKEY SUPPORT METHODS
 /*************************************************************************/
 
-- (void)setHotKey:(NSString *)key
+- (void)setCurrentHotKey:(NSString *)key
 {
-    setHotKey = key;
+    [currentHotKey autorelease];
+    currentHotKey = [key copy];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyEvent:) name:@"KeyBroadcasterEvent" object:nil];
     [NSApp beginSheet:keyComboPanel modalForWindow:window modalDelegate:self didEndSelector:nil contextInfo:nil];
 }
@@ -341,8 +422,8 @@ NSLog(@"bar");
 
 - (void)setupWindow
 {
-    if ( ! [NSBundle loadNibNamed:@"Preferences" owner:self] ) {
-        NSLog( @"Failed to load Preferences.nib" );
+    if (![NSBundle loadNibNamed:@"Preferences" owner:self]) {
+        NSLog(@"MenuTunes: Failed to load Preferences.nib");
         NSBeep();
         return;
     }
@@ -374,17 +455,18 @@ NSLog(@"bar");
     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",
-        @"<separator>",
+        @"trackInfo",
+        @"upcomingSongs",
+        @"playlists",
+        @"eqPresets",
+        @"songRating",
+        @"playPause",
+        @"nextTrack",
+        @"prevTrack",
+        @"fastForward",
+        @"rewind",
+        @"showPlayer",
+        @"separator",
         nil];
     
     // Get our preferred menu
@@ -393,17 +475,17 @@ NSLog(@"bar");
     // Delete items in the availableItems array that are already part of the menu
     itemEnum = [myItems objectEnumerator];
     while ( (anItem = [itemEnum nextObject]) ) {
-        if ( ! [anItem isEqualToString:@"<separator>"] ) {
+        if (![anItem isEqualToString:@"separator"]) {
             [availableItems removeObject:anItem];
         }
     }
     
     // Items that show should a submenu image
     submenuItems = [[NSArray alloc] initWithObjects:
-        @"Upcoming Songs",
-        @"Playlists",
-        @"EQ Presets",
-        @"Song Rating",
+        @"upcomingSongs",
+        @"playlists",
+        @"eqPresets",
+        @"songRating",
         nil];
 }
 
@@ -413,57 +495,120 @@ NSLog(@"bar");
     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]];
+    if ([df objectForKey:@"PlayPause"]) {
+        anItem = [df keyComboForKey:@"PlayPause"];
+        [hotKeysDictionary setObject:anItem forKey:@"PlayPause"];
+        [playPauseButton setTitle:[anItem userDisplayRep]];
     } else {
-        playPauseCombo = [[KeyCombo alloc] init];
+        [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"PlayPause"];
     }
-
+    
     if ([df objectForKey:@"NextTrack"]) {
-        nextTrackCombo = [df keyComboForKey:@"NextTrack"];
-        [nextTrackButton setTitle:[nextTrackCombo userDisplayRep]];
+        anItem = [df keyComboForKey:@"NextTrack"];
+        [hotKeysDictionary setObject:anItem forKey:@"NextTrack"];
+        [nextTrackButton setTitle:[anItem userDisplayRep]];
     } else {
-        nextTrackCombo = [[KeyCombo alloc] init];
+        [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"NextTrack"];
     }
-
+    
     if ([df objectForKey:@"PrevTrack"]) {
-        prevTrackCombo = [df keyComboForKey:@"PrevTrack"];
-        [previousTrackButton setTitle:[prevTrackCombo userDisplayRep]];
+        anItem = [df keyComboForKey:@"PrevTrack"];
+        [hotKeysDictionary setObject:anItem forKey:@"PrevTrack"];
+        [previousTrackButton setTitle:[anItem userDisplayRep]];
     } else {
-        prevTrackCombo = [[KeyCombo alloc] init];
+        [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"PrevTrack"];
     }
-
+    
+    if ([df objectForKey:@"ShowPlayer"]) {
+        anItem = [df keyComboForKey:@"ShowPlayer"];
+        [hotKeysDictionary setObject:anItem forKey:@"ShowPlayer"];
+        [showPlayerButton setTitle:[anItem userDisplayRep]];
+    } else {
+        [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"ShowPlayer"];
+    }
+    
     if ([df objectForKey:@"TrackInfo"]) {
-        trackInfoCombo = [df keyComboForKey:@"TrackInfo"];
-        [trackInfoButton setTitle:[trackInfoCombo userDisplayRep]];
+        anItem = [df keyComboForKey:@"TrackInfo"];
+        [hotKeysDictionary setObject:anItem forKey:@"TrackInfo"];
+        [trackInfoButton setTitle:[anItem userDisplayRep]];
     } else {
-        trackInfoCombo = [[KeyCombo alloc] init];
+        [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"TrackInfo"];
     }
-
+    
     if ([df objectForKey:@"UpcomingSongs"]) {
-        upcomingSongsCombo = [df keyComboForKey:@"UpcomingSongs"];
-        [upcomingSongsButton setTitle:[upcomingSongsCombo userDisplayRep]];
+        anItem = [df keyComboForKey:@"UpcomingSongs"];
+        [hotKeysDictionary setObject:anItem forKey:@"UpcomingSongs"];
+        [upcomingSongsButton setTitle:[anItem userDisplayRep]];
+    } else {
+        [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"UpcomingSongs"];
+    }
+    
+    if ([df objectForKey:@"IncrementVolume"]) {
+        anItem = [df keyComboForKey:@"IncrementVolume"];
+        [hotKeysDictionary setObject:anItem forKey:@"IncrementVolume"];
+        [volumeIncrementButton setTitle:[anItem userDisplayRep]];
+    } else {
+        [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"IncrementVolume"];
+    }
+    
+    if ([df objectForKey:@"DecrementVolume"]) {
+        anItem = [df keyComboForKey:@"DecrementVolume"];
+        [hotKeysDictionary setObject:anItem forKey:@"DecrementVolume"];
+        [volumeDecrementButton setTitle:[anItem userDisplayRep]];
     } else {
-        upcomingSongsCombo = [[KeyCombo alloc] init];
+        [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"DecrementVolume"];
+    }
+    
+    if ([df objectForKey:@"IncrementRating"]) {
+        anItem = [df keyComboForKey:@"IncrementRating"];
+        [hotKeysDictionary setObject:anItem forKey:@"IncrementRating"];
+        [ratingIncrementButton setTitle:[anItem userDisplayRep]];
+    } else {
+        [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"IncrementRating"];
+    }
+    
+    if ([df objectForKey:@"DecrementRating"]) {
+        anItem = [df keyComboForKey:@"DecrementRating"];
+        [hotKeysDictionary setObject:anItem forKey:@"DecrementRating"];
+        [ratingDecrementButton setTitle:[anItem userDisplayRep]];
+    } else {
+        [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"DecrementRating"];
+    }
+    
+    if ([df objectForKey:@"ToggleLoop"]) {
+        anItem = [df keyComboForKey:@"ToggleLoop"];
+        [hotKeysDictionary setObject:anItem forKey:@"ToggleLoop"];
+        [toggleLoopButton setTitle:[anItem userDisplayRep]];
+    } else {
+        [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"ToggleLoop"];
+    }
+    
+    if ([df objectForKey:@"ToggleShuffle"]) {
+        anItem = [df keyComboForKey:@"ToggleShuffle"];
+        [hotKeysDictionary setObject:anItem forKey:@"ToggleShuffle"];
+        [toggleShuffleButton setTitle:[anItem userDisplayRep]];
+    } else {
+        [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"ToggleShuffle"];
     }
     
     // Check current track info buttons
     [albumCheckbox setState:[df boolForKey:@"showAlbum"] ? NSOnState : NSOffState];
-    [nameCheckbox setState:[df boolForKey:@"showName"] ? 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];
     
     // 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]]) {
@@ -472,6 +617,67 @@ NSLog(@"bar");
     }
 }
 
+- (IBAction)changeMenus:(id)sender
+{
+    [df setObject:myItems forKey:@"menu"];
+    [df synchronize];
+}
+
+- (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 -
@@ -502,7 +708,11 @@ NSLog(@"bar");
 {
     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:@"%@ %@", NSLocalizedString(@"show", @"Show"), [[controller currentRemote] playerSimpleName]];
+            }
+            return NSLocalizedString(object, @"ERROR");
         } else {
             if ([submenuItems containsObject:[myItems objectAtIndex:rowIndex]])
             {
@@ -513,7 +723,7 @@ NSLog(@"bar");
         }
     } else {
         if ([[aTableColumn identifier] isEqualToString:@"name"]) {
-            return [availableItems objectAtIndex:rowIndex];
+            return NSLocalizedString([availableItems objectAtIndex:rowIndex], @"ERROR");
         } else {
             if ([submenuItems containsObject:[availableItems objectAtIndex:rowIndex]]) {
                 return [NSImage imageNamed:@"submenu"];
@@ -561,7 +771,7 @@ NSLog(@"bar");
                 [myItems insertObject:temp atIndex:row];
             }
         } else {
-            if (![temp isEqualToString:@"<separator>"]) {
+            if (![temp isEqualToString:@"separator"]) {
                 [availableItems addObject:temp];
             }
         }
@@ -570,7 +780,7 @@ NSLog(@"bar");
         dragRow = [dragData intValue];
         temp = [availableItems objectAtIndex:dragRow];
         
-        if (![temp isEqualToString:@"<separator>"]) {
+        if (![temp isEqualToString:@"separator"]) {
             [availableItems removeObjectAtIndex:dragRow];
         }
         [myItems insertObject:temp atIndex:row];
@@ -578,6 +788,7 @@ NSLog(@"bar");
     
     [menuTableView reloadData];
     [allTableView reloadData];
+    [self changeMenus:self];
     return YES;
 }
 
@@ -590,7 +801,7 @@ NSLog(@"bar");
         
         if ([[[info draggingPasteboard] types] containsObject:@"MenuTableViewPboardType"]) {
             NSString *item = [myItems objectAtIndex:[[[info draggingPasteboard] stringForType:@"MenuTableViewPboardType"] intValue]];
-            if ([item isEqualToString:@"PreferencesÉ"] || [item isEqualToString:@"Quit"]) {
+            if ([item isEqualToString:@"Preferences"] || [item isEqualToString:@"Quit"]) {
                 return NSDragOperationNone;
             }
         }
@@ -616,11 +827,7 @@ NSLog(@"bar");
 - (void)dealloc
 {
     [self setKeyCombo:nil];
-    [playPauseCombo release];
-    [nextTrackCombo release];
-    [prevTrackCombo release];
-    [trackInfoCombo release];
-    [upcomingSongsCombo release];
+    [hotKeysDictionary release];
     [keyComboPanel release];
     [menuTableView setDataSource:nil];
     [allTableView setDataSource:nil];