Adding a new proxy object for the networking. It's broken right now, but

[MenuTunes.git] / PreferencesController.m

diff --git a/PreferencesController.m b/PreferencesController.m
index 3d9e815..5f38b44 100755 (executable)
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -1,11 +1,18 @@
 #import "PreferencesController.h"
 #import "MainController.h"
 #import "PreferencesController.h"
 #import "MainController.h"

+#import "NetworkController.h"
+#import "NetworkObject.h"

 #import "StatusWindow.h"
 #import "StatusWindowController.h"
 #import "CustomMenuTableView.h"
 
 #import "StatusWindow.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>
 


@@ -62,6 +69,33 @@ static PreferencesController *prefs = nil;
     if ( (self = [super init]) ) {
         ITDebugLog(@"Preferences initialized.");
         df = [[NSUserDefaults standardUserDefaults] retain];
     if ( (self = [super init]) ) {
         ITDebugLog(@"Preferences initialized.");
         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;
     }


@@ -102,9 +136,14 @@ static PreferencesController *prefs = nil;
         [self setupUI]; // Sets up additional UI
         [window setDelegate:self];
         [menuTableView reloadData];
         [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 center];
     }
 
     [window center];


@@ -139,6 +178,112 @@ static PreferencesController *prefs = nil;
     [df synchronize];
 }
 
     [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;
+        SHA1(instring, strlen(instring), &result);
+        hashedPass = [NSData dataWithBytes:&result length:strlen(&result)];
+        SHA1(password, strlen(password), &result);
+        passwordStringHash = [NSData dataWithBytes:&result length:strlen(&result)];
+        if (![hashedPass isEqualToData:passwordStringHash]) {
+            [df setObject:hashedPass forKey:@"sharedPlayerPassword"];
+        }
+    } 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];
+        } else {
+            [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;
+        SHA1(instring, strlen(instring), &result);
+        [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];
+        
+        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]] 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);
+        }
+    }
+    [df synchronize];
+}
+

 - (IBAction)changeStatusWindowSetting:(id)sender
 {
     StatusWindow *sw = [StatusWindow sharedWindow];
 - (IBAction)changeStatusWindowSetting:(id)sender
 {
     StatusWindow *sw = [StatusWindow sharedWindow];


@@ -206,63 +351,6 @@ static PreferencesController *prefs = nil;
     [df synchronize];
 }
 
     [df synchronize];
 }
 

-- (IBAction)changeHotKey:(id)sender
-{
-    ITDebugLog(@"Changing hot keys.");
-    [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;


@@ -332,111 +420,6 @@ static PreferencesController *prefs = nil;
     [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
 }
 
     [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES];
 }
 

-- (IBAction)cancelHotKey:(id)sender
-{
-    ITDebugLog(@"Hot key canceled.");
-    [[NSNotificationCenter defaultCenter] removeObserver:self];
-    [NSApp endSheet:keyComboPanel];
-    [keyComboPanel orderOut:nil];
-}
-
-- (IBAction)clearHotKey:(id)sender
-{
-    ITDebugLog(@"Hot key cleared.");
-    [self setKeyCombo:[ITKeyCombo clearKeyCombo]];
-}
-
-- (IBAction)okHotKey:(id)sender
-{
-    NSString *string = [combo description];
-    NSEnumerator *enumerator = [hotKeysDictionary keyEnumerator];
-    NSString *enumKey;
-    
-    ITDebugLog(@"Hot key ok'd, saving.");
-    
-    if (string == nil) {
-        string = @"";
-    }
-    
-    ITDebugLog(@"Checking for duplicate hot keys.");
-    while ( (enumKey = [enumerator nextObject]) ) {
-        if (![enumKey isEqualToString:currentHotKey]) {
-            if (![combo isEqual:[ITKeyCombo clearKeyCombo]] &&
-                 [combo isEqual:[hotKeysDictionary objectForKey:enumKey]]) {
-                [window setLevel:NSNormalWindowLevel];
-                ITDebugLog(@"Duplicate hot key found: %@", enumKey);
-                if ( NSRunAlertPanel(NSLocalizedString(@"duplicateCombo", @"Duplicate Key Combo") , NSLocalizedString(@"duplicateCombo_msg", @"The specified key combo is already in use..."), NSLocalizedString(@"replace", @"Replace"), NSLocalizedString(@"cancel", @"Cancel"), nil) ) {
-                    [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:currentHotKey];
-                    if ([enumKey isEqualToString:@"PlayPause"]) {
-                        [playPauseButton setTitle:@"(None)"];
-                    } else if ([enumKey isEqualToString:@"NextTrack"]) {
-                        [nextTrackButton setTitle:@"(None)"];
-                    } else if ([enumKey isEqualToString:@"PrevTrack"]) {
-                        [previousTrackButton setTitle:@"(None)"];
-                    } else if ([enumKey isEqualToString:@"ShowPlayer"]) {
-                        [showPlayerButton setTitle:@"(None)"];
-                    } else if ([enumKey isEqualToString:@"TrackInfo"]) {
-                        [trackInfoButton setTitle:@"(None)"];
-                    } else if ([enumKey isEqualToString:@"UpcomingSongs"]) {
-                        [upcomingSongsButton setTitle:@"(None)"];
-                    } else if ([enumKey isEqualToString:@"IncrementVolume"]) {
-                        [volumeIncrementButton setTitle:@"(None)"];
-                    } else if ([enumKey isEqualToString:@"DecrementVolume"]) {
-                        [volumeDecrementButton setTitle:@"(None)"];
-                    } else if ([enumKey isEqualToString:@"IncrementRating"]) {
-                        [ratingIncrementButton setTitle:@"(None)"];
-                    } else if ([enumKey isEqualToString:@"DecrementRating"]) {
-                        [ratingDecrementButton setTitle:@"(None)"];
-                    } else if ([enumKey isEqualToString:@"ToggleShuffle"]) {
-                        [toggleShuffleButton setTitle:@"(None)"];
-                    } else if ([enumKey isEqualToString:@"ToggleLoop"]) {
-                        [toggleLoopButton setTitle:@"(None)"];
-                    }
-                    ITDebugLog(@"Saved hot key named %@.", enumKey);
-                    [df setObject:[[ITKeyCombo clearKeyCombo] plistRepresentation] forKey:enumKey];
-                    [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:enumKey];
-                } else {
-                    return;
-                }
-                [window setLevel:NSStatusWindowLevel];
-            }
-        }
-    }
-    
-    ITDebugLog(@"Saved hot key named %@.", currentHotKey);
-    [hotKeysDictionary setObject:combo forKey:currentHotKey];
-    [df setObject:[combo plistRepresentation] forKey:currentHotKey];
-    
-    ITDebugLog(@"Setting button name.");
-    if ([currentHotKey isEqualToString:@"PlayPause"]) {
-        [playPauseButton setTitle:string];
-    } else if ([currentHotKey isEqualToString:@"NextTrack"]) {
-        [nextTrackButton setTitle:string];
-    } 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];
-}
-

 - (void)deletePressedInTableView:(NSTableView *)tableView
 {
     if (tableView == menuTableView) {
 - (void)deletePressedInTableView:(NSTableView *)tableView
 {
     if (tableView == menuTableView) {


@@ -461,40 +444,62 @@ static PreferencesController *prefs = nil;
     }
 }
 
     }
 }
 

-

 /*************************************************************************/
 #pragma mark -
 #pragma mark HOTKEY SUPPORT METHODS
 /*************************************************************************/
 
 /*************************************************************************/
 #pragma mark -
 #pragma mark HOTKEY SUPPORT METHODS
 /*************************************************************************/
 

-- (void)setCurrentHotKey:(NSString *)key
+- (IBAction)clearHotKey:(id)sender

 {
 {

-    ITDebugLog(@"Setting current hot key to %@", key);
-    [currentHotKey autorelease];
-    currentHotKey = [key copy];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyEvent:) name:ITKeyBroadcasterKeyEvent object:nil];
-    [NSApp beginSheet:keyComboPanel modalForWindow:window modalDelegate:self didEndSelector:nil contextInfo:nil];
+    [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];
-    ITDebugLog(@"Setting key combo to %@", newCombo);
-    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


@@ -576,131 +581,24 @@ 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"]];
     
     ITDebugLog(@"Setting up preferences UI.");
     // Fill in the number of songs in advance to show field
     [songsInAdvance setIntValue:[df integerForKey:@"SongsInAdvance"]];
     

-    // Fill in hot key buttons
-    if ([df objectForKey:@"PlayPause"]) {
-        ITDebugLog(@"Setting up \"PlayPause\" hot key.");
-        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PlayPause"]];
-        [hotKeysDictionary setObject:anItem forKey:@"PlayPause"];
-        [playPauseButton setTitle:[anItem description]];
-    } else {
-        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"PlayPause"];
-        [playPauseButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
-    }
-    
-    if ([df objectForKey:@"NextTrack"]) {
-        ITDebugLog(@"Setting up \"NextTrack\" hot key.");
-        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"NextTrack"]];
-        [hotKeysDictionary setObject:anItem forKey:@"NextTrack"];
-        [nextTrackButton setTitle:[anItem description]];
-    } else {
-        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"NextTrack"];
-        [nextTrackButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
-    }
-    
-    if ([df objectForKey:@"PrevTrack"]) {
-        ITDebugLog(@"Setting up \"PrevTrack\" hot key.");
-        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PrevTrack"]];
-        [hotKeysDictionary setObject:anItem forKey:@"PrevTrack"];
-        [previousTrackButton setTitle:[anItem description]];
-    } else {
-        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"PrevTrack"];
-        [previousTrackButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
-    }
-    
-    if ([df objectForKey:@"ShowPlayer"]) {
-        ITDebugLog(@"Setting up \"ShowPlayer\" hot key.");
-        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ShowPlayer"]];
-        [hotKeysDictionary setObject:anItem forKey:@"ShowPlayer"];
-        [showPlayerButton setTitle:[anItem description]];
-    } else {
-        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"ShowPlayer"];
-        [showPlayerButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
-    }
-    
-    if ([df objectForKey:@"TrackInfo"]) {
-        ITDebugLog(@"Setting up \"TrackInfo\" hot key.");
-        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"TrackInfo"]];
-        [hotKeysDictionary setObject:anItem forKey:@"TrackInfo"];
-        [trackInfoButton setTitle:[anItem description]];
-    } else {
-        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"TrackInfo"];
-        [trackInfoButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
-    }
-    
-    if ([df objectForKey:@"UpcomingSongs"]) {
-        ITDebugLog(@"Setting up \"UpcomingSongs\" hot key.");
-        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"UpcomingSongs"]];
-        [hotKeysDictionary setObject:anItem forKey:@"UpcomingSongs"];
-        [upcomingSongsButton setTitle:[anItem description]];
-    } else {
-        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"UpcomingSongs"];
-        [upcomingSongsButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
-    }
-    
-    if ([df objectForKey:@"IncrementVolume"]) {
-        ITDebugLog(@"Setting up \"IncrementVolume\" hot key.");
-        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"IncrementVolume"]];
-        [hotKeysDictionary setObject:anItem forKey:@"IncrementVolume"];
-        [volumeIncrementButton setTitle:[anItem description]];
-    } else {
-        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"IncrementVolume"];
-        [volumeIncrementButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
-    }
-    
-    if ([df objectForKey:@"DecrementVolume"]) {
-        ITDebugLog(@"Setting up \"DecrementVolume\" hot key.");
-        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"DecrementVolume"]];
-        [hotKeysDictionary setObject:anItem forKey:@"DecrementVolume"];
-        [volumeDecrementButton setTitle:[anItem description]];
-    } else {
-        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"DecrementVolume"];
-        [volumeDecrementButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
-    }
-    
-    if ([df objectForKey:@"IncrementRating"]) {
-        ITDebugLog(@"Setting up \"IncrementRating\" hot key.");
-        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"IncrementRating"]];
-        [hotKeysDictionary setObject:anItem forKey:@"IncrementRating"];
-        [ratingIncrementButton setTitle:[anItem description]];
-    } else {
-        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"IncrementRating"];
-        [ratingIncrementButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
-    }
-    
-    if ([df objectForKey:@"DecrementRating"]) {
-        ITDebugLog(@"Setting up \"DecrementRating\" hot key.");
-        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"DecrementRating"]];
-        [hotKeysDictionary setObject:anItem forKey:@"DecrementRating"];
-        [ratingDecrementButton setTitle:[anItem description]];
-    } else {
-        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"DecrementRating"];
-        [ratingDecrementButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
-    }
-    
-    if ([df objectForKey:@"ToggleLoop"]) {
-        ITDebugLog(@"Setting up \"ToggleLoop\" hot key.");
-        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleLoop"]];
-        [hotKeysDictionary setObject:anItem forKey:@"ToggleLoop"];
-        [toggleLoopButton setTitle:[anItem description]];
-    } else {
-        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"ToggleLoop"];
-        [toggleLoopButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
-    }
+    // Fill hot key array
+    keyArrayEnum = [hotKeysArray objectEnumerator];

     
     

-    if ([df objectForKey:@"ToggleShuffle"]) {
-        ITDebugLog(@"Setting up \"ToggleShuffle\" hot key.");
-        anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleShuffle"]];
-        [hotKeysDictionary setObject:anItem forKey:@"ToggleShuffle"];
-        [toggleShuffleButton setTitle:[anItem description]];
-    } else {
-        [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"ToggleShuffle"];
-        [toggleShuffleButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
+    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.");
     }
     
     ITDebugLog(@"Setting up track info checkboxes.");


@@ -739,6 +637,45 @@ static PreferencesController *prefs = nil;
     [vanishSpeedSlider     setFloatValue:-([df floatForKey:@"statusWindowVanishSpeed"])];
     [vanishDelaySlider     setFloatValue:[df floatForKey:@"statusWindowVanishDelay"]];
     [showOnChangeCheckbox  setState:([df boolForKey:@"showSongInfoOnChange"] ? NSOnState : NSOffState)];
     [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


@@ -799,8 +736,12 @@ 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];

     }
 }
 
     }
 }
 


@@ -810,7 +751,13 @@ static PreferencesController *prefs = nil;
         NSString *object = [myItems objectAtIndex:rowIndex];
         if ([[aTableColumn identifier] isEqualToString:@"name"]) {
             if ([object isEqualToString:@"showPlayer"]) {
         NSString *object = [myItems objectAtIndex:rowIndex];
         if ([[aTableColumn identifier] isEqualToString:@"name"]) {
             if ([object isEqualToString:@"showPlayer"]) {

-                return [NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"show", @"Show"), [[controller currentRemote] playerSimpleName]];
+                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 {


@@ -821,11 +768,17 @@ static PreferencesController *prefs = nil;
                 return nil;
             }
         }
                 return nil;
             }
         }

-    } else {
+    } else if (aTableView == allTableView) {

         NSString *object = [availableItems objectAtIndex:rowIndex];
         if ([[aTableColumn identifier] isEqualToString:@"name"]) {
             if ([object isEqualToString:@"showPlayer"]) {
         NSString *object = [availableItems objectAtIndex:rowIndex];
         if ([[aTableColumn identifier] isEqualToString:@"name"]) {
             if ([object isEqualToString:@"showPlayer"]) {

-                return [NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"show", @"Show"), [[controller currentRemote] playerSimpleName]];
+                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 {


@@ -835,6 +788,18 @@ static PreferencesController *prefs = nil;
                 return nil;
             }
         }
                 return nil;
             }
         }

+    } else if (aTableView == hotKeysTableView) {
+        if ([[aTableColumn identifier] isEqualToString:@"name"]) {
+            return [hotKeyNamesArray objectAtIndex:rowIndex];
+        } else {
+            return [[hotKeysDictionary objectForKey:[hotKeysArray objectAtIndex:rowIndex]] description];
+        }
+    } else {
+        if ([[aTableColumn identifier] isEqualToString:@"name"]) {
+            return [[[[NetworkController sharedController] remoteServices] objectAtIndex:rowIndex] name];
+        } else {
+            return @"X";
+        }

     }
 }
 
     }
 }
 


@@ -874,7 +839,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];
             }


@@ -920,7 +885,6 @@ static PreferencesController *prefs = nil;
     {
         return NSDragOperationNone;
     }
     {
         return NSDragOperationNone;
     }

-    

     return NSDragOperationGeneric;
 }
 
     return NSDragOperationGeneric;
 }
 


@@ -932,9 +896,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];


@@ -944,5 +907,4 @@ static PreferencesController *prefs = nil;
     [df release];
 }
 
     [df release];
 }
 

-

 @end
 @end