More bugfixes in networking. Added password panels. Fixed bug with 0:60 time.
[MenuTunes.git] / PreferencesController.m
index c8ac15b..4141086 100755 (executable)
@@ -1,10 +1,18 @@
 #import "PreferencesController.h"
 #import "MainController.h"
 #import "PreferencesController.h"
 #import "MainController.h"
+#import "NetworkController.h"
+#import "NetworkObject.h"
 #import "StatusWindow.h"
 #import "StatusWindow.h"
-#import "MyTableView.h"
+#import "StatusWindowController.h"
+#import "CustomMenuTableView.h"
+
+#import <netinet/in.h>
+#import <arpa/inet.h>
+#import <openssl/sha.h>
 
 #import <ITKit/ITHotKeyCenter.h>
 #import <ITKit/ITKeyCombo.h>
 
 #import <ITKit/ITHotKeyCenter.h>
 #import <ITKit/ITKeyCombo.h>
+#import <ITKit/ITKeyComboPanel.h>
 #import <ITKit/ITWindowPositioning.h>
 #import <ITKit/ITKeyBroadcaster.h>
 
 #import <ITKit/ITWindowPositioning.h>
 #import <ITKit/ITKeyBroadcaster.h>
 
@@ -59,9 +67,39 @@ static PreferencesController *prefs = nil;
 - (id)init
 {
     if ( (self = [super init]) ) {
 - (id)init
 {
     if ( (self = [super init]) ) {
+        ITDebugLog(@"Preferences initialized.");
         df = [[NSUserDefaults standardUserDefaults] retain];
         df = [[NSUserDefaults standardUserDefaults] retain];
+        hotKeysArray = [[NSArray alloc] initWithObjects:@"PlayPause",
+                                                       @"NextTrack",
+                                                       @"PrevTrack",
+                                                       @"ShowPlayer",
+                                                       @"TrackInfo",
+                                                       @"UpcomingSongs",
+                                                       @"IncrementVolume",
+                                                       @"DecrementVolume",
+                                                       @"IncrementRating",
+                                                       @"DecrementRating",
+                                                       @"ToggleShuffle",
+                                                       @"ToggleLoop",
+                                                       nil];
+        
+        hotKeyNamesArray = [[NSArray alloc] initWithObjects:@"Play/Pause",
+                                                       @"Next Track",
+                                                       @"Previous Track",
+                                                       @"Show Player",
+                                                       @"Track Info",
+                                                       @"Upcoming Songs",
+                                                       @"Increment Volume",
+                                                       @"Decrement Volume",
+                                                       @"Increment Rating",
+                                                       @"Decrement Rating",
+                                                       @"Toggle Shuffle",
+                                                       @"Toggle Loop",
+                                                       nil];
         hotKeysDictionary = [[NSMutableDictionary alloc] init];
         controller = nil;
         hotKeysDictionary = [[NSMutableDictionary alloc] init];
         controller = nil;
+        
+        [self setupWindow];  // Load in the nib, and perform any initial setup.
     }
     return self;
 }
     }
     return self;
 }
@@ -89,27 +127,60 @@ static PreferencesController *prefs = nil;
 #pragma mark INSTANCE METHODS
 /*************************************************************************/
 
 #pragma mark INSTANCE METHODS
 /*************************************************************************/
 
+- (BOOL)showPasswordPanel
+{
+    [passwordPanel setLevel:NSStatusWindowLevel];
+    [passwordPanelOKButton setTitle:@"OK"];
+    [passwordPanelMessage setStringValue:[NSString stringWithFormat:@"Please enter a password for access to the MenuTunes player named %@ at %@.", [[[NetworkController sharedController] networkObject] serverName], [[NetworkController sharedController] remoteHost]]];
+    [passwordPanel makeKeyAndOrderFront:nil];
+    if ([NSApp runModalForWindow:passwordPanel]) {
+        return YES;
+    } else {
+        return NO;
+    }
+}
+
+- (BOOL)showInvalidPasswordPanel
+{
+    [passwordPanel setLevel:NSStatusWindowLevel];
+    [passwordPanelOKButton setTitle:@"Retry"];
+    [passwordPanelMessage setStringValue:[NSString stringWithFormat:@"The password entered for access to the MenuTunes player named %@ at %@ is invalid.  Please provide a new password.", [[[NetworkController sharedController] networkObject] serverName], [[NetworkController sharedController] remoteHost]]];
+    [passwordPanel makeKeyAndOrderFront:nil];
+    if ([NSApp runModalForWindow:passwordPanel]) {
+        return YES;
+    } else {
+        return NO;
+    }
+}
+
 - (IBAction)showPrefsWindow:(id)sender
 {
 - (IBAction)showPrefsWindow:(id)sender
 {
+    ITDebugLog(@"Showing preferences window.");
     if (! window) {  // If window does not exist yet, then the nib hasn't been loaded.
     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.
+        ITDebugLog(@"Window doesn't exist, 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];
         [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];
+        [hotKeysTableView setDoubleAction:@selector(hotKeysTableViewDoubleClicked:)];
         
         //Change the launch player checkbox to the proper name
         
         //Change the launch player checkbox to the proper name
-        [launchPlayerAtLaunchCheckbox setTitle:[NSString stringWithFormat:@"Launch %@ when MenuTunes launches", [[controller currentRemote] playerSimpleName]]]; //This isn't localized...
+        NS_DURING
+            [launchPlayerAtLaunchCheckbox setTitle:[NSString stringWithFormat:@"Launch %@ when MenuTunes launches", [[controller currentRemote] playerSimpleName]]]; //This isn't localized...
+        NS_HANDLER
+            [controller networkError:localException];
+        NS_ENDHANDLER
     }
     }
-    
-    [window setLevel:NSStatusWindowLevel];
+
     [window center];
     [window center];
-    [window makeKeyAndOrderFront:self];
+    [NSApp activateIgnoringOtherApps:YES];
+    [window performSelector:@selector(makeKeyAndOrderFront:) withObject:self afterDelay:0.0];
 }
 
 - (IBAction)changeGeneralSetting:(id)sender
 {
 }
 
 - (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) {
     if ( [sender tag] == 1010) {
         [self setLaunchesAtLogin:SENDER_STATE];
     } else if ( [sender tag] == 1020) {
@@ -131,14 +202,140 @@ static PreferencesController *prefs = nil;
     } else if ( [sender tag] == 1090) {
         [df setBool:SENDER_STATE forKey:@"showTrackRating"];
     }
     } else if ( [sender tag] == 1090) {
         [df setBool:SENDER_STATE forKey:@"showTrackRating"];
     }
-    
+    [df synchronize];
+}
+
+- (IBAction)changeSharingSetting:(id)sender
+{
+    ITDebugLog(@"Changing sharing setting of tag %i.", [sender tag]);
+    if ( [sender tag] == 5010 ) {
+        BOOL state = SENDER_STATE;
+        [df setBool:state forKey:@"enableSharing"];
+        //Disable/enable the use of shared player options
+        [useSharedMenuTunesCheckbox setEnabled:!state];
+        [usePasswordCheckbox setEnabled:state];
+        [passwordTextField setEnabled:state];
+        [nameTextField setEnabled:state];
+        [selectSharedPlayerButton setEnabled:NO];
+        [controller setServerStatus:state]; //Set server status
+    } else if ( [sender tag] == 5015 ) {
+        [df setObject:[sender stringValue] forKey:@"sharedPlayerName"];
+    } else if ( [sender tag] == 5020 ) {
+        [df setBool:SENDER_STATE forKey:@"enableSharingPassword"];
+    } else if ( [sender tag] == 5030 ) {
+        //Set the server password
+        const char *instring = [[sender stringValue] UTF8String];
+        const char *password = "password";
+        unsigned char *result;
+        NSData *hashedPass, *passwordStringHash;
+        result = SHA1(instring, strlen(instring), NULL);
+        hashedPass = [NSData dataWithBytes:result length:strlen(result)];
+        result = SHA1(password, strlen(password), NULL);
+        passwordStringHash = [NSData dataWithBytes:result length:strlen(result)];
+        if (![hashedPass isEqualToData:passwordStringHash]) {
+            [df setObject:hashedPass forKey:@"sharedPlayerPassword"];
+            [sender setStringValue:@"password"];
+        }
+    } else if ( [sender tag] == 5040 ) {
+        BOOL state = SENDER_STATE;
+        [df setBool:state forKey:@"useSharedPlayer"];
+        //Disable/enable the use of sharing options
+        [shareMenuTunesCheckbox setEnabled:!state];
+        [usePasswordCheckbox setEnabled:NO];
+        [passwordTextField setEnabled:NO];
+        [nameTextField setEnabled:NO];
+        [selectSharedPlayerButton setEnabled:state];
+        
+        if (state && [controller connectToServer]) {
+            [selectedPlayerTextField setStringValue:[[[NetworkController sharedController] networkObject] serverName]];
+            [locationTextField setStringValue:[[NetworkController sharedController] remoteHost]];
+        } else {
+            [selectedPlayerTextField setStringValue:@"No shared player selected."];
+            [locationTextField setStringValue:@"-"];
+            if ([[NetworkController sharedController] isConnectedToServer]) {
+                [controller disconnectFromServer];
+            }
+            
+        }
+    } else if ( [sender tag] == 5050 ) {
+        //Do nothing on table view click
+    } else if ( [sender tag] == 5051 ) {
+        [df setObject:[sender stringValue] forKey:@"sharedPlayerHost"];
+    } else if ( [sender tag] == 5060 ) {
+        //Show selection sheet
+        [NSApp beginSheet:selectPlayerSheet modalForWindow:window modalDelegate:self didEndSelector:NULL contextInfo:nil];
+    } else if ( [sender tag] == 5100 ) {
+        //Change view
+        if ( ([sender indexOfItem:[sender selectedItem]] == 0) && ([selectPlayerBox contentView] != zeroConfView) ) {
+            NSRect frame = [selectPlayerSheet frame];
+            frame.origin.y -= 58;
+            frame.size.height = 273;
+            [selectPlayerBox setContentView:zeroConfView];
+            [selectPlayerSheet setFrame:frame display:YES animate:YES];
+        } else if ( ([sender indexOfItem:[sender selectedItem]] == 1) && ([selectPlayerBox contentView] != manualView) ){
+            NSRect frame = [selectPlayerSheet frame];
+            frame.origin.y += 58;
+            frame.size.height = 215;
+            //[window makeFirstResponder:hostTextField];
+            [selectPlayerBox setContentView:manualView];
+            [selectPlayerSheet setFrame:frame display:YES animate:YES];
+            [hostTextField selectText:nil];
+        }
+    } else if ( [sender tag] == 5150 ) {
+        const char *instring = [[sender stringValue] UTF8String];
+        unsigned char *result;
+        result = SHA1(instring, strlen(instring), NULL);
+        [df setObject:[NSData dataWithBytes:result length:strlen(result)] forKey:@"connectPassword"];
+    } else if ( [sender tag] == 5110 ) {
+        //Cancel
+        [NSApp endSheet:selectPlayerSheet];
+        [selectPlayerSheet orderOut:nil];
+        if ([selectPlayerBox contentView] == manualView) {
+            [hostTextField setStringValue:[df stringForKey:@"sharedPlayerHost"]];
+        } else {
+        }
+    } else if ( [sender tag] == 5120 ) {
+        //OK, try to connect
+        [NSApp endSheet:selectPlayerSheet];
+        [selectPlayerSheet orderOut:nil];
+        
+        [self changeSharingSetting:clientPasswordTextField];
+        
+        if ([selectPlayerBox contentView] == manualView) {
+            [df setObject:[hostTextField stringValue] forKey:@"sharedPlayerHost"];
+        } else {
+            if ([sharingTableView selectedRow] > -1) {
+                [df setObject:[NSString stringWithCString:inet_ntoa((*(struct sockaddr_in*)[[[[[[NetworkController sharedController] remoteServices] objectAtIndex:[sharingTableView selectedRow]] addresses] objectAtIndex:0] bytes]).sin_addr)] forKey:@"sharedPlayerHost"];
+            }
+        }
+        
+        if ([controller connectToServer]) {
+            [useSharedMenuTunesCheckbox setState:NSOnState];
+            [selectedPlayerTextField setStringValue:[[[NetworkController sharedController] networkObject] serverName]];
+            [locationTextField setStringValue:[[NetworkController sharedController] remoteHost]];
+        } else {
+            NSRunAlertPanel(@"Connection error.", @"The MenuTunes server you attempted to connect to was not responding. MenuTunes will revert back to the local player.", @"OK", nil, nil);
+        }
+    } else if ( [sender tag] == 6010 ) {
+        //Cancel password entry
+        [passwordPanel orderOut:nil];
+        [NSApp stopModalWithCode:0];
+    } else if ( [sender tag] == 6020 ) {
+        //OK password entry, retry connect
+        const char *instring = [[passwordPanelTextField stringValue] UTF8String];
+        unsigned char *result;
+        result = SHA1(instring, strlen(instring), NULL);
+        [df setObject:[NSData dataWithBytes:result length:strlen(result)] forKey:@"connectPassword"];
+        [passwordPanel orderOut:nil];
+        [NSApp stopModalWithCode:1];
+    }
     [df synchronize];
 }
 
 - (IBAction)changeStatusWindowSetting:(id)sender
 {
     StatusWindow *sw = [StatusWindow sharedWindow];
     [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"];
     if ( [sender tag] == 2010) {
         [df setInteger:[sender selectedRow] forKey:@"statusWindowVerticalPosition"];
         [df setInteger:[sender selectedColumn] forKey:@"statusWindowHorizontalPosition"];
@@ -159,7 +356,6 @@ static PreferencesController *prefs = nil;
         } else if ( effectTag == 2103 ) {
             [sw setEntryEffect:[[[ITSlideHorizontallyWindowEffect alloc] initWithWindow:sw] autorelease]];
         } else if ( effectTag == 2104 ) {
         } 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 setEntryEffect:[[[ITPivotWindowEffect alloc] initWithWindow:sw] autorelease]];
         }
 
@@ -199,66 +395,9 @@ static PreferencesController *prefs = nil;
     } else if ( [sender tag] == 2080) {
         [df setBool:SENDER_STATE forKey:@"showSongInfoOnChange"];
     }
     } else if ( [sender tag] == 2080) {
         [df setBool:SENDER_STATE forKey:@"showSongInfoOnChange"];
     }
-    
     [df synchronize];
 }
 
     [df synchronize];
 }
 
-- (IBAction)changeHotKey:(id)sender
-{
-    [controller clearHotKeys];
-    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;
 - (void)registerDefaults
 {
     BOOL found = NO;
@@ -266,24 +405,19 @@ static PreferencesController *prefs = nil;
     NSMutableArray *loginArray;
     NSEnumerator *loginEnum;
     id anItem;
     NSMutableArray *loginArray;
     NSEnumerator *loginEnum;
     id anItem;
-
+    ITDebugLog(@"Registering defaults.");
     [df setObject:[NSArray arrayWithObjects:
     [df setObject:[NSArray arrayWithObjects:
+        @"trackInfo",
+        @"separator",
         @"playPause",
         @"prevTrack",
         @"nextTrack",
         @"playPause",
         @"prevTrack",
         @"nextTrack",
-        @"fastForward",
-        @"rewind",
-        @"showPlayer",
         @"separator",
         @"separator",
-        @"songRating",
-        @"eqPresets",
         @"playlists",
         @"upcomingSongs",
         @"separator",
         @"preferences",
         @"quit",
         @"playlists",
         @"upcomingSongs",
         @"separator",
         @"preferences",
         @"quit",
-        @"separator",
-        @"trackInfo",
         nil] forKey:@"menu"];
 
     [df setInteger:5 forKey:@"SongsInAdvance"];
         nil] forKey:@"menu"];
 
     [df setInteger:5 forKey:@"SongsInAdvance"];
@@ -292,6 +426,13 @@ static PreferencesController *prefs = nil;
     [df setBool:NO forKey:@"showAlbum"];
     [df setBool:NO forKey:@"showTime"];
 
     [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];
     [df synchronize];
     
     loginWindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy];
@@ -303,174 +444,109 @@ static PreferencesController *prefs = nil;
             found = YES;
         }
     }
             found = YES;
         }
     }
-
     [loginWindow release];
     
     [loginWindow release];
     
-    // This is teh sux
-    // We must fix it so it is no longer suxy
     if (!found) {
     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]];
-            ComponentInstance asComponent = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);
-
-            AECreateDesc(typeChar, [script cString], [script cStringLength],
-                         &scriptDesc);
-
-            OSADoScript(asComponent, &scriptDesc, kOSANullScript, typeChar, kOSAModeCanInteract, &resultDesc);
-
-            AEDisposeDesc(&scriptDesc);
-            AEDisposeDesc(&resultDesc);
-
-            CloseComponent(asComponent);
-        }
+        [[StatusWindowController sharedController] showSetupQueryWindow];
     }
 }
 
     }
 }
 
-- (IBAction)cancelHotKey:(id)sender
+- (void)autoLaunchOK
 {
 {
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
-    [NSApp endSheet:keyComboPanel];
-    [keyComboPanel orderOut:nil];
+    [[StatusWindow sharedWindow] setLocked:NO];
+    [[StatusWindow sharedWindow] vanish:self];
+    [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
+    
+    [self setLaunchesAtLogin:YES];
 }
 
 }
 
-- (IBAction)clearHotKey:(id)sender
+- (void)autoLaunchCancel
 {
 {
-    [self setKeyCombo:[ITKeyCombo clearKeyCombo]];
-}
-
-- (IBAction)okHotKey:(id)sender
-{
-    NSString *string = [combo description];
-    NSEnumerator *enumerator = [hotKeysDictionary keyEnumerator];
-    NSString *enumKey;
-    
-    if (string == nil) {
-        string = @"";
-    }
-    
-    while ( (enumKey = [enumerator nextObject]) ) {
-        if (![enumKey isEqualToString:currentHotKey]) {
-            if (![combo isEqual:[ITKeyCombo clearKeyCombo]] &&
-                 [combo isEqual:[hotKeysDictionary objectForKey:enumKey]]) {
-                [window setLevel:NSNormalWindowLevel];
-                if ( NSRunAlertPanel(NSLocalizedString(@"duplicateCombo", @"Duplicate Key Combo") , NSLocalizedString(@"duplicateCombo_msg", @"The specified key combo is already in use..."), NSLocalizedString(@"replace", @"Replace"), NSLocalizedString(@"cancel", @"Cancel"), nil) ) {
-                    [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:currentHotKey];
-                    if ([enumKey isEqualToString:@"PlayPause"]) {
-                        [playPauseButton setTitle:@"(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)"];
-                    }
-                    [df setObject:[[ITKeyCombo clearKeyCombo] plistRepresentation] forKey:enumKey];
-                    [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:enumKey];
-                } else {
-                    return;
-                }
-                [window setLevel:NSStatusWindowLevel];
-            }
-        }
-    }
-    
-    [hotKeysDictionary setObject:combo forKey:currentHotKey];
-    [df setObject:[combo plistRepresentation] forKey:currentHotKey];
-    
-    if ([currentHotKey isEqualToString:@"PlayPause"]) {
-        [playPauseButton setTitle:string];
-    } else if ([currentHotKey isEqualToString:@"NextTrack"]) {
-        [nextTrackButton setTitle:string];
-    } else if ([currentHotKey isEqualToString:@"PrevTrack"]) {
-        [previousTrackButton setTitle:string];
-    } else if ([currentHotKey isEqualToString:@"ShowPlayer"]) {
-        [showPlayerButton setTitle:string];
-    } else if ([currentHotKey isEqualToString:@"TrackInfo"]) {
-        [trackInfoButton setTitle:string];
-    } else if ([currentHotKey isEqualToString:@"UpcomingSongs"]) {
-        [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];
+    [[StatusWindow sharedWindow] setLocked:NO];
+    [[StatusWindow sharedWindow] vanish:self];
+    [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
 }
 
 - (void)deletePressedInTableView:(NSTableView *)tableView
 {
     if (tableView == menuTableView) {
         int selRow = [tableView selectedRow];
 }
 
 - (void)deletePressedInTableView:(NSTableView *)tableView
 {
     if (tableView == menuTableView) {
         int selRow = [tableView selectedRow];
+        ITDebugLog(@"Delete pressed in menu table view.");
         if (selRow != - 1) {
             NSString *object = [myItems objectAtIndex:selRow];
         if (selRow != - 1) {
             NSString *object = [myItems objectAtIndex:selRow];
+            
+            if ([object isEqualToString:@"preferences"]) {
+                NSBeep();
+                return;
+            }
+            
             if (![object isEqualToString:@"separator"])
                 [availableItems addObject:object];
             if (![object isEqualToString:@"separator"])
                 [availableItems addObject:object];
+            ITDebugLog(@"Removing object named %@", object);
             [myItems removeObjectAtIndex:selRow];
             [menuTableView reloadData];
             [allTableView reloadData];
         }
             [myItems removeObjectAtIndex:selRow];
             [menuTableView reloadData];
             [allTableView reloadData];
         }
+        [self changeMenus:self];
     }
 }
 
     }
 }
 
-
 /*************************************************************************/
 #pragma mark -
 #pragma mark HOTKEY SUPPORT METHODS
 /*************************************************************************/
 
 /*************************************************************************/
 #pragma mark -
 #pragma mark HOTKEY SUPPORT METHODS
 /*************************************************************************/
 
-- (void)setCurrentHotKey:(NSString *)key
+- (IBAction)clearHotKey:(id)sender
 {
 {
-    [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];
+    [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:[hotKeysArray objectAtIndex:[hotKeysTableView selectedRow]]];
+    [df setObject:[[ITKeyCombo clearKeyCombo] plistRepresentation] forKey:[hotKeysArray objectAtIndex:[hotKeysTableView selectedRow]]];
+    [controller setupHotKeys];
+    [hotKeysTableView reloadData];
 }
 
 }
 
-- (void)keyEvent:(NSNotification *)note
+- (IBAction)editHotKey:(id)sender
 {
 {
-    [self setKeyCombo:[[[note userInfo] objectForKey:@"keyCombo"] copy]];
+    ITKeyComboPanel *panel = [ITKeyComboPanel sharedPanel];
+    NSString *keyComboKey = [hotKeysArray objectAtIndex:[hotKeysTableView selectedRow]];
+    ITKeyCombo *keyCombo;
+    
+    ITDebugLog(@"Setting key combo on hot key %@.", keyComboKey);
+    [controller clearHotKeys];
+    [panel setKeyCombo:[hotKeysDictionary objectForKey:[hotKeysArray objectAtIndex:[hotKeysTableView selectedRow]]]];
+    [panel setKeyBindingName:[hotKeyNamesArray objectAtIndex:[hotKeysTableView selectedRow]]];
+    if ([panel runModal] == NSOKButton) {
+        NSEnumerator *keyEnumerator = [[hotKeysDictionary allKeys] objectEnumerator];
+        NSString *nextKey;
+        keyCombo = [panel keyCombo];
+        
+        //Check for duplicate key combo
+        while ( (nextKey = [keyEnumerator nextObject]) ) {
+            if ([[hotKeysDictionary objectForKey:nextKey] isEqual:keyCombo] &&
+                ![keyCombo isEqual:[ITKeyCombo clearKeyCombo]]) {
+                [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo]
+                                   forKey:nextKey];
+                [df setObject:[[ITKeyCombo clearKeyCombo] plistRepresentation]
+                    forKey:nextKey];
+            }
+        }
+        
+        [hotKeysDictionary setObject:keyCombo forKey:keyComboKey];
+        [df setObject:[keyCombo plistRepresentation] forKey:keyComboKey];
+        [controller setupHotKeys];
+        [hotKeysTableView reloadData];
+        ITDebugLog(@"Set combo %@ on hot key %@.", keyCombo, keyComboKey);
+    } else {
+        ITDebugLog(@"Hot key setting on hot key %@ cancelled.", keyComboKey);
+    }
 }
 
 }
 
-- (void)setKeyCombo:(ITKeyCombo *)newCombo
+- (void)hotKeysTableViewDoubleClicked:(id)sender
 {
 {
-    NSString *string;
-    [combo release];
-    combo = [newCombo copy];
-    
-    string = [combo description];
-    if (string == nil) {
-        string = @"(None)";
+    if ([sender clickedRow] > -1) {
+        [self editHotKey:sender];
     }
     }
-    [keyComboField setStringValue:string];
 }
 
 }
 
-
 /*************************************************************************/
 #pragma mark -
 #pragma mark PRIVATE METHOD IMPLEMENTATIONS
 /*************************************************************************/
 #pragma mark -
 #pragma mark PRIVATE METHOD IMPLEMENTATIONS
@@ -478,8 +554,9 @@ static PreferencesController *prefs = nil;
 
 - (void)setupWindow
 {
 
 - (void)setupWindow
 {
+    ITDebugLog(@"Loading Preferences.nib.");
     if (![NSBundle loadNibNamed:@"Preferences" owner:self]) {
     if (![NSBundle loadNibNamed:@"Preferences" owner:self]) {
-        NSLog(@"MenuTunes: Failed to load Preferences.nib");
+        ITDebugLog(@"Failed to load Preferences.nib.");
         NSBeep();
         return;
     }
         NSBeep();
         return;
     }
@@ -488,7 +565,7 @@ static PreferencesController *prefs = nil;
 - (void)setupCustomizationTables
 {
     NSImageCell *imgCell = [[[NSImageCell alloc] initImageCell:nil] autorelease];
 - (void)setupCustomizationTables
 {
     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];
     // Set the table view cells up
     [imgCell setImageScaling:NSScaleNone];
     [[menuTableView tableColumnWithIdentifier:@"submenu"] setDataCell:imgCell];
@@ -509,6 +586,7 @@ static PreferencesController *prefs = nil;
 {
     NSEnumerator *itemEnum;
     id            anItem;
 {
     NSEnumerator *itemEnum;
     id            anItem;
+    ITDebugLog(@"Setting up table view arrays.");
     // Set the list of items you can have.
     availableItems = [[NSMutableArray alloc] initWithObjects:
         @"separator",
     // Set the list of items you can have.
     availableItems = [[NSMutableArray alloc] initWithObjects:
         @"separator",
@@ -550,121 +628,27 @@ static PreferencesController *prefs = nil;
 {
     NSMutableDictionary *loginwindow;
     NSMutableArray *loginarray;
 {
     NSMutableDictionary *loginwindow;
     NSMutableArray *loginarray;
-    NSEnumerator *loginEnum;
+    NSEnumerator *loginEnum, *keyArrayEnum;
+    NSString *serverName;
     id anItem;
     
     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 the number of songs in advance to show field
     [songsInAdvance setIntValue:[df integerForKey:@"SongsInAdvance"]];
     
-    // Fill in hot key buttons
-    if ([df objectForKey:@"PlayPause"]) {
-        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"]) {
-        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"]) {
-        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PrevTrack"]];
-        [hotKeysDictionary setObject:anItem forKey:@"PrevTrack"];
-        [previousTrackButton setTitle:[anItem description]];
-    } else {
-        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"PrevTrack"];
-        [previousTrackButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
-    }
-    
-    if ([df objectForKey:@"ShowPlayer"]) {
-        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ShowPlayer"]];
-        [hotKeysDictionary setObject:anItem forKey:@"ShowPlayer"];
-        [showPlayerButton setTitle:[anItem description]];
-    } else {
-        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"ShowPlayer"];
-        [showPlayerButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
-    }
-    
-    if ([df objectForKey:@"TrackInfo"]) {
-        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"]) {
-        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"]) {
-        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"]) {
-        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]];
-    }
+    // Fill hot key array
+    keyArrayEnum = [hotKeysArray objectEnumerator];
     
     
-    if ([df objectForKey:@"IncrementRating"]) {
-        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"]) {
-        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"]) {
-        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"]) {
-        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]];
+    while ( (anItem = [keyArrayEnum nextObject]) ) {
+        if ([df objectForKey:anItem]) {
+            ITDebugLog(@"Setting up \"%@\" hot key.", anItem);
+            [hotKeysDictionary setObject:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:anItem]] forKey:anItem];
+        } else {
+            [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:anItem];
+        }
     }
     
     }
     
+    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.
     // Check current track info buttons
     [albumCheckbox setState:[df boolForKey:@"showAlbum"] ? NSOnState : NSOffState];
     [nameCheckbox setState:NSOnState];  // Song info will ALWAYS show song title.
@@ -675,6 +659,7 @@ static PreferencesController *prefs = nil;
     [ratingCheckbox setState:[df boolForKey:@"showTrackRating"] ? NSOnState : NSOffState];
     
     // Set the launch at login checkbox state
     [ratingCheckbox setState:[df boolForKey:@"showTrackRating"] ? NSOnState : NSOffState];
     
     // Set the launch at login checkbox state
+    ITDebugLog(@"Setting launch at login state.");
     [df synchronize];
     loginwindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy];
     loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
     [df synchronize];
     loginwindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy];
     loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
@@ -685,10 +670,64 @@ static PreferencesController *prefs = nil;
             [launchAtLoginCheckbox setState:NSOnState];
         }
     }
             [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)];
+    
+    // Setup the sharing controls
+    if ([df boolForKey:@"enableSharing"]) {
+        [shareMenuTunesCheckbox setState:NSOnState];
+        [useSharedMenuTunesCheckbox setEnabled:NO];
+        [selectSharedPlayerButton setEnabled:NO];
+        [passwordTextField setEnabled:YES];
+        [usePasswordCheckbox setEnabled:YES];
+        [nameTextField setEnabled:YES];
+    } else if ([df boolForKey:@"useSharedPlayer"]) {
+        [useSharedMenuTunesCheckbox setState:NSOnState];
+        [shareMenuTunesCheckbox setEnabled:NO];
+        [selectSharedPlayerButton setEnabled:YES];
+    }
+    
+    [[NSNotificationCenter defaultCenter] addObserver:sharingTableView selector:@selector(reloadData) name:@"ITMTFoundNetService" object:nil];
+    
+    serverName = [df stringForKey:@"sharedPlayerName"];
+    if (!serverName || [serverName length] == 0) {
+        serverName = @"MenuTunes Shared Player";
+    }
+    [nameTextField setStringValue:serverName];
+    
+    [selectPlayerBox setContentView:zeroConfView];
+    [usePasswordCheckbox setState:([df boolForKey:@"enableSharingPassword"] ? NSOnState : NSOffState)];
+    if ([df dataForKey:@"sharedPlayerPassword"]) {
+        [passwordTextField setStringValue:@"password"];
+    }
+    if ([df stringForKey:@"sharedPlayerHost"]) {
+        [hostTextField setStringValue:[df stringForKey:@"sharedPlayerHost"]];
+    }
+    
+    if ([[NetworkController sharedController] isConnectedToServer]) {
+        [selectedPlayerTextField setStringValue:[[[NetworkController sharedController] networkObject] serverName]];
+        [locationTextField setStringValue:[[NetworkController sharedController] remoteHost]];
+    } else {
+        [selectedPlayerTextField setStringValue:@"No shared player selected."];
+        [locationTextField setStringValue:@"-"];
+    }
 }
 
 - (IBAction)changeMenus:(id)sender
 {
 }
 
 - (IBAction)changeMenus:(id)sender
 {
+    ITDebugLog(@"Synchronizing menus");
     [df setObject:myItems forKey:@"menu"];
     [df synchronize];
 }
     [df setObject:myItems forKey:@"menu"];
     [df synchronize];
 }
@@ -697,7 +736,7 @@ static PreferencesController *prefs = nil;
 {
     NSMutableDictionary *loginwindow;
     NSMutableArray *loginarray;
 {
     NSMutableDictionary *loginwindow;
     NSMutableArray *loginarray;
-    
+    ITDebugLog(@"Setting launches at login: %i", flag);
     [df synchronize];
     loginwindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy];
     loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
     [df synchronize];
     loginwindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy];
     loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
@@ -720,6 +759,7 @@ static PreferencesController *prefs = nil;
     [df setPersistentDomain:loginwindow forName:@"loginwindow"];
     [df synchronize];
     [loginwindow release];
     [df setPersistentDomain:loginwindow forName:@"loginwindow"];
     [df synchronize];
     [loginwindow release];
+    ITDebugLog(@"Finished setting launches at login.");
 }
 
 
 }
 
 
@@ -743,38 +783,66 @@ static PreferencesController *prefs = nil;
 {
     if (aTableView == menuTableView) {
         return [myItems count];
 {
     if (aTableView == menuTableView) {
         return [myItems count];
-    } else {
+    } else if (aTableView == allTableView) {
         return [availableItems count];
         return [availableItems count];
+    } else if (aTableView == hotKeysTableView) {
+        return [hotKeysArray count];
+    } else {
+        return [[[NetworkController sharedController] remoteServices] count];
     }
 }
 
 - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex
 {
     if (aTableView == menuTableView) {
     }
 }
 
 - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex
 {
     if (aTableView == menuTableView) {
+        NSString *object = [myItems objectAtIndex:rowIndex];
         if ([[aTableColumn identifier] isEqualToString:@"name"]) {
         if ([[aTableColumn identifier] isEqualToString:@"name"]) {
-            NSString *object = [myItems objectAtIndex:rowIndex];
-            if ([object isEqualToString:@"Show Player"]) {
-                return [NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"show", @"Show"), [[controller currentRemote] playerSimpleName]];
+            if ([object isEqualToString:@"showPlayer"]) {
+                NSString *string;
+                NS_DURING
+                    string = [NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"show", @"Show"), [[controller currentRemote] playerSimpleName]];
+                NS_HANDLER
+                    [controller networkError:localException];
+                NS_ENDHANDLER
+                return string;
             }
             return NSLocalizedString(object, @"ERROR");
         } else {
             }
             return NSLocalizedString(object, @"ERROR");
         } else {
-            if ([submenuItems containsObject:[myItems objectAtIndex:rowIndex]])
+            if ([submenuItems containsObject:object])
             {
                 return [NSImage imageNamed:@"submenu"];
             } else {
                 return nil;
             }
         }
             {
                 return [NSImage imageNamed:@"submenu"];
             } else {
                 return nil;
             }
         }
-    } else {
+    } else if (aTableView == allTableView) {
+        NSString *object = [availableItems objectAtIndex:rowIndex];
         if ([[aTableColumn identifier] isEqualToString:@"name"]) {
         if ([[aTableColumn identifier] isEqualToString:@"name"]) {
-            return NSLocalizedString([availableItems objectAtIndex:rowIndex], @"ERROR");
+            if ([object isEqualToString:@"showPlayer"]) {
+                NSString *string;
+                NS_DURING
+                    string = [NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"show", @"Show"), [[controller currentRemote] playerSimpleName]];
+                NS_HANDLER
+                    [controller networkError:localException];
+                NS_ENDHANDLER
+                return string;
+            }
+            return NSLocalizedString(object, @"ERROR");
         } else {
         } else {
-            if ([submenuItems containsObject:[availableItems objectAtIndex:rowIndex]]) {
+            if ([submenuItems containsObject:object]) {
                 return [NSImage imageNamed:@"submenu"];
             } else {
                 return nil;
             }
         }
                 return [NSImage imageNamed:@"submenu"];
             } else {
                 return nil;
             }
         }
+    } else if (aTableView == hotKeysTableView) {
+        if ([[aTableColumn identifier] isEqualToString:@"name"]) {
+            return [hotKeyNamesArray objectAtIndex:rowIndex];
+        } else {
+            return [[hotKeysDictionary objectForKey:[hotKeysArray objectAtIndex:rowIndex]] description];
+        }
+    } else {
+        return [[[[NetworkController sharedController] remoteServices] objectAtIndex:rowIndex] name];
     }
 }
 
     }
 }
 
@@ -814,7 +882,7 @@ static PreferencesController *prefs = nil;
             } else {
                 [myItems removeObjectAtIndex:dragRow + 1];
             }
             } else {
                 [myItems removeObjectAtIndex:dragRow + 1];
             }
-        } else {
+        } else if (tableView == allTableView) {
             if (![temp isEqualToString:@"separator"]) {
                 [availableItems addObject:temp];
             }
             if (![temp isEqualToString:@"separator"]) {
                 [availableItems addObject:temp];
             }
@@ -847,7 +915,7 @@ static PreferencesController *prefs = nil;
         
         if ([[[info draggingPasteboard] types] containsObject:@"MenuTableViewPboardType"]) {
             NSString *item = [myItems objectAtIndex:[[[info draggingPasteboard] stringForType:@"MenuTableViewPboardType"] intValue]];
         
         if ([[[info draggingPasteboard] types] containsObject:@"MenuTableViewPboardType"]) {
             NSString *item = [myItems objectAtIndex:[[[info draggingPasteboard] stringForType:@"MenuTableViewPboardType"] intValue]];
-            if ([item isEqualToString:@"preferences"]) {
+            if ([item isEqualToString:@"preferences"] || [item isEqualToString:@"quit"]) {
                 return NSDragOperationNone;
             }
         }
                 return NSDragOperationNone;
             }
         }
@@ -860,7 +928,6 @@ static PreferencesController *prefs = nil;
     {
         return NSDragOperationNone;
     }
     {
         return NSDragOperationNone;
     }
-    
     return NSDragOperationGeneric;
 }
 
     return NSDragOperationGeneric;
 }
 
@@ -872,9 +939,8 @@ static PreferencesController *prefs = nil;
 
 - (void)dealloc
 {
 
 - (void)dealloc
 {
-    [self setKeyCombo:nil];
+    [hotKeysArray release];
     [hotKeysDictionary release];
     [hotKeysDictionary release];
-    [keyComboPanel release];
     [menuTableView setDataSource:nil];
     [allTableView setDataSource:nil];
     [controller release];
     [menuTableView setDataSource:nil];
     [allTableView setDataSource:nil];
     [controller release];
@@ -884,5 +950,4 @@ static PreferencesController *prefs = nil;
     [df release];
 }
 
     [df release];
 }
 
-
 @end
 @end