X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/6b8a2b55809e875bb0aadc3ab9cbab181014d1a9..e216390f7e2d67e1575743124dbba05f7c1b6094:/PreferencesController.m diff --git a/PreferencesController.m b/PreferencesController.m index 217afb4..101b8c7 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 @@ -87,16 +92,66 @@ static PreferencesController *prefs = nil; [NSApp activateIgnoringOtherApps:YES]; } +- (IBAction)changeGeneralSetting:(id)sender +{ + if ( [sender tag] == 101) { + [self setLaunchesAtLogin:SENDER_STATE]; + } else if ( [sender tag] == 102) { + [df setBool:SENDER_STATE forKey:@"LaunchPlayerWithMT"]; + } else if ( [sender tag] == 103) { + [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) { + [df setBool:SENDER_STATE forKey:@"showArtist"]; + } else if ( [sender tag] == 107) { + [df setBool:SENDER_STATE forKey:@"showTime"]; + } else if ( [sender tag] == 108) { + [df setBool:SENDER_STATE forKey:@"showTrackNumber"]; + } else if ( [sender tag] == 109) { + [df setBool:SENDER_STATE forKey:@"showTrackRating"]; + } +} + +- (IBAction)changeStatusWindowSetting:(id)sender +{ + if ( [sender tag] == 201) { + [df setInteger:[sender selectedRow] forKey:@"statusWindowVerticalPosition"]; + [df setInteger:[sender selectedColumn] forKey:@"statusWindowHorizontalPosition"]; + // update the window's position here + } else if ( [sender tag] == 202) { + // update screen selection + } else if ( [sender tag] == 203) { + // Update appearance effect + } else if ( [sender tag] == 204) { + // Update Vanish Effect + } else if ( [sender tag] == 205) { + // Update appearance speed + } else if ( [sender tag] == 206) { + // Update vanish speed + } else if ( [sender tag] == 207) { + // Update vanish delay + } else if ( [sender tag] == 208) { + // Update "Song Info window when song changes" setting. + } +} + - (IBAction)apply:(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"]; + [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"]; @@ -105,56 +160,6 @@ static PreferencesController *prefs = nil; [df setBool:[trackTimeCheckbox state] forKey:@"showTime"]; //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; - } - } - - 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; - } - } - } //Set songs in advance if ([songsInAdvance intValue]) { @@ -191,6 +196,7 @@ static PreferencesController *prefs = nil; @"Previous Track", @"Fast Forward", @"Rewind", + @"Show Player", @"", @"Upcoming Songs", @"Playlists", @@ -264,7 +270,10 @@ static PreferencesController *prefs = nil; } 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]; @@ -276,7 +285,10 @@ static PreferencesController *prefs = nil; [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]; @@ -288,7 +300,10 @@ static PreferencesController *prefs = nil; [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]; @@ -300,7 +315,10 @@ static PreferencesController *prefs = nil; [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]; @@ -312,7 +330,10 @@ static PreferencesController *prefs = nil; [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]; @@ -322,38 +343,150 @@ static PreferencesController *prefs = nil; } 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; + } } @@ -447,6 +580,7 @@ static PreferencesController *prefs = nil; @"Previous Track", @"Fast Forward", @"Rewind", + @"Show Player", @"", nil]; @@ -487,28 +621,28 @@ static PreferencesController *prefs = nil; } 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]]; @@ -516,6 +650,48 @@ static PreferencesController *prefs = nil; 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]; @@ -526,7 +702,7 @@ static PreferencesController *prefs = nil; [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]]) { @@ -535,6 +711,68 @@ static PreferencesController *prefs = nil; } } +- (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 - @@ -641,6 +879,7 @@ static PreferencesController *prefs = nil; [menuTableView reloadData]; [allTableView reloadData]; + [self changeMenus:self]; return YES; }