X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/1e64b5d75911f02ab001d77a2036b9812cc9125a..8fe29f5b163e9acbda7b317b406a5835bac8a95d:/PreferencesController.m?ds=sidebyside diff --git a/PreferencesController.m b/PreferencesController.m index 7384be5..89a0268 100755 --- a/PreferencesController.m +++ b/PreferencesController.m @@ -1,27 +1,20 @@ #import "PreferencesController.h" -#import "MenuTunes.h" +#import "MainController.h" #import "HotKeyCenter.h" @implementation PreferencesController -- (id)initWithMenuTunes:(MenuTunes *)tunes; +- (id)initWithMenuTunes:(MainController *)tunes; { - if ( (self = [super init]) ) - { + if ( (self = [super init]) ) { int i; NSImageCell *imgCell = [[[NSImageCell alloc] init] autorelease]; NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - NSString *temp; mt = [tunes retain]; + [mt registerDefaults]; - //Load the nib - [NSBundle loadNibNamed:@"Preferences" owner:self]; - - //Show our window - [window setLevel:NSStatusWindowLevel]; - [window center]; - [window makeKeyAndOrderFront:nil]; + [NSBundle loadNibNamed:@"Preferences" owner:self]; //Load the nib //Set the table view cells up [imgCell setImageScaling:NSScaleNone]; @@ -33,19 +26,13 @@ [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]; + 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 = [[[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++) - { + for (i = 0; i < [myItems count]; i++) { NSString *item = [myItems objectAtIndex:i]; if (![item isEqualToString:@""]) { @@ -54,96 +41,50 @@ } //Items that show should a submenu image - submenuItems = [[NSArray alloc] initWithObjects:@"Upcoming Songs", @"Playlists", @"EQ Presets", nil]; + submenuItems = [[NSArray alloc] initWithObjects:@"Upcoming Songs", @"Playlists", @"EQ Presets", @"Song Rating", 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]; - } + [songsInAdvance setIntValue:[defaults integerForKey:@"SongsInAdvance"]]; //Fill in hot key buttons - if ([defaults objectForKey:@"PlayPause"]) - { + if ([defaults objectForKey:@"PlayPause"]){ playPauseCombo = [defaults keyComboForKey:@"PlayPause"]; [playPauseButton setTitle:[playPauseCombo userDisplayRep]]; - } - else - { + } else { playPauseCombo = [[KeyCombo alloc] init]; } - if ([defaults objectForKey:@"NextTrack"]) - { + if ([defaults objectForKey:@"NextTrack"]) { nextTrackCombo = [defaults keyComboForKey:@"NextTrack"]; [nextTrackButton setTitle:[nextTrackCombo userDisplayRep]]; - } - else - { + } else { nextTrackCombo = [[KeyCombo alloc] init]; } - if ([defaults objectForKey:@"PrevTrack"]) - { + if ([defaults objectForKey:@"PrevTrack"]) { prevTrackCombo = [defaults keyComboForKey:@"PrevTrack"]; [previousTrackButton setTitle:[prevTrackCombo userDisplayRep]]; - } - else - { + } else { prevTrackCombo = [[KeyCombo alloc] init]; } - if ([defaults objectForKey:@"TrackInfo"]) - { + if ([defaults objectForKey:@"TrackInfo"]) { trackInfoCombo = [defaults keyComboForKey:@"TrackInfo"]; [trackInfoButton setTitle:[trackInfoCombo userDisplayRep]]; - } - else - { + } else { trackInfoCombo = [[KeyCombo alloc] init]; } - if ([defaults objectForKey:@"UpcomingSongs"]) - { + if ([defaults objectForKey:@"UpcomingSongs"]) { upcomingSongsCombo = [defaults keyComboForKey:@"UpcomingSongs"]; [upcomingSongsButton setTitle:[upcomingSongsCombo userDisplayRep]]; - } - else - { + } 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]; - } - } - + [albumCheckbox setState:[defaults boolForKey:@"showAlbum"] ? NSOnState : NSOffState]; + [nameCheckbox setState:[defaults boolForKey:@"showName"] ? NSOnState : NSOffState]; [artistCheckbox setState:[defaults boolForKey:@"showArtist"] ? NSOnState : NSOffState]; [trackTimeCheckbox setState:[defaults boolForKey:@"showTime"] ? NSOnState : NSOffState]; @@ -157,19 +98,19 @@ loginwindow = [[defaults 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]]) { [launchAtLoginCheckbox setState:NSOnState]; } } } + + //Show our window + [window setLevel:NSStatusWindowLevel]; + [window center]; + [window makeKeyAndOrderFront:nil]; + [window setDelegate:self]; } return self; } @@ -193,7 +134,6 @@ - (IBAction)apply:(id)sender { - ProcessSerialNumber psn; NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; [defaults setObject:myItems forKey:@"menu"]; @@ -211,10 +151,10 @@ [defaults 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; @@ -222,29 +162,27 @@ loginwindow = [[defaults 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]]; - [defaults setPersistentDomain:loginwindow forName:@"loginwindow"]; - [defaults synchronize]; + AECreateDesc(typeChar, [script cString], [script cStringLength], + &scriptDesc); + + OSADoScript(temp, &scriptDesc, kOSANullScript, typeChar, kOSAModeCanInteract, &resultDesc); + + AEDisposeDesc(&scriptDesc); + AEDisposeDesc(&resultDesc); + CloseComponent(temp); } - } - else - { + } else { NSMutableDictionary *loginwindow; NSMutableArray *loginarray; int i; @@ -253,12 +191,9 @@ loginwindow = [[[NSUserDefaults standardUserDefaults] 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]; @@ -268,20 +203,23 @@ } //Set songs in advance - if ([songsInAdvance intValue]) - { + if ([songsInAdvance intValue]) { [defaults setInteger:[songsInAdvance intValue] forKey:@"SongsInAdvance"]; - } - else - { + } else { [defaults setInteger:5 forKey:@"SongsInAdvance"]; } - psn = [mt iTunesPSN]; - if (!((psn.highLongOfPSN == kNoProcess) && (psn.lowLongOfPSN == 0))) - { - [mt rebuildMenu]; - } + /*{ + NSArray *apps = [[NSWorkspace sharedWorkspace] launchedApplications]; + int i; + + for (i = 0; i < [apps count]; i++) { + if ([[[apps objectAtIndex:i] objectForKey:@"NSApplicationName"] + isEqualToString:@"iTunes"]) { + [mt rebuildMenu]; + } + } + }*/ [mt clearHotKeys]; } @@ -305,27 +243,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; - } - - string = [combo userDisplayRep]; + NSString *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]; @@ -338,8 +265,8 @@ { 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]; @@ -352,8 +279,8 @@ { 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]; @@ -366,8 +293,8 @@ { 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]; @@ -380,8 +307,8 @@ { 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]; @@ -458,22 +385,18 @@ combo = [newCombo copy]; string = [combo userDisplayRep]; - if (string == nil) - { + if (string == nil) { string = @""; } [keyComboField setStringValue:string]; } -// -// -// Text Field Delegate // // -- (void)controlTextDidChange:(NSNotification *)note +- (void)windowWillClose:(NSNotification *)note { - NSLog(@"%@", [note userInfo]); + [mt closePreferences]; } // @@ -484,50 +407,33 @@ - (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; } } @@ -536,15 +442,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; @@ -560,40 +464,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]; @@ -606,18 +499,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; } }