From: Kent Sutherland Date: Fri, 11 Apr 2003 02:02:41 +0000 (+0000) Subject: Added the new keycombos in the prefs. Will go into MainController next. X-Git-Tag: v1.0~147 X-Git-Url: http://git.ithinksw.org/MenuTunes.git/commitdiff_plain/24a440dccb5f6edb1e324e1cba03f373f89d0c30 Added the new keycombos in the prefs. Will go into MainController next. --- diff --git a/English.lproj/Preferences.nib/classes.nib b/English.lproj/Preferences.nib/classes.nib index 10e4f8f..0110c5a 100755 --- a/English.lproj/Preferences.nib/classes.nib +++ b/English.lproj/Preferences.nib/classes.nib @@ -10,11 +10,7 @@ clearHotKey = id; okHotKey = id; save = id; - setCurrentTrackInfo = id; - setNextTrack = id; - setPlayPause = id; - setPreviousTrack = id; - setUpcomingSongs = id; + setNewHotKey = id; }; CLASS = PreferencesController; LANGUAGE = ObjC; @@ -30,10 +26,16 @@ nextTrackButton = NSButton; playPauseButton = NSButton; previousTrackButton = NSButton; + ratingDecrementButton = NSButton; + ratingIncrementButton = NSButton; songsInAdvance = NSTextField; + toggleLoopButton = NSButton; + toggleShuffleButton = NSButton; trackInfoButton = NSButton; trackTimeCheckbox = NSButton; upcomingSongsButton = NSButton; + volumeDecrementButton = NSButton; + volumeIncrementButton = NSButton; window = NSWindow; }; SUPERCLASS = NSObject; diff --git a/English.lproj/Preferences.nib/info.nib b/English.lproj/Preferences.nib/info.nib index e9597db..37f99bc 100755 --- a/English.lproj/Preferences.nib/info.nib +++ b/English.lproj/Preferences.nib/info.nib @@ -3,9 +3,9 @@ IBDocumentLocation - 380 -54 356 240 0 0 1056 770 + 45 2 356 240 0 0 1152 746 IBFramework Version - 286.0 + 291.0 IBGroupedObjects 0 @@ -22,9 +22,10 @@ IBOpenObjects + 115 6 IBSystem Version - 6L28 + 6L29 diff --git a/English.lproj/Preferences.nib/keyedobjects.nib b/English.lproj/Preferences.nib/keyedobjects.nib index cf067d6..5799d5f 100755 Binary files a/English.lproj/Preferences.nib/keyedobjects.nib and b/English.lproj/Preferences.nib/keyedobjects.nib differ diff --git a/OldMainController.m b/OldMainController.m index eef9aaa..27ca9d1 100755 --- a/OldMainController.m +++ b/OldMainController.m @@ -257,6 +257,10 @@ [menu addItemWithTitle:@"Rewind" action:@selector(rewind:) keyEquivalent:@""]; + } else if ([item isEqualToString:@"Show Player"]) { + [menu addItemWithTitle:[NSString stringWithFormat:@"Show %@", [currentRemote playerSimpleName]] + action:@selector(showPlayer:) + keyEquivalent:@""]; } else if ([item isEqualToString:@"Upcoming Songs"]) { upcomingSongsItem = [menu addItemWithTitle:@"Upcoming Songs" action:nil @@ -740,12 +744,16 @@ } } - [statusWindow setText:stringToShow]; + // + //SHOW THE STATUS WINDOW HERE WITH STRING stringToShow + // + + /*[statusWindow setText:stringToShow]; [NSTimer scheduledTimerWithTimeInterval:3.0 target:self selector:@selector(fadeAndCloseStatusWindow) userInfo:nil - repeats:NO]; + repeats:NO];*/ } } @@ -761,7 +769,6 @@ int i; NSString *songs = @""; - statusWindow = [ITTransientStatusWindow sharedWindow]; for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) { if (i <= numSongs) { NSString *curSong = [currentRemote songTitleAtIndex:i]; @@ -769,12 +776,17 @@ songs = [songs stringByAppendingString:@"\n"]; } } - [statusWindow setText:songs]; + + // + //SHOW STATUS WINDOW HERE WITH STRING songs + // + + /*[statusWindow setText:songs]; [NSTimer scheduledTimerWithTimeInterval:3.0 target:self selector:@selector(fadeAndCloseStatusWindow) userInfo:nil - repeats:NO]; + repeats:NO];*/ } } } diff --git a/PreferencesController.h b/PreferencesController.h index 60fc875..35252ae 100755 --- a/PreferencesController.h +++ b/PreferencesController.h @@ -18,22 +18,28 @@ @interface PreferencesController : NSObject { - IBOutlet NSButton *albumCheckbox; + IBOutlet NSButton *albumCheckbox; IBOutlet NSTableView *allTableView; - IBOutlet NSButton *artistCheckbox; + IBOutlet NSButton *artistCheckbox; IBOutlet NSTextField *keyComboField; - IBOutlet NSPanel *keyComboPanel; - IBOutlet NSButton *launchAtLoginCheckbox; + IBOutlet NSPanel *keyComboPanel; + IBOutlet NSButton *launchAtLoginCheckbox; IBOutlet NSTableView *menuTableView; - IBOutlet NSButton *nameCheckbox; - IBOutlet NSButton *nextTrackButton; - IBOutlet NSButton *playPauseButton; - IBOutlet NSButton *previousTrackButton; + IBOutlet NSButton *nameCheckbox; + IBOutlet NSButton *nextTrackButton; + IBOutlet NSButton *playPauseButton; + IBOutlet NSButton *previousTrackButton; + IBOutlet NSButton *ratingDecrementButton; + IBOutlet NSButton *ratingIncrementButton; IBOutlet NSTextField *songsInAdvance; - IBOutlet NSButton *trackInfoButton; - IBOutlet NSButton *trackTimeCheckbox; - IBOutlet NSButton *upcomingSongsButton; - IBOutlet NSWindow *window; + IBOutlet NSButton *toggleLoopButton; + IBOutlet NSButton *toggleShuffleButton; + IBOutlet NSButton *trackInfoButton; + IBOutlet NSButton *trackTimeCheckbox; + IBOutlet NSButton *upcomingSongsButton; + IBOutlet NSButton *volumeDecrementButton; + IBOutlet NSButton *volumeIncrementButton; + IBOutlet NSWindow *window; MainController *controller; NSUserDefaults *df; @@ -47,6 +53,12 @@ KeyCombo *prevTrackCombo; KeyCombo *trackInfoCombo; KeyCombo *upcomingSongsCombo; + KeyCombo *volumeIncrementCombo; + KeyCombo *volumeDecrementCombo; + KeyCombo *ratingIncrementCombo; + KeyCombo *ratingDecrementCombo; + KeyCombo *toggleLoopCombo; + KeyCombo *toggleShuffleCombo; NSString *setHotKey; } @@ -62,11 +74,7 @@ - (IBAction)cancelHotKey:(id)sender; - (IBAction)clearHotKey:(id)sender; - (IBAction)okHotKey:(id)sender; -- (IBAction)setCurrentTrackInfo:(id)sender; -- (IBAction)setNextTrack:(id)sender; -- (IBAction)setPlayPause:(id)sender; -- (IBAction)setPreviousTrack:(id)sender; -- (IBAction)setUpcomingSongs:(id)sender; +- (IBAction)setNewHotKey:(id)sender; - (void)setHotKey:(NSString *)key; - (void)setKeyCombo:(KeyCombo *)newCombo; diff --git a/PreferencesController.m b/PreferencesController.m index 217afb4..3f3a8b3 100755 --- a/PreferencesController.m +++ b/PreferencesController.m @@ -97,6 +97,12 @@ static PreferencesController *prefs = nil; [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"]; @@ -191,6 +197,7 @@ static PreferencesController *prefs = nil; @"Previous Track", @"Fast Forward", @"Rewind", + @"Show Player", @"", @"Upcoming Songs", @"Playlists", @@ -264,7 +271,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 +286,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 +301,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 +316,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 +331,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 +344,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 +- (IBAction)setNewHotKey:(id)sender { - [self setKeyCombo:prevTrackCombo]; - [self setHotKey:@"PrevTrack"]; -} - -- (IBAction)setUpcomingSongs:(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 +581,7 @@ static PreferencesController *prefs = nil; @"Previous Track", @"Fast Forward", @"Rewind", + @"Show Player", @"", nil]; @@ -487,28 +622,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 +651,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 +703,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]]) {