X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/fcbc4baf73d5054212eb69f728ef9c303e1c62a5..ef4f5a3e753596396e93ba33b7e2ab5e8b53c5d8:/PreferencesController.m?ds=inline diff --git a/PreferencesController.m b/PreferencesController.m index 4a2d389..2206fab 100755 --- a/PreferencesController.m +++ b/PreferencesController.m @@ -1,294 +1,189 @@ #import "PreferencesController.h" -#import "MenuTunes.h" +#import "MainController.h" #import "HotKeyCenter.h" +/*************************************************************************/ +#pragma mark - +#pragma mark PRIVATE INTERFACE +/*************************************************************************/ + +@interface PreferencesController (Private) +- (void)setupWindow; +- (void)setupCustomizationTables; +- (void)setupMenuItems; +- (void)setupUI; +@end + + @implementation PreferencesController -- (id)initWithMenuTunes:(MenuTunes *)tunes; + +/*************************************************************************/ +#pragma mark - +#pragma mark STATIC VARIABLES +/*************************************************************************/ + +static PreferencesController *prefs = nil; + + +/*************************************************************************/ +#pragma mark - +#pragma mark INITIALIZATION METHODS +/*************************************************************************/ + ++ (PreferencesController *)sharedPrefs; { - if ( (self = [super init]) ) - { - int i; - NSImageCell *imgCell = [[[NSImageCell alloc] init] autorelease]; - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - NSString *temp; - - mt = [tunes retain]; - - //Load the nib - [NSBundle loadNibNamed:@"Preferences" owner:self]; - - //Show our window - [window setLevel:NSStatusWindowLevel]; - [window center]; - [window makeKeyAndOrderFront:nil]; - - //Set the table view cells up - [imgCell setImageScaling:NSScaleNone]; - [[menuTableView tableColumnWithIdentifier:@"submenu"] setDataCell:imgCell]; - [[allTableView tableColumnWithIdentifier:@"submenu"] setDataCell:imgCell]; - - //Register for drag and drop - [menuTableView registerForDraggedTypes:[NSArray arrayWithObjects:@"MenuTableViewPboardType", @"AllTableViewPboardType", nil]]; - [allTableView registerForDraggedTypes:[NSArray arrayWithObjects:@"MenuTableViewPboardType", @"AllTableViewPboardType", nil]]; - - //Set the list of items you can have. - availableItems = [[NSMutableArray alloc] initWithObjects:@"Current Track Info", @"Upcoming Songs", @"Playlists", @"EQ Presets", @"Play/Pause", @"Next Track", @"Previous Track", @"Fast Forward", @"Rewind", @"", nil]; - - //Get our preferred menu - myItems = [[[NSUserDefaults standardUserDefaults] arrayForKey:@"menu"] mutableCopy]; - if (myItems == nil) - { - myItems = [[NSMutableArray alloc] initWithObjects:@"Play/Pause", @"Next Track", @"Previous Track", @"Fast Forward", @"Rewind", @"", @"Upcoming Songs", @"Playlists", @"EQ Presets", @"", @"PreferencesÉ", @"Quit", @"", @"Current Track Info", nil]; - [[NSUserDefaults standardUserDefaults] setObject:myItems forKey:@"menu"]; - } - - //Delete items in the availableItems array that are already part of the menu - for (i = 0; i < [myItems count]; i++) - { - NSString *item = [myItems objectAtIndex:i]; - if (![item isEqualToString:@""]) - { - [availableItems removeObject:item]; - } - } - - //Items that show should a submenu image - submenuItems = [[NSArray alloc] initWithObjects:@"Upcoming Songs", @"Playlists", @"EQ Presets", nil]; - - //Fill in the number of songs in advance to show field - if ([defaults integerForKey:@"SongsInAdvance"]) - { - [songsInAdvance setIntValue:[defaults integerForKey:@"SongsInAdvance"]]; - } - else - { - [songsInAdvance setIntValue:5]; - } - - //Fill in hot key buttons - if ([defaults objectForKey:@"PlayPause"]) - { - playPauseCombo = [defaults keyComboForKey:@"PlayPause"]; - [playPauseButton setTitle:[playPauseCombo userDisplayRep]]; - } - else - { - playPauseCombo = [[KeyCombo alloc] init]; - } - - if ([defaults objectForKey:@"NextTrack"]) - { - nextTrackCombo = [defaults keyComboForKey:@"NextTrack"]; - [nextTrackButton setTitle:[nextTrackCombo userDisplayRep]]; - } - else - { - nextTrackCombo = [[KeyCombo alloc] init]; - } - - if ([defaults objectForKey:@"PrevTrack"]) - { - prevTrackCombo = [defaults keyComboForKey:@"PrevTrack"]; - [previousTrackButton setTitle:[prevTrackCombo userDisplayRep]]; - } - else - { - prevTrackCombo = [[KeyCombo alloc] init]; - } - - if ([defaults objectForKey:@"TrackInfo"]) - { - trackInfoCombo = [defaults keyComboForKey:@"TrackInfo"]; - [trackInfoButton setTitle:[trackInfoCombo userDisplayRep]]; - } - else - { - trackInfoCombo = [[KeyCombo alloc] init]; - } - - if ([defaults objectForKey:@"UpcomingSongs"]) - { - upcomingSongsCombo = [defaults keyComboForKey:@"UpcomingSongs"]; - [upcomingSongsButton setTitle:[upcomingSongsCombo userDisplayRep]]; - } - else - { - upcomingSongsCombo = [[KeyCombo alloc] init]; - } - - //Check current track info buttons - - //Album and name get special treatment because they are defaults - if ( (temp = [defaults stringForKey:@"showAlbum"]) ) - { - if ((temp == nil) || [temp isEqualToString:@"1"]) - { - [albumCheckbox setState:NSOnState]; - } - else - { - [albumCheckbox setState:NSOffState]; - } - } - - if ( (temp = [defaults stringForKey:@"showName"]) ) - { - if ((temp == nil) || [temp isEqualToString:@"1"]) - { - [nameCheckbox setState:NSOnState]; - } - else - { - [nameCheckbox setState:NSOffState]; - } - } - - [artistCheckbox setState:[defaults boolForKey:@"showArtist"] ? NSOnState : NSOffState]; - [trackTimeCheckbox setState:[defaults boolForKey:@"showTime"] ? NSOnState : NSOffState]; - - //Set the launch at login checkbox state - { - NSMutableDictionary *loginwindow; - NSMutableArray *loginarray; - int i; - - [defaults synchronize]; - loginwindow = [[defaults persistentDomainForName:@"loginwindow"] mutableCopy]; - loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"]; - - for (i = 0; i < [loginarray count]; i++) - { - NSDictionary *tempDict = [loginarray objectAtIndex:i]; - - //Here we are seeing if our program is already in loginwindow.plist. - //See the problem below for this problem here. We will do the same thing. - - if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:@"VocabularyBuilder.app"]) - { - [launchAtLoginCheckbox setState:NSOnState]; - } - } - } + if (! prefs) { + prefs = [[self alloc] init]; + } + return prefs; +} + +- (id)init +{ + if ( (self = [super init]) ) { + df = [[NSUserDefaults standardUserDefaults] retain]; + controller = nil; } return self; } -- (void)dealloc + +/*************************************************************************/ +#pragma mark - +#pragma mark ACCESSOR METHODS +/*************************************************************************/ + +- (id)controller { - [self setKeyCombo:nil]; - [playPauseCombo release]; - [nextTrackCombo release]; - [prevTrackCombo release]; - [trackInfoCombo release]; - [upcomingSongsCombo release]; - [keyComboPanel release]; - [menuTableView setDataSource:nil]; - [allTableView setDataSource:nil]; - [mt release]; - [availableItems release]; - [submenuItems release]; - [myItems release]; + return controller; +} + +- (void)setController:(id)object +{ +NSLog(@"foo"); + [controller autorelease]; + controller = [object retain]; +NSLog(@"bar"); +} + + +/*************************************************************************/ +#pragma mark - +#pragma mark INSTANCE METHODS +/*************************************************************************/ + + +- (IBAction)showPrefsWindow:(id)sender +{ + if (! window) { // If window does not exist yet, then the nib hasn't been loaded. + [self setupWindow]; // Load in the nib, and perform any initial setup. + [self setupCustomizationTables]; // Setup the DnD manu config tables. + [self setupMenuItems]; // Setup the arrays of menu items + [self setupUI]; // Sets up additional UI + [window setDelegate:self]; + } + + [window setLevel:NSStatusWindowLevel]; + [window center]; + [window makeKeyAndOrderFront:self]; + [NSApp activateIgnoringOtherApps:YES]; } - (IBAction)apply:(id)sender { - ProcessSerialNumber psn; - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - [defaults setObject:myItems forKey:@"menu"]; + [df setObject:myItems forKey:@"menu"]; //Set key combos - [defaults setKeyCombo:playPauseCombo forKey:@"PlayPause"]; - [defaults setKeyCombo:nextTrackCombo forKey:@"NextTrack"]; - [defaults setKeyCombo:prevTrackCombo forKey:@"PrevTrack"]; - [defaults setKeyCombo:trackInfoCombo forKey:@"TrackInfo"]; - [defaults setKeyCombo:upcomingSongsCombo forKey:@"UpcomingSongs"]; + [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 - [defaults setBool:[albumCheckbox state] forKey:@"showAlbum"]; - [defaults setBool:[nameCheckbox state] forKey:@"showName"]; - [defaults setBool:[artistCheckbox state] forKey:@"showArtist"]; - [defaults setBool:[trackTimeCheckbox state] forKey:@"showTime"]; + [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 - if ([launchAtLoginCheckbox state] == NSOnState) - { + if ([launchAtLoginCheckbox state] == NSOnState) { NSMutableDictionary *loginwindow; NSMutableArray *loginarray; + ComponentInstance temp = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);; int i; BOOL skip = NO; - [defaults synchronize]; - loginwindow = [[defaults persistentDomainForName:@"loginwindow"] mutableCopy]; + [df synchronize]; + loginwindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy]; loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"]; - for (i = 0; i < [loginarray count]; i++) - { + for (i = 0; i < [loginarray count]; i++) { NSDictionary *tempDict = [loginarray objectAtIndex:i]; - - //Here we are seeing if our program is already in loginwindow.plist. - //See the problem below for this problem here. We will do the same thing. - - if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:@"VocabularyBuilder.app"]) - { + if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]]) { skip = YES; } } - if (!skip) - { - [loginarray addObject:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:NO], @"Hide", [[NSBundle mainBundle] bundlePath], @"Path", nil]]; + 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); - [defaults setPersistentDomain:loginwindow forName:@"loginwindow"]; - [defaults synchronize]; + AEDisposeDesc(&scriptDesc); + AEDisposeDesc(&resultDesc); + CloseComponent(temp); } - } - else - { + } else { NSMutableDictionary *loginwindow; NSMutableArray *loginarray; int i; - [[NSUserDefaults standardUserDefaults] synchronize]; - loginwindow = [[[NSUserDefaults standardUserDefaults] persistentDomainForName:@"loginwindow"] mutableCopy]; + [df synchronize]; + loginwindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy]; loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"]; - for (i = 0; i < [loginarray count]; i++) - { + for (i = 0; i < [loginarray count]; i++) { NSDictionary *tempDict = [loginarray objectAtIndex:i]; - - if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:@"VocabularyBuilder.app"]) - { + if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]]) { [loginarray removeObjectAtIndex:i]; - [defaults setPersistentDomain:loginwindow forName:@"loginwindow"]; - [defaults synchronize]; + [df setPersistentDomain:loginwindow forName:@"loginwindow"]; + [df synchronize]; break; } } } //Set songs in advance - if ([songsInAdvance intValue]) - { - [defaults setInteger:[songsInAdvance intValue] forKey:@"SongsInAdvance"]; - } - else - { - [defaults setInteger:5 forKey:@"SongsInAdvance"]; + if ([songsInAdvance intValue]) { + [df setInteger:[songsInAdvance intValue] forKey:@"SongsInAdvance"]; + } else { + [df setInteger:5 forKey:@"SongsInAdvance"]; } - psn = [mt iTunesPSN]; - if (!((psn.highLongOfPSN == kNoProcess) && (psn.lowLongOfPSN == 0))) - { - [mt rebuildMenu]; - } - [mt clearHotKeys]; + /*{ + 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]; - [mt closePreferences]; + [controller closePreferences]; } - (IBAction)cancelHotKey:(id)sender @@ -305,27 +200,16 @@ - (IBAction)okHotKey:(id)sender { - NSString *string; - if (([combo modifiers] <= 0) && ([combo keyCode] >= 0)) - { - [window setLevel:NSNormalWindowLevel]; - NSRunAlertPanel(@"Bad Key Combo", @"Please enter a valid key combo. A valid combo must have a modifier key in it. (Command, option, shift, control).", @"OK", nil, nil, nil); - [window setLevel:NSStatusWindowLevel]; - return; - } + NSString *string = [combo userDisplayRep]; - string = [combo userDisplayRep]; - - if (string == nil) - { + if (string == nil) { string = @"None"; } - if ([setHotKey isEqualToString:@"PlayPause"]) - { + if ([setHotKey isEqualToString:@"PlayPause"]) { if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] || - [combo isEqual:trackInfoCombo] || [combo isEqual:upcomingSongsCombo]) && - !(([combo modifiers] == -1) && ([combo keyCode] == -1))) - { + [combo isEqual:trackInfoCombo] || [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]; @@ -333,13 +217,11 @@ } playPauseCombo = [combo copy]; [playPauseButton setTitle:string]; - } - else if ([setHotKey isEqualToString:@"NextTrack"]) - { + } else if ([setHotKey isEqualToString:@"NextTrack"]) { if (([combo isEqual:playPauseCombo] || [combo isEqual:prevTrackCombo] || [combo isEqual:trackInfoCombo] || [combo isEqual:upcomingSongsCombo]) && - !(([combo modifiers] == -1) && ([combo keyCode] == -1))) - { + !(([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]; @@ -347,13 +229,11 @@ } nextTrackCombo = [combo copy]; [nextTrackButton setTitle:string]; - } - else if ([setHotKey isEqualToString:@"PrevTrack"]) - { + } else if ([setHotKey isEqualToString:@"PrevTrack"]) { if (([combo isEqual:nextTrackCombo] || [combo isEqual:playPauseCombo] || [combo isEqual:trackInfoCombo] || [combo isEqual:upcomingSongsCombo]) && - !(([combo modifiers] == -1) && ([combo keyCode] == -1))) - { + !(([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]; @@ -361,13 +241,11 @@ } prevTrackCombo = [combo copy]; [previousTrackButton setTitle:string]; - } - else if ([setHotKey isEqualToString:@"TrackInfo"]) - { + } else if ([setHotKey isEqualToString:@"TrackInfo"]) { if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] || [combo isEqual:playPauseCombo] || [combo isEqual:upcomingSongsCombo]) && - !(([combo modifiers] == -1) && ([combo keyCode] == -1))) - { + !(([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]; @@ -375,13 +253,11 @@ } trackInfoCombo = [combo copy]; [trackInfoButton setTitle:string]; - } - else if ([setHotKey isEqualToString:@"UpcomingSongs"]) - { + } else if ([setHotKey isEqualToString:@"UpcomingSongs"]) { if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] || [combo isEqual:trackInfoCombo] || [combo isEqual:playPauseCombo]) && - !(([combo modifiers] == -1) && ([combo keyCode] == -1))) - { + !(([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]; @@ -397,7 +273,7 @@ { [self apply:nil]; [window close]; - [mt closePreferences]; + [controller closePreferences]; } - (IBAction)setCurrentTrackInfo:(id)sender @@ -458,65 +334,197 @@ combo = [newCombo copy]; string = [combo userDisplayRep]; - if (string == nil) - { + if (string == nil) { string = @""; } [keyComboField setStringValue:string]; } -// -// -// Table View Datasource Methods -// -// + +/*************************************************************************/ +#pragma mark - +#pragma mark PRIVATE METHOD IMPLEMENTATIONS +/*************************************************************************/ + +- (void)setupWindow +{ + if ( ! [NSBundle loadNibNamed:@"Preferences" owner:self] ) { + NSLog( @"Failed to load Preferences.nib" ); + NSBeep(); + return; + } +} + +- (void)setupCustomizationTables +{ + NSImageCell *imgCell = [[[NSImageCell alloc] initImageCell:nil] autorelease]; + + // Set the table view cells up + [imgCell setImageScaling:NSScaleNone]; + [[menuTableView tableColumnWithIdentifier:@"submenu"] setDataCell:imgCell]; + [[allTableView tableColumnWithIdentifier:@"submenu"] setDataCell:imgCell]; + + // Register for drag and drop + [menuTableView registerForDraggedTypes:[NSArray arrayWithObjects: + @"MenuTableViewPboardType", + @"AllTableViewPboardType", + nil]]; + [allTableView registerForDraggedTypes:[NSArray arrayWithObjects: + @"MenuTableViewPboardType", + @"AllTableViewPboardType", + nil]]; +} + +- (void)setupMenuItems +{ + NSEnumerator *itemEnum; + id anItem; + // Set the list of items you can have. + availableItems = [[NSMutableArray alloc] initWithObjects: + @"Current Track Info", + @"Upcoming Songs", + @"Playlists", + @"EQ Presets", + @"Song Rating", + @"Play/Pause", + @"Next Track", + @"Previous Track", + @"Fast Forward", + @"Rewind", + @"", + nil]; + + // Get our preferred menu + myItems = [[df arrayForKey:@"menu"] mutableCopy]; + + // Delete items in the availableItems array that are already part of the menu + itemEnum = [myItems objectEnumerator]; + while ( (anItem = [itemEnum nextObject]) ) { + if ( ! [anItem isEqualToString:@""] ) { + [availableItems removeObject:anItem]; + } + } + + // Items that show should a submenu image + submenuItems = [[NSArray alloc] initWithObjects: + @"Upcoming Songs", + @"Playlists", + @"EQ Presets", + @"Song Rating", + nil]; +} + +- (void)setupUI +{ + NSMutableDictionary *loginwindow; + 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]]; + } 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]]; + } else { + upcomingSongsCombo = [[KeyCombo alloc] init]; + } + + // Check current track info buttons + [albumCheckbox setState:[df boolForKey:@"showAlbum"] ? NSOnState : NSOffState]; + [nameCheckbox setState:[df boolForKey:@"showName"] ? NSOnState : NSOffState]; + [artistCheckbox setState:[df boolForKey:@"showArtist"] ? NSOnState : NSOffState]; + [trackTimeCheckbox setState:[df boolForKey:@"showTime"] ? NSOnState : NSOffState]; + + // Set the launch at login checkbox state + [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]]) { + [launchAtLoginCheckbox setState:NSOnState]; + } + } +} + + +/*************************************************************************/ +#pragma mark - +#pragma mark NSWindow DELEGATE METHODS +/*************************************************************************/ + +- (void)windowWillClose:(NSNotification *)note +{ + [(MainController *)controller closePreferences]; +} + + +/*************************************************************************/ +#pragma mark - +#pragma mark NSTableView DATASOURCE METHODS +/*************************************************************************/ - (int)numberOfRowsInTableView:(NSTableView *)aTableView { - if (aTableView == menuTableView) - { + if (aTableView == menuTableView) { return [myItems count]; - } - else - { + } else { return [availableItems count]; } } - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex { - if (aTableView == menuTableView) - { - if ([[aTableColumn identifier] isEqualToString:@"name"]) - { + if (aTableView == menuTableView) { + if ([[aTableColumn identifier] isEqualToString:@"name"]) { return [myItems objectAtIndex:rowIndex]; - } - else - { + } else { if ([submenuItems containsObject:[myItems objectAtIndex:rowIndex]]) { return [NSImage imageNamed:@"submenu"]; - } - else - { + } else { return nil; } } - } - else - { - if ([[aTableColumn identifier] isEqualToString:@"name"]) - { + } else { + if ([[aTableColumn identifier] isEqualToString:@"name"]) { return [availableItems objectAtIndex:rowIndex]; - } - else - { - if ([submenuItems containsObject:[availableItems objectAtIndex:rowIndex]]) - { + } else { + if ([submenuItems containsObject:[availableItems objectAtIndex:rowIndex]]) { return [NSImage imageNamed:@"submenu"]; - } - else - { + } else { return nil; } } @@ -525,15 +533,13 @@ - (BOOL)tableView:(NSTableView *)tableView writeRows:(NSArray*)rows toPasteboard:(NSPasteboard*)pboard { - if (tableView == menuTableView) - { + if (tableView == menuTableView) { [pboard declareTypes:[NSArray arrayWithObjects:@"MenuTableViewPboardType", nil] owner:self]; [pboard setString:[[rows objectAtIndex:0] stringValue] forType:@"MenuTableViewPboardType"]; return YES; } - if (tableView == allTableView) - { + if (tableView == allTableView) { [pboard declareTypes:[NSArray arrayWithObjects:@"AllTableViewPboardType", nil] owner:self]; [pboard setString:[[rows objectAtIndex:0] stringValue] forType:@"AllTableViewPboardType"]; return YES; @@ -549,40 +555,29 @@ pb = [info draggingPasteboard]; - if ([[pb types] containsObject:@"MenuTableViewPboardType"]) - { + if ([[pb types] containsObject:@"MenuTableViewPboardType"]) { dragData = [pb stringForType:@"MenuTableViewPboardType"]; dragRow = [dragData intValue]; temp = [myItems objectAtIndex:dragRow]; [myItems removeObjectAtIndex:dragRow]; - if (tableView == menuTableView) - { - if (row > dragRow) - { + if (tableView == menuTableView) { + if (row > dragRow) { [myItems insertObject:temp atIndex:row - 1]; - } - else - { + } else { [myItems insertObject:temp atIndex:row]; } - } - else - { - if (![temp isEqualToString:@""]) - { + } else { + if (![temp isEqualToString:@""]) { [availableItems addObject:temp]; } } - } - else if ([[pb types] containsObject:@"AllTableViewPboardType"]) - { + } else if ([[pb types] containsObject:@"AllTableViewPboardType"]) { dragData = [pb stringForType:@"AllTableViewPboardType"]; dragRow = [dragData intValue]; temp = [availableItems objectAtIndex:dragRow]; - if (![temp isEqualToString:@""]) - { + if (![temp isEqualToString:@""]) { [availableItems removeObjectAtIndex:dragRow]; } [myItems insertObject:temp atIndex:row]; @@ -595,18 +590,14 @@ - (NSDragOperation)tableView:(NSTableView*)tableView validateDrop:(id )info proposedRow:(int)row proposedDropOperation:(NSTableViewDropOperation)operation { - if (tableView == allTableView) - { - if ([[[info draggingPasteboard] types] containsObject:@"AllTableViewPboardType"]) - { + if (tableView == allTableView) { + if ([[[info draggingPasteboard] types] containsObject:@"AllTableViewPboardType"]) { return NSDragOperationNone; } - if ([[[info draggingPasteboard] types] containsObject:@"MenuTableViewPboardType"]) - { + if ([[[info draggingPasteboard] types] containsObject:@"MenuTableViewPboardType"]) { NSString *item = [myItems objectAtIndex:[[[info draggingPasteboard] stringForType:@"MenuTableViewPboardType"] intValue]]; - if ([item isEqualToString:@"PreferencesÉ"] || [item isEqualToString:@"Quit"]) - { + if ([item isEqualToString:@"PreferencesÉ"] || [item isEqualToString:@"Quit"]) { return NSDragOperationNone; } } @@ -623,4 +614,29 @@ return NSDragOperationGeneric; } + +/*************************************************************************/ +#pragma mark - +#pragma mark DEALLOCATION METHODS +/*************************************************************************/ + +- (void)dealloc +{ + [self setKeyCombo:nil]; + [playPauseCombo release]; + [nextTrackCombo release]; + [prevTrackCombo release]; + [trackInfoCombo release]; + [upcomingSongsCombo release]; + [keyComboPanel release]; + [menuTableView setDataSource:nil]; + [allTableView setDataSource:nil]; + [controller release]; + [availableItems release]; + [submenuItems release]; + [myItems release]; + [df release]; +} + + @end