X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/ef4f5a3e753596396e93ba33b7e2ab5e8b53c5d8..2c356967e9652ae92e46a9b5f96ac15a92db7691:/PreferencesController.m?ds=inline diff --git a/PreferencesController.m b/PreferencesController.m index 2206fab..ba70e0d 100755 --- a/PreferencesController.m +++ b/PreferencesController.m @@ -1,6 +1,9 @@ #import "PreferencesController.h" #import "MainController.h" #import "HotKeyCenter.h" +#import + +#define SENDER_STATE (([sender state] == NSOnState) ? YES : NO) /*************************************************************************/ #pragma mark - @@ -12,6 +15,8 @@ - (void)setupCustomizationTables; - (void)setupMenuItems; - (void)setupUI; +- (IBAction)changeMenus:(id)sender; +- (void)setLaunchesAtLogin:(BOOL)flag; @end @@ -61,10 +66,8 @@ static PreferencesController *prefs = nil; - (void)setController:(id)object { -NSLog(@"foo"); [controller autorelease]; controller = [object retain]; -NSLog(@"bar"); } @@ -73,7 +76,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. @@ -90,100 +92,168 @@ NSLog(@"bar"); [NSApp activateIgnoringOtherApps:YES]; } -- (IBAction)apply:(id)sender +- (IBAction)changeGeneralSetting:(id)sender { - [df setObject:myItems forKey:@"menu"]; - - //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"]; - - //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"]; + if ( [sender tag] == 1010) { + [self setLaunchesAtLogin:SENDER_STATE]; + } else if ( [sender tag] == 1020) { + [df setBool:SENDER_STATE forKey:@"LaunchPlayerWithMT"]; + } else if ( [sender tag] == 1030) { + [df setInteger:[sender intValue] forKey:@"SongsInAdvance"]; + } else if ( [sender tag] == 1040) { + [df setBool:SENDER_STATE forKey:@"showAlbum"]; + } else if ( [sender tag] == 1050) { + [df setBool:SENDER_STATE forKey:@"showName"]; + } else if ( [sender tag] == 1060) { + [df setBool:SENDER_STATE forKey:@"showArtist"]; + } else if ( [sender tag] == 1070) { + [df setBool:SENDER_STATE forKey:@"showTime"]; + } else if ( [sender tag] == 1080) { + [df setBool:SENDER_STATE forKey:@"showTrackNumber"]; + } else if ( [sender tag] == 1090) { + [df setBool:SENDER_STATE forKey:@"showTrackRating"]; + } +} + +- (IBAction)changeStatusWindowSetting:(id)sender +{ + 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] == 2020) { + // update screen selection + } else if ( [sender tag] == 2030) { + // Update appearance effect + } else if ( [sender tag] == 2040) { + // Update Vanish Effect + } else if ( [sender tag] == 2050) { + // Update appearance speed + } else if ( [sender tag] == 2060) { + // Update vanish speed + } else if ( [sender tag] == 2070) { + // Update vanish delay + } else if ( [sender tag] == 2080) { + // Update "Song Info window when song changes" setting. + } +} + +- (IBAction)changeHotKey:(id)sender +{ + switch ([sender tag]) + { + case 4010: + [self setKeyCombo:playPauseCombo]; + [self setHotKey:@"PlayPause"]; + break; + case 4020: + [self setKeyCombo:nextTrackCombo]; + [self setHotKey:@"NextTrack"]; + break; + case 4030: + [self setKeyCombo:prevTrackCombo]; + [self setHotKey:@"PrevTrack"]; + break; + case 4040: + [self setKeyCombo:toggleLoopCombo]; + [self setHotKey:@"ToggleLoop"]; + break; + case 4050: + [self setKeyCombo:toggleShuffleCombo]; + [self setHotKey:@"ToggleShuffle"]; + break; + case 4060: + [self setKeyCombo:trackInfoCombo]; + [self setHotKey:@"TrackInfo"]; + break; + case 4070: + [self setKeyCombo:upcomingSongsCombo]; + [self setHotKey:@"UpcomingSongs"]; + break; + case 4080: + [self setKeyCombo:volumeIncrementCombo]; + [self setHotKey:@"IncrementVolume"]; + break; + case 4090: + [self setKeyCombo:volumeDecrementCombo]; + [self setHotKey:@"DecrementVolume"]; + break; + case 4100: + [self setKeyCombo:ratingIncrementCombo]; + [self setHotKey:@"IncrementRating"]; + break; + case 4110: + [self setKeyCombo:ratingDecrementCombo]; + [self setHotKey:@"DecrementRating"]; + break; + } +} + +- (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]; - //Here we set whether we will launch at login by modifying loginwindow.plist - if ([launchAtLoginCheckbox state] == NSOnState) { - NSMutableDictionary *loginwindow; - NSMutableArray *loginarray; - ComponentInstance temp = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);; - int i; - BOOL skip = NO; - - [df synchronize]; - loginwindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy]; - loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"]; - - for (i = 0; i < [loginarray count]; i++) { - NSDictionary *tempDict = [loginarray objectAtIndex:i]; - if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]]) { - skip = YES; - } + 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; } - - if (!skip) { + } + + [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]]; - - AECreateDesc(typeChar, [script cString], [script cStringLength], - &scriptDesc); - - OSADoScript(temp, &scriptDesc, kOSANullScript, typeChar, kOSAModeCanInteract, &resultDesc); - + ComponentInstance asComponent = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype); + + AECreateDesc(typeChar, [script cString], [script cStringLength], + &scriptDesc); + + OSADoScript(asComponent, &scriptDesc, kOSANullScript, typeChar, kOSAModeCanInteract, &resultDesc); + AEDisposeDesc(&scriptDesc); AEDisposeDesc(&resultDesc); - CloseComponent(temp); - } - } else { - NSMutableDictionary *loginwindow; - NSMutableArray *loginarray; - int i; - - [df synchronize]; - loginwindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy]; - loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"]; - - for (i = 0; i < [loginarray count]; i++) { - NSDictionary *tempDict = [loginarray objectAtIndex:i]; - if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]]) { - [loginarray removeObjectAtIndex:i]; - [df setPersistentDomain:loginwindow forName:@"loginwindow"]; - [df synchronize]; - break; - } + + CloseComponent(asComponent); } } - - //Set songs in advance - if ([songsInAdvance intValue]) { - [df setInteger:[songsInAdvance intValue] forKey:@"SongsInAdvance"]; - } else { - [df setInteger:5 forKey:@"SongsInAdvance"]; - } - - /*{ - 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]; -} - -- (IBAction)cancel:(id)sender -{ - [window close]; - [controller closePreferences]; } - (IBAction)cancelHotKey:(id)sender @@ -203,11 +273,14 @@ NSLog(@"bar"); NSString *string = [combo userDisplayRep]; if (string == nil) { - string = @"None"; + string = @""; } 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]; @@ -219,7 +292,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]; @@ -231,7 +307,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]; @@ -243,7 +322,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]; @@ -255,7 +337,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]; @@ -265,46 +350,107 @@ 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)save:(id)sender -{ - [self apply:nil]; - [window close]; - [controller closePreferences]; -} - -- (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 -{ - [self setKeyCombo:upcomingSongsCombo]; - [self setHotKey:@"UpcomingSongs"]; -} +/*************************************************************************/ +#pragma mark - +#pragma mark HOTKEY SUPPORT METHODS +/*************************************************************************/ - (void)setHotKey:(NSString *)key { @@ -391,6 +537,7 @@ NSLog(@"bar"); @"Previous Track", @"Fast Forward", @"Rewind", + @"Show Player", @"", nil]; @@ -431,28 +578,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]]; @@ -460,6 +607,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]; @@ -470,7 +659,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]]) { @@ -479,6 +668,68 @@ NSLog(@"bar"); } } +- (IBAction)changeMenus:(id)sender +{ + [df setObject:myItems forKey:@"menu"]; + [df synchronize]; + [controller rebuildMenu]; +} + +- (void)setLaunchesAtLogin:(BOOL)flag +{ + if ( flag ) { + NSMutableDictionary *loginwindow; + NSMutableArray *loginarray; + ComponentInstance temp = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);; + int i; + BOOL skip = NO; + + [df synchronize]; + loginwindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy]; + loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"]; + + for (i = 0; i < [loginarray count]; i++) { + NSDictionary *tempDict = [loginarray objectAtIndex:i]; + if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]]) { + skip = YES; + } + } + + if (!skip) { + 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]]; + + AECreateDesc(typeChar, [script cString], [script cStringLength], + &scriptDesc); + + OSADoScript(temp, &scriptDesc, kOSANullScript, typeChar, kOSAModeCanInteract, &resultDesc); + + AEDisposeDesc(&scriptDesc); + AEDisposeDesc(&resultDesc); + CloseComponent(temp); + } + + } else { + NSMutableDictionary *loginwindow; + NSMutableArray *loginarray; + int i; + + [df synchronize]; + loginwindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy]; + loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"]; + + for (i = 0; i < [loginarray count]; i++) { + NSDictionary *tempDict = [loginarray objectAtIndex:i]; + if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]]) { + [loginarray removeObjectAtIndex:i]; + [df setPersistentDomain:loginwindow forName:@"loginwindow"]; + [df synchronize]; + break; + } + } + } +} + /*************************************************************************/ #pragma mark - @@ -585,6 +836,7 @@ NSLog(@"bar"); [menuTableView reloadData]; [allTableView reloadData]; + [self changeMenus:self]; return YES; }