{
if ( (self = [super init]) ) {
df = [[NSUserDefaults standardUserDefaults] retain];
+ hotKeysDictionary = [[NSMutableDictionary alloc] init];
controller = nil;
}
return self;
- (IBAction)changeGeneralSetting:(id)sender
{
- if ( [sender tag] == 101) {
+ BOOL rebuildRequired = NO;
+
+ if ( [sender tag] == 1010) {
[self setLaunchesAtLogin:SENDER_STATE];
- } else if ( [sender tag] == 102) {
+ } else if ( [sender tag] == 1020) {
[df setBool:SENDER_STATE forKey:@"LaunchPlayerWithMT"];
- } else if ( [sender tag] == 103) {
+ } else if ( [sender tag] == 1030) {
[df setInteger:[sender intValue] forKey:@"SongsInAdvance"];
- } else if ( [sender tag] == 104) {
- [df setBool:SENDER_STATE forKey:@"showAlbum"];
- } else if ( [sender tag] == 105) {
- [df setBool:SENDER_STATE forKey:@"showName"];
- } else if ( [sender tag] == 106) {
+ rebuildRequired = YES;
+ } else if ( [sender tag] == 1040) {
+ // This will not be executed. Song info always shows the title of the song.
+ // [df setBool:SENDER_STATE forKey:@"showName"];
+ // rebuildRequired = YES;
+ } else if ( [sender tag] == 1050) {
[df setBool:SENDER_STATE forKey:@"showArtist"];
- } else if ( [sender tag] == 107) {
+ rebuildRequired = YES;
+ } else if ( [sender tag] == 1060) {
+ [df setBool:SENDER_STATE forKey:@"showAlbum"];
+ rebuildRequired = YES;
+ } else if ( [sender tag] == 1070) {
[df setBool:SENDER_STATE forKey:@"showTime"];
- } else if ( [sender tag] == 108) {
+ rebuildRequired = YES;
+ } else if ( [sender tag] == 1080) {
[df setBool:SENDER_STATE forKey:@"showTrackNumber"];
- } else if ( [sender tag] == 109) {
+ rebuildRequired = YES;
+ } else if ( [sender tag] == 1090) {
[df setBool:SENDER_STATE forKey:@"showTrackRating"];
+ rebuildRequired = YES;
}
+
+ if ( rebuildRequired ) {
+ [controller rebuildMenu];
+ // redraw song info status window, or upcoming songs here
+ }
+
+ [df synchronize];
}
- (IBAction)changeStatusWindowSetting:(id)sender
{
- if ( [sender tag] == 201) {
+ if ( [sender tag] == 2010) {
[df setInteger:[sender selectedRow] forKey:@"statusWindowVerticalPosition"];
[df setInteger:[sender selectedColumn] forKey:@"statusWindowHorizontalPosition"];
// update the window's position here
- } else if ( [sender tag] == 202) {
+ } else if ( [sender tag] == 2020) {
// update screen selection
- } else if ( [sender tag] == 203) {
+ } else if ( [sender tag] == 2030) {
// Update appearance effect
- } else if ( [sender tag] == 204) {
+ } else if ( [sender tag] == 2040) {
// Update Vanish Effect
- } else if ( [sender tag] == 205) {
+ } else if ( [sender tag] == 2050) {
// Update appearance speed
- } else if ( [sender tag] == 206) {
+ } else if ( [sender tag] == 2060) {
// Update vanish speed
- } else if ( [sender tag] == 207) {
+ } else if ( [sender tag] == 2070) {
// Update vanish delay
- } else if ( [sender tag] == 208) {
+ } else if ( [sender tag] == 2080) {
// Update "Song Info window when song changes" setting.
+ [df setBool:SENDER_STATE forKey:@"showSongInfoOnChange"];
}
}
-- (IBAction)apply:(id)sender
+- (IBAction)changeHotKey:(id)sender
{
- //Set key combos
- [df setKeyCombo:playPauseCombo forKey:@"PlayPause"];
- [df setKeyCombo:nextTrackCombo forKey:@"NextTrack"];
- [df setKeyCombo:prevTrackCombo forKey:@"PrevTrack"];
- [df setKeyCombo:trackInfoCombo forKey:@"TrackInfo"];
- [df setKeyCombo:upcomingSongsCombo forKey:@"UpcomingSongs"];
- [df setKeyCombo:volumeIncrementCombo forKey:@"IncrementVolume"];
- [df setKeyCombo:volumeDecrementCombo forKey:@"DecrementVolume"];
- [df setKeyCombo:ratingIncrementCombo forKey:@"IncrementRating"];
- [df setKeyCombo:ratingDecrementCombo forKey:@"DecrementRating"];
- [df setKeyCombo:toggleLoopCombo forKey:@"ToggleLoop"];
- [df setKeyCombo:toggleShuffleCombo forKey:@"ToggleShuffle"];
-
- //Set info checkboxes
- [df setBool:[albumCheckbox state] forKey:@"showAlbum"];
- [df setBool:[nameCheckbox state] forKey:@"showName"];
- [df setBool:[artistCheckbox state] forKey:@"showArtist"];
- [df setBool:[trackTimeCheckbox state] forKey:@"showTime"];
-
- //Here we set whether we will launch at login by modifying loginwindow.plist
-
- //Set songs in advance
- if ([songsInAdvance intValue]) {
- [df setInteger:[songsInAdvance intValue] forKey:@"SongsInAdvance"];
- } else {
- [df setInteger:5 forKey:@"SongsInAdvance"];
+ 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:@"ToggleVisualizer"]];
+ [self setCurrentHotKey:@"ToggleVisualizer"];
+ 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;
}
-
- /*{
- NSArray *apps = [[NSWorkspace sharedWorkspace] launchedApplications];
- int i;
-
- for (i = 0; i < [apps count]; i++) {
- if ([[[apps objectAtIndex:i] objectForKey:@"NSApplicationName"]
- isEqualToString:@"iTunes"]) {
- [controller rebuildMenu];
- }
- }
- }*/
- [controller clearHotKeys];
}
- (void)registerDefaults
nil] forKey:@"menu"];
[df setInteger:5 forKey:@"SongsInAdvance"];
- [df setBool:YES forKey:@"showName"];
+ // [df setBool:YES forKey:@"showName"]; // Song info will always show song title.
[df setBool:YES forKey:@"showArtist"];
[df setBool:NO forKey:@"showAlbum"];
[df setBool:NO forKey:@"showTime"];
- (IBAction)okHotKey:(id)sender
{
NSString *string = [combo userDisplayRep];
+ NSEnumerator *enumerator = [hotKeysDictionary keyEnumerator];
+ NSString *enumKey;
+ BOOL duplicateCombo = NO;
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;
- }
- playPauseCombo = [combo copy];
- [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];
- [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];
- [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];
- [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];
- [upcomingSongsButton setTitle:string];
- //THE NEW COMBOS!
- } else if ([setHotKey isEqualToString:@"IncrementVolume"]) {
- if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] ||
- [combo isEqual:trackInfoCombo] || [combo isEqual:playPauseCombo] ||
- [combo isEqual:ratingIncrementCombo] || [combo isEqual:ratingDecrementCombo] ||
- [combo isEqual:upcomingSongsCombo] || [combo isEqual:volumeDecrementCombo] ||
- [combo isEqual:toggleLoopCombo] || [combo isEqual:toggleShuffleCombo]) &&
- !(([combo modifiers] == -1) && ([combo keyCode] == -1))) {
-
- [window setLevel:NSNormalWindowLevel];
- NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil);
- [window setLevel:NSStatusWindowLevel];
- return;
- }
- volumeIncrementCombo = [combo copy];
- [volumeIncrementButton setTitle:string];
- } else if ([setHotKey isEqualToString:@"DecrementVolume"]) {
- if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] ||
- [combo isEqual:trackInfoCombo] || [combo isEqual:playPauseCombo] ||
- [combo isEqual:ratingIncrementCombo] || [combo isEqual:ratingDecrementCombo] ||
- [combo isEqual:volumeIncrementCombo] || [combo isEqual:upcomingSongsCombo] ||
- [combo isEqual:toggleLoopCombo] || [combo isEqual:toggleShuffleCombo]) &&
- !(([combo modifiers] == -1) && ([combo keyCode] == -1))) {
-
- [window setLevel:NSNormalWindowLevel];
- NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil);
- [window setLevel:NSStatusWindowLevel];
- return;
- }
- volumeDecrementCombo = [combo copy];
- [volumeDecrementButton setTitle:string];
- } else if ([setHotKey isEqualToString:@"IncrementRating"]) {
- if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] ||
- [combo isEqual:trackInfoCombo] || [combo isEqual:playPauseCombo] ||
- [combo isEqual:upcomingSongsCombo] || [combo isEqual:ratingDecrementCombo] ||
- [combo isEqual:volumeIncrementCombo] || [combo isEqual:volumeDecrementCombo] ||
- [combo isEqual:toggleLoopCombo] || [combo isEqual:toggleShuffleCombo]) &&
- !(([combo modifiers] == -1) && ([combo keyCode] == -1))) {
-
- [window setLevel:NSNormalWindowLevel];
- NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil);
- [window setLevel:NSStatusWindowLevel];
- return;
- }
- ratingIncrementCombo = [combo copy];
- [ratingIncrementButton setTitle:string];
- } else if ([setHotKey isEqualToString:@"DecrementRating"]) {
- if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] ||
- [combo isEqual:trackInfoCombo] || [combo isEqual:playPauseCombo] ||
- [combo isEqual:ratingIncrementCombo] || [combo isEqual:upcomingSongsCombo] ||
- [combo isEqual:volumeIncrementCombo] || [combo isEqual:volumeDecrementCombo] ||
- [combo isEqual:toggleLoopCombo] || [combo isEqual:toggleShuffleCombo]) &&
- !(([combo modifiers] == -1) && ([combo keyCode] == -1))) {
-
- [window setLevel:NSNormalWindowLevel];
- NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil);
- [window setLevel:NSStatusWindowLevel];
- return;
- }
- ratingDecrementCombo = [combo copy];
- [ratingDecrementButton setTitle:string];
- } else if ([setHotKey isEqualToString:@"ToggleLoop"]) {
- if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] ||
- [combo isEqual:trackInfoCombo] || [combo isEqual:playPauseCombo] ||
- [combo isEqual:ratingIncrementCombo] || [combo isEqual:ratingDecrementCombo] ||
- [combo isEqual:volumeIncrementCombo] || [combo isEqual:volumeDecrementCombo] ||
- [combo isEqual:upcomingSongsCombo] || [combo isEqual:toggleShuffleCombo]) &&
- !(([combo modifiers] == -1) && ([combo keyCode] == -1))) {
-
- [window setLevel:NSNormalWindowLevel];
- NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil);
- [window setLevel:NSStatusWindowLevel];
- return;
+
+ while ( (enumKey = [enumerator nextObject]) ) {
+ if (![enumKey isEqualToString:currentHotKey]) {
+ if (![combo isEqual:[KeyCombo clearKeyCombo]] &&
+ [combo isEqual:[hotKeysDictionary objectForKey:enumKey]]) {
+ //Ask if we want to clear duplicate key and set this one
+ [window setLevel:NSNormalWindowLevel];
+ NSLog(@"Duplicate Combo! Ask what to do!");
+ [window setLevel:NSStatusWindowLevel];
+ duplicateCombo = YES;
+ }
}
- 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;
+ }
+
+ if (!duplicateCombo) {
+ [hotKeysDictionary setObject:combo 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:@"ToggleVisualizer"]) {
+ [visualizerButton 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];
}
- toggleShuffleCombo = [combo copy];
- [toggleShuffleButton setTitle:string];
+
+ [df setKeyCombo:combo forKey:currentHotKey];
+ //[controller rebuildMenu];
}
+
[self cancelHotKey:sender];
}
-- (IBAction)setNewHotKey:(id)sender
-{
- switch ([sender tag])
- {
- case 401:
- [self setKeyCombo:playPauseCombo];
- [self setHotKey:@"PlayPause"];
- break;
- case 402:
- [self setKeyCombo:nextTrackCombo];
- [self setHotKey:@"NextTrack"];
- break;
- case 403:
- [self setKeyCombo:prevTrackCombo];
- [self setHotKey:@"PrevTrack"];
- break;
- case 404:
- [self setKeyCombo:toggleLoopCombo];
- [self setHotKey:@"ToggleLoop"];
- break;
- case 405:
- [self setKeyCombo:toggleShuffleCombo];
- [self setHotKey:@"ToggleShuffle"];
- break;
- case 406:
- [self setKeyCombo:trackInfoCombo];
- [self setHotKey:@"TrackInfo"];
- break;
- case 407:
- [self setKeyCombo:upcomingSongsCombo];
- [self setHotKey:@"UpcomingSongs"];
- break;
- case 408:
- [self setKeyCombo:volumeIncrementCombo];
- [self setHotKey:@"IncrementVolume"];
- break;
- case 409:
- [self setKeyCombo:volumeDecrementCombo];
- [self setHotKey:@"DecrementVolume"];
- break;
- case 410:
- [self setKeyCombo:ratingIncrementCombo];
- [self setHotKey:@"IncrementRating"];
- break;
- case 411:
- [self setKeyCombo:ratingDecrementCombo];
- [self setHotKey:@"DecrementRating"];
- break;
- }
-}
/*************************************************************************/
#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];
}
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 {
- prevTrackCombo = [[KeyCombo alloc] init];
+ [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"PrevTrack"];
+ }
+
+ if ([df objectForKey:@"ToggleVisualizer"]) {
+ anItem = [df keyComboForKey:@"ToggleVisualizer"];
+ [hotKeysDictionary setObject:anItem forKey:@"ToggleVisualizer"];
+ [visualizerButton setTitle:[anItem userDisplayRep]];
+ } else {
+ [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
[albumCheckbox setState:[df boolForKey:@"showAlbum"] ? NSOnState : NSOffState];
- [nameCheckbox setState:[df boolForKey:@"showName"] ? NSOnState : NSOffState];
+ [nameCheckbox setState:NSOnState]; // Song info will ALWAYS show song title.
+ [nameCheckbox setEnabled:NO]; // Song info will ALWAYS show song title.
[artistCheckbox setState:[df boolForKey:@"showArtist"] ? NSOnState : NSOffState];
[trackTimeCheckbox setState:[df boolForKey:@"showTime"] ? NSOnState : NSOffState];
{
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]])
{
- (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];
git.ithinksw.org / MenuTunes.git / blobdiff