X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/24a440dccb5f6edb1e324e1cba03f373f89d0c30..5b0ebb88485736909eeb1072739ad42af1529cd7:/PreferencesController.m?ds=inline diff --git a/PreferencesController.m b/PreferencesController.m index 3f3a8b3..af1838b 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,100 +92,118 @@ static PreferencesController *prefs = nil; [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"]; - [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"]; - [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) { - 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; - } - } + BOOL rebuildRequired = NO; + + 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"]; + rebuildRequired = YES; + } else if ( [sender tag] == 1040) { + // This will not be executed. Song info always shows the title of the song. + // [df setBool:SENDER_STATE forKey:@"showName"]; + // rebuildRequired = YES; + } else if ( [sender tag] == 1050) { + [df setBool:SENDER_STATE forKey:@"showArtist"]; + rebuildRequired = YES; + } else if ( [sender tag] == 1060) { + [df setBool:SENDER_STATE forKey:@"showAlbum"]; + rebuildRequired = YES; + } else if ( [sender tag] == 1070) { + [df setBool:SENDER_STATE forKey:@"showTime"]; + rebuildRequired = YES; + } else if ( [sender tag] == 1080) { + [df setBool:SENDER_STATE forKey:@"showTrackNumber"]; + rebuildRequired = YES; + } else if ( [sender tag] == 1090) { + [df setBool:SENDER_STATE forKey:@"showTrackRating"]; + rebuildRequired = YES; + } + + if ( rebuildRequired ) { + [controller rebuildMenu]; + // redraw song info status window, or upcoming songs here } - - //Set songs in advance - if ([songsInAdvance intValue]) { - [df setInteger:[songsInAdvance intValue] forKey:@"SongsInAdvance"]; - } else { - [df setInteger:5 forKey:@"SongsInAdvance"]; + + [df synchronize]; +} + +- (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; } - - /*{ - 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]; } - (void)registerDefaults @@ -210,7 +233,7 @@ static PreferencesController *prefs = nil; nil] forKey:@"menu"]; [df setInteger:5 forKey:@"SongsInAdvance"]; - [df setBool:YES forKey:@"showName"]; + // [df setBool:YES forKey:@"showName"]; // Song info will always show song title. [df setBool:YES forKey:@"showArtist"]; [df setBool:NO forKey:@"showAlbum"]; [df setBool:NO forKey:@"showTime"]; @@ -439,56 +462,6 @@ static PreferencesController *prefs = nil; [self cancelHotKey:sender]; } -- (IBAction)setNewHotKey:(id)sender -{ - 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; - } -} /*************************************************************************/ @@ -695,7 +668,8 @@ static PreferencesController *prefs = nil; // Check current track info buttons [albumCheckbox setState:[df boolForKey:@"showAlbum"] ? NSOnState : NSOffState]; - [nameCheckbox setState:[df boolForKey:@"showName"] ? NSOnState : NSOffState]; + [nameCheckbox setState:NSOnState]; // Song info will ALWAYS show song title. + [nameCheckbox setEnabled:NO]; // Song info will ALWAYS show song title. [artistCheckbox setState:[df boolForKey:@"showArtist"] ? NSOnState : NSOffState]; [trackTimeCheckbox setState:[df boolForKey:@"showTime"] ? NSOnState : NSOffState]; @@ -712,6 +686,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 - @@ -742,7 +778,11 @@ static PreferencesController *prefs = nil; { if (aTableView == menuTableView) { if ([[aTableColumn identifier] isEqualToString:@"name"]) { - return [myItems objectAtIndex:rowIndex]; + NSString *object = [myItems objectAtIndex:rowIndex]; + if ([object isEqualToString:@"Show Player"]) { + return [NSString stringWithFormat:@"Show %@", [[controller currentRemote] playerSimpleName]]; + } + return object; } else { if ([submenuItems containsObject:[myItems objectAtIndex:rowIndex]]) { @@ -818,6 +858,7 @@ static PreferencesController *prefs = nil; [menuTableView reloadData]; [allTableView reloadData]; + [self changeMenus:self]; return YES; }