X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/d874a259ba070bb282b894ebe6473eceef757822..3901916d25083f444f6568081a70308164c4f833:/PreferencesController.m diff --git a/PreferencesController.m b/PreferencesController.m index c230e13..802fdcb 100755 --- a/PreferencesController.m +++ b/PreferencesController.m @@ -1,5 +1,5 @@ #import "PreferencesController.h" -#import "MainController.h" +#import "NewMainController.h" #import "HotKeyCenter.h" #import @@ -48,6 +48,7 @@ static PreferencesController *prefs = nil; { if ( (self = [super init]) ) { df = [[NSUserDefaults standardUserDefaults] retain]; + hotKeysDictionary = [[NSMutableDictionary alloc] init]; controller = nil; } return self; @@ -125,7 +126,7 @@ static PreferencesController *prefs = nil; } if ( rebuildRequired ) { - [controller rebuildMenu]; + //[controller rebuildMenu]; // redraw song info status window, or upcoming songs here } @@ -152,6 +153,7 @@ static PreferencesController *prefs = nil; // Update vanish delay } else if ( [sender tag] == 2080) { // Update "Song Info window when song changes" setting. + [df setBool:SENDER_STATE forKey:@"showSongInfoOnChange"]; } } @@ -160,48 +162,52 @@ static PreferencesController *prefs = nil; switch ([sender tag]) { case 4010: - [self setKeyCombo:playPauseCombo]; - [self setHotKey:@"PlayPause"]; + [self setKeyCombo:[hotKeysDictionary objectForKey:@"PlayPause"]]; + [self setCurrentHotKey:@"PlayPause"]; break; case 4020: - [self setKeyCombo:nextTrackCombo]; - [self setHotKey:@"NextTrack"]; + [self setKeyCombo:[hotKeysDictionary objectForKey:@"NextTrack"]]; + [self setCurrentHotKey:@"NextTrack"]; break; case 4030: - [self setKeyCombo:prevTrackCombo]; - [self setHotKey:@"PrevTrack"]; + [self setKeyCombo:[hotKeysDictionary objectForKey:@"PrevTrack"]]; + [self setCurrentHotKey:@"PrevTrack"]; + break; + case 4035: + [self setKeyCombo:[hotKeysDictionary objectForKey:@"ToggleVisualizer"]]; + [self setCurrentHotKey:@"ToggleVisualizer"]; break; case 4040: - [self setKeyCombo:toggleLoopCombo]; - [self setHotKey:@"ToggleLoop"]; + [self setKeyCombo:[hotKeysDictionary objectForKey:@"ToggleLoop"]]; + [self setCurrentHotKey:@"ToggleLoop"]; break; case 4050: - [self setKeyCombo:toggleShuffleCombo]; - [self setHotKey:@"ToggleShuffle"]; + [self setKeyCombo:[hotKeysDictionary objectForKey:@"ToggleShuffle"]]; + [self setCurrentHotKey:@"ToggleShuffle"]; break; case 4060: - [self setKeyCombo:trackInfoCombo]; - [self setHotKey:@"TrackInfo"]; + [self setKeyCombo:[hotKeysDictionary objectForKey:@"TrackInfo"]]; + [self setCurrentHotKey:@"TrackInfo"]; break; case 4070: - [self setKeyCombo:upcomingSongsCombo]; - [self setHotKey:@"UpcomingSongs"]; + [self setKeyCombo:[hotKeysDictionary objectForKey:@"UpcomingSongs"]]; + [self setCurrentHotKey:@"UpcomingSongs"]; break; case 4080: - [self setKeyCombo:volumeIncrementCombo]; - [self setHotKey:@"IncrementVolume"]; + [self setKeyCombo:[hotKeysDictionary objectForKey:@"IncrementVolume"]]; + [self setCurrentHotKey:@"IncrementVolume"]; break; case 4090: - [self setKeyCombo:volumeDecrementCombo]; - [self setHotKey:@"DecrementVolume"]; + [self setKeyCombo:[hotKeysDictionary objectForKey:@"DecrementVolume"]]; + [self setCurrentHotKey:@"DecrementVolume"]; break; case 4100: - [self setKeyCombo:ratingIncrementCombo]; - [self setHotKey:@"IncrementRating"]; + [self setKeyCombo:[hotKeysDictionary objectForKey:@"IncrementRating"]]; + [self setCurrentHotKey:@"IncrementRating"]; break; case 4110: - [self setKeyCombo:ratingDecrementCombo]; - [self setHotKey:@"DecrementRating"]; + [self setKeyCombo:[hotKeysDictionary objectForKey:@"DecrementRating"]]; + [self setCurrentHotKey:@"DecrementRating"]; break; } } @@ -226,7 +232,7 @@ static PreferencesController *prefs = nil; @"Playlists", @"Song Rating", @"", - @"PreferencesÉ", + @"Preferences", @"Quit", @"", @"Current Track Info", @@ -288,176 +294,93 @@ static PreferencesController *prefs = nil; - (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 isEqual:ratingIncrementCombo] || [combo isEqual:ratingDecrementCombo] || - [combo isEqual:volumeIncrementCombo] || [combo isEqual:volumeDecrementCombo] || - [combo isEqual:toggleLoopCombo] || [combo isEqual:toggleShuffleCombo]) && - !(([combo modifiers] == -1) && ([combo keyCode] == -1))) { - - [window setLevel:NSNormalWindowLevel]; - 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(@"Duplicate Key Combo", @"The specified key combo is already in use...", @"Replace", @"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:@"ToggleVisualizer"]) { + [visualizerButton 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 isEqual:ratingIncrementCombo] || [combo isEqual:ratingDecrementCombo] || - [combo isEqual:volumeIncrementCombo] || [combo isEqual:volumeDecrementCombo] || - [combo isEqual:toggleLoopCombo] || [combo isEqual:toggleShuffleCombo]) && - !(([combo modifiers] == -1) && ([combo keyCode] == -1))) { - - [window setLevel:NSNormalWindowLevel]; - 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 isEqual:ratingIncrementCombo] || [combo isEqual:ratingDecrementCombo] || - [combo isEqual:volumeIncrementCombo] || [combo isEqual:volumeDecrementCombo] || - [combo isEqual:toggleLoopCombo] || [combo isEqual:toggleShuffleCombo]) && - !(([combo modifiers] == -1) && ([combo keyCode] == -1))) { - - [window setLevel:NSNormalWindowLevel]; - 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 isEqual:ratingIncrementCombo] || [combo isEqual:ratingDecrementCombo] || - [combo isEqual:volumeIncrementCombo] || [combo isEqual:volumeDecrementCombo] || - [combo isEqual:toggleLoopCombo] || [combo isEqual:toggleShuffleCombo]) && - !(([combo modifiers] == -1) && ([combo keyCode] == -1))) { - - [window setLevel:NSNormalWindowLevel]; - 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:@"ToggleVisualizer"]) { + [visualizerButton setTitle:string]; + //[[HotKeyCenter sharedCenter] addHotKey:@"ToggleVisualizer" combo:combo target:[MainController sharedController] selector:@selector(NULL)]; + } 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 isEqual:ratingIncrementCombo] || [combo isEqual:ratingDecrementCombo] || - [combo isEqual:volumeIncrementCombo] || [combo isEqual:volumeDecrementCombo] || - [combo isEqual:toggleLoopCombo] || [combo isEqual:toggleShuffleCombo]) && - !(([combo modifiers] == -1) && ([combo keyCode] == -1))) { - - [window setLevel:NSNormalWindowLevel]; - 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]; - //THE NEW COMBOS! - } else if ([setHotKey isEqualToString:@"IncrementVolume"]) { - if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] || - [combo isEqual:trackInfoCombo] || [combo isEqual:playPauseCombo] || - [combo isEqual:ratingIncrementCombo] || [combo isEqual:ratingDecrementCombo] || - [combo isEqual:upcomingSongsCombo] || [combo isEqual:volumeDecrementCombo] || - [combo isEqual:toggleLoopCombo] || [combo isEqual:toggleShuffleCombo]) && - !(([combo modifiers] == -1) && ([combo keyCode] == -1))) { - - [window setLevel:NSNormalWindowLevel]; - NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil); - [window setLevel:NSStatusWindowLevel]; - return; - } - volumeIncrementCombo = [combo copy]; + [[HotKeyCenter sharedCenter] addHotKey:@"UpcomingSongs" combo:combo target:[MainController sharedController] action:@selector(showUpcomingSongs)]; + } else if ([currentHotKey isEqualToString:@"IncrementVolume"]) { [volumeIncrementButton setTitle:string]; - } else if ([setHotKey isEqualToString:@"DecrementVolume"]) { - if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] || - [combo isEqual:trackInfoCombo] || [combo isEqual:playPauseCombo] || - [combo isEqual:ratingIncrementCombo] || [combo isEqual:ratingDecrementCombo] || - [combo isEqual:volumeIncrementCombo] || [combo isEqual:upcomingSongsCombo] || - [combo isEqual:toggleLoopCombo] || [combo isEqual:toggleShuffleCombo]) && - !(([combo modifiers] == -1) && ([combo keyCode] == -1))) { - - [window setLevel:NSNormalWindowLevel]; - NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil); - [window setLevel:NSStatusWindowLevel]; - return; - } - volumeDecrementCombo = [combo copy]; + [[HotKeyCenter sharedCenter] addHotKey:@"IncrementVolume" combo:combo target:[MainController sharedController] action:@selector(incrementVolume)]; + } else if ([currentHotKey isEqualToString:@"DecrementVolume"]) { [volumeDecrementButton setTitle:string]; - } else if ([setHotKey isEqualToString:@"IncrementRating"]) { - if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] || - [combo isEqual:trackInfoCombo] || [combo isEqual:playPauseCombo] || - [combo isEqual:upcomingSongsCombo] || [combo isEqual:ratingDecrementCombo] || - [combo isEqual:volumeIncrementCombo] || [combo isEqual:volumeDecrementCombo] || - [combo isEqual:toggleLoopCombo] || [combo isEqual:toggleShuffleCombo]) && - !(([combo modifiers] == -1) && ([combo keyCode] == -1))) { - - [window setLevel:NSNormalWindowLevel]; - NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil); - [window setLevel:NSStatusWindowLevel]; - return; - } - ratingIncrementCombo = [combo copy]; + [[HotKeyCenter sharedCenter] addHotKey:@"DecrementVolume" combo:combo target:[MainController sharedController] action:@selector(decrementVolume)]; + } else if ([currentHotKey isEqualToString:@"IncrementRating"]) { [ratingIncrementButton setTitle:string]; - } else if ([setHotKey isEqualToString:@"DecrementRating"]) { - if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] || - [combo isEqual:trackInfoCombo] || [combo isEqual:playPauseCombo] || - [combo isEqual:ratingIncrementCombo] || [combo isEqual:upcomingSongsCombo] || - [combo isEqual:volumeIncrementCombo] || [combo isEqual:volumeDecrementCombo] || - [combo isEqual:toggleLoopCombo] || [combo isEqual:toggleShuffleCombo]) && - !(([combo modifiers] == -1) && ([combo keyCode] == -1))) { - - [window setLevel:NSNormalWindowLevel]; - NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil); - [window setLevel:NSStatusWindowLevel]; - return; - } - ratingDecrementCombo = [combo copy]; + [[HotKeyCenter sharedCenter] addHotKey:@"IncrementRating" combo:combo target:[MainController sharedController] action:@selector(incrementRating)]; + } else if ([currentHotKey isEqualToString:@"DecrementRating"]) { [ratingDecrementButton setTitle:string]; - } else if ([setHotKey isEqualToString:@"ToggleLoop"]) { - if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] || - [combo isEqual:trackInfoCombo] || [combo isEqual:playPauseCombo] || - [combo isEqual:ratingIncrementCombo] || [combo isEqual:ratingDecrementCombo] || - [combo isEqual:volumeIncrementCombo] || [combo isEqual:volumeDecrementCombo] || - [combo isEqual:upcomingSongsCombo] || [combo isEqual:toggleShuffleCombo]) && - !(([combo modifiers] == -1) && ([combo keyCode] == -1))) { - - [window setLevel:NSNormalWindowLevel]; - NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil); - [window setLevel:NSStatusWindowLevel]; - return; - } - toggleLoopCombo = [combo copy]; - [toggleLoopButton setTitle:string]; - } else if ([setHotKey isEqualToString:@"ToggleShuffle"]) { - if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] || - [combo isEqual:trackInfoCombo] || [combo isEqual:playPauseCombo] || - [combo isEqual:ratingIncrementCombo] || [combo isEqual:ratingDecrementCombo] || - [combo isEqual:volumeIncrementCombo] || [combo isEqual:volumeDecrementCombo] || - [combo isEqual:toggleLoopCombo] || [combo isEqual:upcomingSongsCombo]) && - !(([combo modifiers] == -1) && ([combo keyCode] == -1))) { - - [window setLevel:NSNormalWindowLevel]; - NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil); - [window setLevel:NSStatusWindowLevel]; - return; - } - toggleShuffleCombo = [combo copy]; + [[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]; } @@ -469,9 +392,10 @@ static PreferencesController *prefs = nil; #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]; } @@ -584,86 +508,105 @@ static PreferencesController *prefs = nil; 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]]; + 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 { + [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"PrevTrack"]; + } + + if ([df objectForKey:@"ToggleVisualizer"]) { + anItem = [df keyComboForKey:@"ToggleVisualizer"]; + [hotKeysDictionary setObject:anItem forKey:@"ToggleVisualizer"]; + [visualizerButton setTitle:[anItem userDisplayRep]]; } else { - prevTrackCombo = [[KeyCombo alloc] init]; + [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"ToggleVisualizer"]; } 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 { - upcomingSongsCombo = [[KeyCombo alloc] init]; + [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"UpcomingSongs"]; } if ([df objectForKey:@"IncrementVolume"]) { - volumeIncrementCombo = [df keyComboForKey:@"IncrementVolume"]; - [volumeIncrementButton setTitle:[volumeIncrementCombo userDisplayRep]]; + anItem = [df keyComboForKey:@"IncrementVolume"]; + [hotKeysDictionary setObject:anItem forKey:@"IncrementVolume"]; + [volumeIncrementButton setTitle:[anItem userDisplayRep]]; } else { - volumeIncrementCombo = [[KeyCombo alloc] init]; + [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"IncrementVolume"]; } if ([df objectForKey:@"DecrementVolume"]) { - volumeDecrementCombo = [df keyComboForKey:@"DecrementVolume"]; - [volumeDecrementButton setTitle:[volumeDecrementCombo userDisplayRep]]; + anItem = [df keyComboForKey:@"DecrementVolume"]; + [hotKeysDictionary setObject:anItem forKey:@"DecrementVolume"]; + [volumeDecrementButton setTitle:[anItem userDisplayRep]]; } else { - volumeDecrementCombo = [[KeyCombo alloc] init]; + [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"DecrementVolume"]; } if ([df objectForKey:@"IncrementRating"]) { - ratingIncrementCombo = [df keyComboForKey:@"IncrementRating"]; - [ratingIncrementButton setTitle:[ratingIncrementCombo userDisplayRep]]; + anItem = [df keyComboForKey:@"IncrementRating"]; + [hotKeysDictionary setObject:anItem forKey:@"IncrementRating"]; + [ratingIncrementButton setTitle:[anItem userDisplayRep]]; } else { - ratingIncrementCombo = [[KeyCombo alloc] init]; + [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"IncrementRating"]; } if ([df objectForKey:@"DecrementRating"]) { - ratingDecrementCombo = [df keyComboForKey:@"DecrementRating"]; - [ratingDecrementButton setTitle:[ratingDecrementCombo userDisplayRep]]; + anItem = [df keyComboForKey:@"DecrementRating"]; + [hotKeysDictionary setObject:anItem forKey:@"DecrementRating"]; + [ratingDecrementButton setTitle:[anItem userDisplayRep]]; } else { - ratingDecrementCombo = [[KeyCombo alloc] init]; + [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"DecrementRating"]; } if ([df objectForKey:@"ToggleLoop"]) { - toggleLoopCombo = [df keyComboForKey:@"ToggleLoop"]; - [toggleLoopButton setTitle:[toggleLoopCombo userDisplayRep]]; + anItem = [df keyComboForKey:@"ToggleLoop"]; + [hotKeysDictionary setObject:anItem forKey:@"ToggleLoop"]; + [toggleLoopButton setTitle:[anItem userDisplayRep]]; } else { - toggleLoopCombo = [[KeyCombo alloc] init]; + [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"ToggleLoop"]; } if ([df objectForKey:@"ToggleShuffle"]) { - toggleShuffleCombo = [df keyComboForKey:@"ToggleShuffle"]; - [toggleShuffleButton setTitle:[toggleShuffleCombo userDisplayRep]]; + anItem = [df keyComboForKey:@"ToggleShuffle"]; + [hotKeysDictionary setObject:anItem forKey:@"ToggleShuffle"]; + [toggleShuffleButton setTitle:[anItem userDisplayRep]]; } else { - toggleShuffleCombo = [[KeyCombo alloc] init]; + [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"ToggleShuffle"]; } // Check current track info buttons @@ -690,7 +633,6 @@ static PreferencesController *prefs = nil; { [df setObject:myItems forKey:@"menu"]; [df synchronize]; - [controller rebuildMenu]; } - (void)setLaunchesAtLogin:(BOOL)flag @@ -778,7 +720,11 @@ static PreferencesController *prefs = nil; { if (aTableView == menuTableView) { if ([[aTableColumn identifier] isEqualToString:@"name"]) { - return [myItems objectAtIndex:rowIndex]; + NSString *object = [myItems objectAtIndex:rowIndex]; + if ([object isEqualToString:@"Show Player"]) { + return [NSString stringWithFormat:@"Show %@", [[controller currentRemote] playerSimpleName]]; + } + return object; } else { if ([submenuItems containsObject:[myItems objectAtIndex:rowIndex]]) { @@ -867,7 +813,7 @@ static PreferencesController *prefs = nil; 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; } } @@ -893,11 +839,7 @@ static PreferencesController *prefs = nil; - (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];