X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/c7cfb51853a76b548e9f3e073a63d44ce0a99258..24a440dccb5f6edb1e324e1cba03f373f89d0c30:/PreferencesController.m diff --git a/PreferencesController.m b/PreferencesController.m index 113f883..3f3a8b3 100755 --- a/PreferencesController.m +++ b/PreferencesController.m @@ -61,10 +61,8 @@ static PreferencesController *prefs = nil; - (void)setController:(id)object { -NSLog(@"foo"); [controller autorelease]; controller = [object retain]; -NSLog(@"bar"); } @@ -73,7 +71,6 @@ NSLog(@"bar"); #pragma mark INSTANCE METHODS /*************************************************************************/ - - (IBAction)showPrefsWindow:(id)sender { if (! window) { // If window does not exist yet, then the nib hasn't been loaded. @@ -100,6 +97,12 @@ NSLog(@"bar"); [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"]; @@ -180,6 +183,73 @@ NSLog(@"bar"); [controller clearHotKeys]; } +- (void)registerDefaults +{ + BOOL found = NO; + NSMutableDictionary *loginWindow; + NSMutableArray *loginArray; + NSEnumerator *loginEnum; + id anItem; + + [df setObject:[NSArray arrayWithObjects: + @"Play/Pause", + @"Next Track", + @"Previous Track", + @"Fast Forward", + @"Rewind", + @"Show Player", + @"", + @"Upcoming Songs", + @"Playlists", + @"Song Rating", + @"", + @"PreferencesÉ", + @"Quit", + @"", + @"Current Track Info", + nil] forKey:@"menu"]; + + [df setInteger:5 forKey:@"SongsInAdvance"]; + [df setBool:YES forKey:@"showName"]; + [df setBool:YES forKey:@"showArtist"]; + [df setBool:NO forKey:@"showAlbum"]; + [df setBool:NO forKey:@"showTime"]; + + [df synchronize]; + + loginWindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy]; + loginArray = [loginWindow objectForKey:@"AutoLaunchedApplicationDictionary"]; + loginEnum = [loginArray objectEnumerator]; + + while ( (anItem = [loginEnum nextObject]) ) { + if ( [[[anItem objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]] ) { + found = YES; + } + } + + [loginWindow release]; + + // This is teh sux + // We must fix it so it is no longer suxy + if (!found) { + if (NSRunInformationalAlertPanel(@"Auto-launch MenuTunes", @"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); + } + } +} + - (IBAction)cancelHotKey:(id)sender { [[NSNotificationCenter defaultCenter] removeObserver:self]; @@ -201,7 +271,10 @@ NSLog(@"bar"); } if ([setHotKey isEqualToString:@"PlayPause"]) { if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] || - [combo isEqual:trackInfoCombo] || [combo isEqual:upcomingSongsCombo]) && + [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]; @@ -213,7 +286,10 @@ NSLog(@"bar"); [playPauseButton setTitle:string]; } else if ([setHotKey isEqualToString:@"NextTrack"]) { if (([combo isEqual:playPauseCombo] || [combo isEqual:prevTrackCombo] || - [combo isEqual:trackInfoCombo] || [combo isEqual:upcomingSongsCombo]) && + [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]; @@ -225,7 +301,10 @@ NSLog(@"bar"); [nextTrackButton setTitle:string]; } else if ([setHotKey isEqualToString:@"PrevTrack"]) { if (([combo isEqual:nextTrackCombo] || [combo isEqual:playPauseCombo] || - [combo isEqual:trackInfoCombo] || [combo isEqual:upcomingSongsCombo]) && + [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]; @@ -237,7 +316,10 @@ NSLog(@"bar"); [previousTrackButton setTitle:string]; } else if ([setHotKey isEqualToString:@"TrackInfo"]) { if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] || - [combo isEqual:playPauseCombo] || [combo isEqual:upcomingSongsCombo]) && + [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]; @@ -249,7 +331,10 @@ NSLog(@"bar"); [trackInfoButton setTitle:string]; } else if ([setHotKey isEqualToString:@"UpcomingSongs"]) { if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] || - [combo isEqual:trackInfoCombo] || [combo isEqual:playPauseCombo]) && + [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]; @@ -259,38 +344,150 @@ NSLog(@"bar"); } 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; + } + 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]; + [toggleShuffleButton setTitle:string]; } [self cancelHotKey:sender]; } -- (IBAction)setCurrentTrackInfo:(id)sender -{ - [self setKeyCombo:trackInfoCombo]; - [self setHotKey:@"TrackInfo"]; -} - -- (IBAction)setNextTrack:(id)sender -{ - [self setKeyCombo:nextTrackCombo]; - [self setHotKey:@"NextTrack"]; -} - -- (IBAction)setPlayPause:(id)sender -{ - [self setKeyCombo:playPauseCombo]; - [self setHotKey:@"PlayPause"]; -} - -- (IBAction)setPreviousTrack:(id)sender -{ - [self setKeyCombo:prevTrackCombo]; - [self setHotKey:@"PrevTrack"]; -} - -- (IBAction)setUpcomingSongs:(id)sender +- (IBAction)setNewHotKey:(id)sender { - [self setKeyCombo:upcomingSongsCombo]; - [self setHotKey:@"UpcomingSongs"]; + 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; + } } @@ -384,6 +581,7 @@ NSLog(@"bar"); @"Previous Track", @"Fast Forward", @"Rewind", + @"Show Player", @"", nil]; @@ -424,28 +622,28 @@ NSLog(@"bar"); } else { playPauseCombo = [[KeyCombo alloc] init]; } - + if ([df objectForKey:@"NextTrack"]) { nextTrackCombo = [df keyComboForKey:@"NextTrack"]; [nextTrackButton setTitle:[nextTrackCombo userDisplayRep]]; } else { nextTrackCombo = [[KeyCombo alloc] init]; } - + if ([df objectForKey:@"PrevTrack"]) { prevTrackCombo = [df keyComboForKey:@"PrevTrack"]; [previousTrackButton setTitle:[prevTrackCombo userDisplayRep]]; } else { prevTrackCombo = [[KeyCombo alloc] init]; } - + if ([df objectForKey:@"TrackInfo"]) { trackInfoCombo = [df keyComboForKey:@"TrackInfo"]; [trackInfoButton setTitle:[trackInfoCombo userDisplayRep]]; } else { trackInfoCombo = [[KeyCombo alloc] init]; } - + if ([df objectForKey:@"UpcomingSongs"]) { upcomingSongsCombo = [df keyComboForKey:@"UpcomingSongs"]; [upcomingSongsButton setTitle:[upcomingSongsCombo userDisplayRep]]; @@ -453,6 +651,48 @@ NSLog(@"bar"); upcomingSongsCombo = [[KeyCombo alloc] init]; } + if ([df objectForKey:@"IncrementVolume"]) { + volumeIncrementCombo = [df keyComboForKey:@"IncrementVolume"]; + [volumeIncrementButton setTitle:[volumeIncrementCombo userDisplayRep]]; + } else { + volumeIncrementCombo = [[KeyCombo alloc] init]; + } + + if ([df objectForKey:@"DecrementVolume"]) { + volumeDecrementCombo = [df keyComboForKey:@"DecrementVolume"]; + [volumeDecrementButton setTitle:[volumeDecrementCombo userDisplayRep]]; + } else { + volumeDecrementCombo = [[KeyCombo alloc] init]; + } + + if ([df objectForKey:@"IncrementRating"]) { + ratingIncrementCombo = [df keyComboForKey:@"IncrementRating"]; + [ratingIncrementButton setTitle:[ratingIncrementCombo userDisplayRep]]; + } else { + ratingIncrementCombo = [[KeyCombo alloc] init]; + } + + if ([df objectForKey:@"DecrementRating"]) { + ratingDecrementCombo = [df keyComboForKey:@"DecrementRating"]; + [ratingDecrementButton setTitle:[ratingDecrementCombo userDisplayRep]]; + } else { + ratingDecrementCombo = [[KeyCombo alloc] init]; + } + + if ([df objectForKey:@"ToggleLoop"]) { + toggleLoopCombo = [df keyComboForKey:@"ToggleLoop"]; + [toggleLoopButton setTitle:[toggleLoopCombo userDisplayRep]]; + } else { + toggleLoopCombo = [[KeyCombo alloc] init]; + } + + if ([df objectForKey:@"ToggleShuffle"]) { + toggleShuffleCombo = [df keyComboForKey:@"ToggleShuffle"]; + [toggleShuffleButton setTitle:[toggleShuffleCombo userDisplayRep]]; + } else { + toggleShuffleCombo = [[KeyCombo alloc] init]; + } + // Check current track info buttons [albumCheckbox setState:[df boolForKey:@"showAlbum"] ? NSOnState : NSOffState]; [nameCheckbox setState:[df boolForKey:@"showName"] ? NSOnState : NSOffState]; @@ -463,7 +703,7 @@ NSLog(@"bar"); [df synchronize]; loginwindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy]; loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"]; - + loginEnum = [loginarray objectEnumerator]; while ( (anItem = [loginEnum nextObject]) ) { if ([[[anItem objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]]) {