X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/35f6b7135a40f5d95777b74f84bc90db2a33ad2b..0b727e3ec3a58f5751bb8f41079162c1c4c09e2d:/PreferencesController.m?ds=sidebyside diff --git a/PreferencesController.m b/PreferencesController.m index 4f43e26..7e953d9 100755 --- a/PreferencesController.m +++ b/PreferencesController.m @@ -1,7 +1,34 @@ #import "PreferencesController.h" -#import "NewMainController.h" -#import "HotKeyCenter.h" +#import "MainController.h" +#import "MenuController.h" +#import "NetworkController.h" +#import "NetworkObject.h" +#import "StatusWindow.h" +#import "StatusWindowController.h" +#import "CustomMenuTableView.h" + +#import +#import +#import +#import +#import + +#import + +#import +#import +#import #import +#import + +#import +#import +#import +#import +#import +#import +#import + #define SENDER_STATE (([sender state] == NSOnState) ? YES : NO) @@ -15,8 +42,12 @@ - (void)setupCustomizationTables; - (void)setupMenuItems; - (void)setupUI; +- (void)setStatusWindowEntryEffect:(Class)effectClass; +- (void)setStatusWindowExitEffect:(Class)effectClass; +- (void)setCustomColor:(NSColor *)color updateWell:(BOOL)update; +- (void)repopulateEffectPopupsForVerticalPosition:(ITVerticalWindowPosition)vPos horizontalPosition:(ITHorizontalWindowPosition)hPos; +- (BOOL)effect:(Class)effectClass supportsVerticalPosition:(ITVerticalWindowPosition)vPos withHorizontalPosition:(ITHorizontalWindowPosition)hPos; - (IBAction)changeMenus:(id)sender; -- (void)setLaunchesAtLogin:(BOOL)flag; @end @@ -47,9 +78,61 @@ static PreferencesController *prefs = nil; - (id)init { if ( (self = [super init]) ) { + ITDebugLog(@"Preferences initialized."); df = [[NSUserDefaults standardUserDefaults] retain]; + + effectClasses = [[ITWindowEffect effectClasses] retain]; + + hotKeysArray = [[NSArray alloc] initWithObjects:@"PlayPause", + @"NextTrack", + @"PrevTrack", + @"FastForward", + @"Rewind", + @"ShowPlayer", + @"TrackInfo", + @"UpcomingSongs", + @"IncrementVolume", + @"DecrementVolume", + @"IncrementRating", + @"DecrementRating", + @"ToggleShuffle", + @"ToggleLoop", + @"PopupMenu", + @"SetRating0", + @"SetRating1", + @"SetRating2", + @"SetRating3", + @"SetRating4", + @"SetRating5", + nil]; + + hotKeyNamesArray = [[NSArray alloc] initWithObjects:@"Play/Pause", + @"Next Track", + @"Previous Track", + @"Fast Forward", + @"Rewind", + @"Show Player", + @"Track Info", + @"Upcoming Songs", + @"Increment Volume", + @"Decrement Volume", + @"Increment Rating", + @"Decrement Rating", + @"Toggle Shuffle", + @"Toggle Loop", + @"Pop-up status menu", + [NSString stringWithUTF8String:"Set Rating: ☆☆☆☆☆"], + [NSString stringWithUTF8String:"Set Rating: ★☆☆☆☆"], + [NSString stringWithUTF8String:"Set Rating: ★★☆☆☆"], + [NSString stringWithUTF8String:"Set Rating: ★★★☆☆"], + [NSString stringWithUTF8String:"Set Rating: ★★★★☆"], + [NSString stringWithUTF8String:"Set Rating: ★★★★★"], + nil]; hotKeysDictionary = [[NSMutableDictionary alloc] init]; controller = nil; + + [self setupWindow]; // Load in the nib, and perform any initial setup. + [[NSColorPanel sharedColorPanel] setShowsAlpha:YES]; } return self; } @@ -77,343 +160,539 @@ static PreferencesController *prefs = nil; #pragma mark INSTANCE METHODS /*************************************************************************/ +- (BOOL)showPasswordPanel +{ + [passwordPanel setLevel:NSStatusWindowLevel]; + [passwordPanelOKButton setTitle:@"Connect"]; + [passwordPanelTitle setStringValue:@"Password Required"]; + [passwordPanelMessage setStringValue:[NSString stringWithFormat:@"Please enter a password for access to the MenuTunes player named %@ at %@.", [[[NetworkController sharedController] networkObject] serverName], [[NetworkController sharedController] remoteHost]]]; + [passwordPanel setLevel:NSStatusWindowLevel]; + [NSApp activateIgnoringOtherApps:YES]; + [passwordPanel center]; + [passwordPanel orderFrontRegardless]; + [passwordPanel makeKeyWindow]; + if ([NSApp runModalForWindow:passwordPanel]) { + return YES; + } else { + return NO; + } +} + +- (BOOL)showInvalidPasswordPanel +{ + [passwordPanel setLevel:NSStatusWindowLevel]; + [passwordPanelOKButton setTitle:@"Retry"]; + [passwordPanelTitle setStringValue:@"Invalid Password"]; + [passwordPanelMessage setStringValue:[NSString stringWithFormat:@"The password entered for access to the MenuTunes player named %@ at %@ is invalid. Please provide a new password.", [[[NetworkController sharedController] networkObject] serverName], [[NetworkController sharedController] remoteHost]]]; + [passwordPanel setLevel:NSStatusWindowLevel]; + [NSApp activateIgnoringOtherApps:YES]; + [passwordPanel center]; + [passwordPanel orderFrontRegardless]; + [passwordPanel makeKeyWindow]; + if ([NSApp runModalForWindow:passwordPanel]) { + return YES; + } else { + return NO; + } +} + - (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. + ITDebugLog(@"Showing preferences window."); + if (!myItems) { // If menu array does not exist yet, then the window hasn't been setup. + ITDebugLog(@"Window doesn't exist, 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]; + [menuTableView reloadData]; + [hotKeysTableView reloadData]; + [hotKeysTableView setDoubleAction:@selector(hotKeysTableViewDoubleClicked:)]; + + //Change the launch player checkbox to the proper name + NS_DURING + [launchPlayerAtLaunchCheckbox setTitle:[NSString stringWithFormat:@"Launch %@ when MenuTunes launches", [[controller currentRemote] playerSimpleName]]]; //This isn't localized... + NS_HANDLER + [controller networkError:localException]; + NS_ENDHANDLER } - - [window setLevel:NSStatusWindowLevel]; - [window center]; - [window makeKeyAndOrderFront:self]; + + [self resetRemotePlayerTextFields]; + [launchAtLoginCheckbox becomeFirstResponder]; [NSApp activateIgnoringOtherApps:YES]; + [window center]; + [window orderFrontRegardless]; + [window makeKeyWindow]; } - (IBAction)changeGeneralSetting:(id)sender { + ITDebugLog(@"Changing general setting of tag %i.", [sender tag]); if ( [sender tag] == 1010) { - [self setLaunchesAtLogin:SENDER_STATE]; + ITSetApplicationLaunchOnLogin([[NSBundle mainBundle] bundlePath], SENDER_STATE); } else if ( [sender tag] == 1020) { [df setBool:SENDER_STATE forKey:@"LaunchPlayerWithMT"]; } else if ( [sender tag] == 1030) { [df setInteger:[sender intValue] forKey:@"SongsInAdvance"]; - + if ([[controller currentRemote] playerRunningState] == ITMTRemotePlayerRunning) { + [[controller menuController] performSelector:@selector(rebuildSubmenus) withObject:nil afterDelay:0]; + } } 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"]; } else if ( [sender tag] == 1050) { [df setBool:SENDER_STATE forKey:@"showArtist"]; + } else if ( [sender tag] == 1055) { + [df setBool:SENDER_STATE forKey:@"showComposer"]; } else if ( [sender tag] == 1060) { [df setBool:SENDER_STATE forKey:@"showAlbum"]; } else if ( [sender tag] == 1070) { [df setBool:SENDER_STATE forKey:@"showTime"]; } else if ( [sender tag] == 1080) { [df setBool:SENDER_STATE forKey:@"showTrackNumber"]; + } else if ( [sender tag] == 1085) { + [df setBool:SENDER_STATE forKey:@"showPlayCount"]; } else if ( [sender tag] == 1090) { [df setBool:SENDER_STATE forKey:@"showTrackRating"]; + } else if ( [sender tag] == 1100) { + [df setBool:SENDER_STATE forKey:@"showAlbumArtwork"]; + } else if ( [sender tag] == 1110) { + [df setBool:SENDER_STATE forKey:@"runScripts"]; + if (SENDER_STATE) { + [runScriptsCheckbox setState:NSOnState]; + [showScriptsButton setEnabled:YES]; + } else { + [showScriptsButton setEnabled:NO]; + } + } else if ( [sender tag] == 1120) { + mkdir([[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"] cString], 0744); + [[NSWorkspace sharedWorkspace] openFile:[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"]]; + } + [df synchronize]; +} + +- (IBAction)changeSharingSetting:(id)sender +{ + ITDebugLog(@"Changing sharing setting of tag %i.", [sender tag]); + if ( [sender tag] == 5010 ) { + BOOL state = SENDER_STATE; + [df setBool:state forKey:@"enableSharing"]; + //Disable/enable the use of shared player options + [useSharedMenuTunesCheckbox setEnabled:!state]; + [passwordTextField setEnabled:state]; + [nameTextField setEnabled:state]; + [selectSharedPlayerButton setEnabled:NO]; + [controller setServerStatus:state]; //Set server status + } else if ( [sender tag] == 5015 ) { + [df setObject:[sender stringValue] forKey:@"sharedPlayerName"]; + [[NetworkController sharedController] resetServerName]; + } else if ( [sender tag] == 5030 ) { + //Set the server password + const char *instring = [[sender stringValue] UTF8String]; + const char *password = "p4s5w0rdMT1.2"; + unsigned char *result; + NSData *hashedPass, *passwordStringHash; + if ([[sender stringValue] length] == 0) { + [df setObject:[NSData data] forKey:@"sharedPlayerPassword"]; + return; + } + result = SHA1(instring, strlen(instring), NULL); + hashedPass = [NSData dataWithBytes:result length:strlen(result)]; + result = SHA1(password, strlen(password), NULL); + passwordStringHash = [NSData dataWithBytes:result length:strlen(result)]; + if (![hashedPass isEqualToData:passwordStringHash]) { + [df setObject:hashedPass forKey:@"sharedPlayerPassword"]; + [sender setStringValue:@"p4s5w0rdMT1.2"]; + } + } else if ( [sender tag] == 5040 ) { + BOOL state = SENDER_STATE; + [df setBool:state forKey:@"useSharedPlayer"]; + //Disable/enable the use of sharing options + [shareMenuTunesCheckbox setEnabled:!state]; + [passwordTextField setEnabled:NO]; + [nameTextField setEnabled:NO]; + [selectSharedPlayerButton setEnabled:state]; + + if (state && ([controller connectToServer] == 1)) { + [selectedPlayerTextField setStringValue:[[[NetworkController sharedController] networkObject] serverName]]; + [locationTextField setStringValue:[[NetworkController sharedController] remoteHost]]; + } else { + [selectedPlayerTextField setStringValue:@"No shared player selected."]; + [locationTextField setStringValue:@"-"]; + if ([[NetworkController sharedController] isConnectedToServer]) { + [controller disconnectFromServer]; + } + + } + } else if ( [sender tag] == 5050 ) { + //If no player is selected in the table view, turn off OK button. + if ([sender clickedRow] == -1 ) { + [sharingPanelOKButton setEnabled:NO]; + } else { + [sharingPanelOKButton setEnabled:YES]; + } + } else if ( [sender tag] == 5051 ) { + [df setObject:[sender stringValue] forKey:@"sharedPlayerHost"]; + } else if ( [sender tag] == 5060 ) { + //Set OK button state + if (([selectPlayerBox contentView] == zeroConfView && [sharingTableView selectedRow] == -1) || + ([selectPlayerBox contentView] == manualView && [[hostTextField stringValue] length] == 0)) { + [sharingPanelOKButton setEnabled:NO]; + } else { + [sharingPanelOKButton setEnabled:YES]; + } + //Show selection sheet + [NSApp beginSheet:selectPlayerSheet modalForWindow:window modalDelegate:self didEndSelector:NULL contextInfo:nil]; + } else if ( [sender tag] == 5100 ) { + //Change view + if ( ([sender indexOfItem:[sender selectedItem]] == 0) && ([selectPlayerBox contentView] != zeroConfView) ) { + NSRect frame = [selectPlayerSheet frame]; + frame.origin.y -= 58; + frame.size.height = 273; + if ([sharingTableView selectedRow] == -1) { + [sharingPanelOKButton setEnabled:NO]; + } + [selectPlayerBox setContentView:zeroConfView]; + [selectPlayerSheet setFrame:frame display:YES animate:YES]; + } else if ( ([sender indexOfItem:[sender selectedItem]] == 1) && ([selectPlayerBox contentView] != manualView) ){ + NSRect frame = [selectPlayerSheet frame]; + frame.origin.y += 58; + frame.size.height = 215; + if ([[hostTextField stringValue] length] == 0) { + [sharingPanelOKButton setEnabled:NO]; + } else { + [sharingPanelOKButton setEnabled:YES]; + } + [selectPlayerBox setContentView:manualView]; + [selectPlayerSheet setFrame:frame display:YES animate:YES]; + [hostTextField selectText:nil]; + } + } else if ( [sender tag] == 5150 ) { + const char *instring = [[sender stringValue] UTF8String]; + unsigned char *result; + result = SHA1(instring, strlen(instring), NULL); + [df setObject:[NSData dataWithBytes:result length:strlen(result)] forKey:@"connectPassword"]; + } else if ( [sender tag] == 5110 ) { + //Cancel + [NSApp endSheet:selectPlayerSheet]; + [selectPlayerSheet orderOut:nil]; + if ([selectPlayerBox contentView] == manualView) { + [hostTextField setStringValue:[df stringForKey:@"sharedPlayerHost"]]; + } else { + } + } else if ( [sender tag] == 5120 ) { + //OK, try to connect + [NSApp endSheet:selectPlayerSheet]; + [selectPlayerSheet orderOut:nil]; + + [self changeSharingSetting:clientPasswordTextField]; + + if ([selectPlayerBox contentView] == manualView) { + [df setObject:[hostTextField stringValue] forKey:@"sharedPlayerHost"]; + } else { + if ([sharingTableView selectedRow] > -1) { + [df setObject:[NSString stringWithCString:inet_ntoa((*(struct sockaddr_in*)[[[[[[NetworkController sharedController] remoteServices] objectAtIndex:[sharingTableView selectedRow]] addresses] objectAtIndex:0] bytes]).sin_addr)] forKey:@"sharedPlayerHost"]; + } + } + + if ([controller connectToServer] == 1) { + [useSharedMenuTunesCheckbox setState:NSOnState]; + [selectedPlayerTextField setStringValue:[[[NetworkController sharedController] networkObject] serverName]]; + [locationTextField setStringValue:[[NetworkController sharedController] remoteHost]]; + } else { + NSRunAlertPanel(@"Connection error.", @"The MenuTunes server you attempted to connect to was not responding. MenuTunes will revert back to the local player.", @"OK", nil, nil); + } + } else if ( [sender tag] == 6010 ) { + //Cancel password entry + [passwordPanel orderOut:nil]; + [NSApp stopModalWithCode:0]; + } else if ( [sender tag] == 6020 ) { + //OK password entry, retry connect + const char *instring = [[passwordPanelTextField stringValue] UTF8String]; + unsigned char *result; + result = SHA1(instring, strlen(instring), NULL); + [df setObject:[NSData dataWithBytes:result length:strlen(result)] forKey:@"connectPassword"]; + [passwordPanel orderOut:nil]; + [NSApp stopModalWithCode:1]; } [df synchronize]; } - (IBAction)changeStatusWindowSetting:(id)sender { + StatusWindow *sw = [StatusWindow sharedWindow]; + ITDebugLog(@"Changing status window setting of tag %i", [sender tag]); + if ( [sender tag] == 2010) { + + BOOL entryEffectValid = YES; + BOOL exitEffectValid = YES; + [df setInteger:[sender selectedRow] forKey:@"statusWindowVerticalPosition"]; [df setInteger:[sender selectedColumn] forKey:@"statusWindowHorizontalPosition"]; - // update the window's position here + [sw setVerticalPosition:[sender selectedRow]]; + [sw setHorizontalPosition:[sender selectedColumn]]; + + // Enable/disable the items in the popups. + [self repopulateEffectPopupsForVerticalPosition:[sw verticalPosition] + horizontalPosition:[sw horizontalPosition]]; + + // Make sure the effects support the new position. + entryEffectValid = ( [self effect:[[sw entryEffect] class] + supportsVerticalPosition:[sw verticalPosition] + withHorizontalPosition:[sw horizontalPosition]] ); + exitEffectValid = ( [self effect:[[sw exitEffect] class] + supportsVerticalPosition:[sw verticalPosition] + withHorizontalPosition:[sw horizontalPosition]] ); + + if ( ! entryEffectValid ) { + [appearanceEffectPopup selectItemAtIndex:[[appearanceEffectPopup menu] indexOfItemWithRepresentedObject:NSClassFromString(@"ITCutWindowEffect")]]; + [self setStatusWindowEntryEffect:NSClassFromString(@"ITCutWindowEffect")]; + } else { + [appearanceEffectPopup selectItemAtIndex:[[appearanceEffectPopup menu] indexOfItemWithRepresentedObject:[[sw entryEffect] class]]]; + } + + if ( ! exitEffectValid ) { + [vanishEffectPopup selectItemAtIndex:[[vanishEffectPopup menu] indexOfItemWithRepresentedObject:NSClassFromString(@"ITDissolveWindowEffect")]]; + [self setStatusWindowExitEffect:NSClassFromString(@"ITDissolveWindowEffect")]; + } else { + [vanishEffectPopup selectItemAtIndex:[[vanishEffectPopup menu] indexOfItemWithRepresentedObject:[[sw exitEffect] class]]]; + } + + [(MainController *)controller showCurrentTrackInfo]; + } else if ( [sender tag] == 2020) { - // update screen selection + + // Update screen selection. + } else if ( [sender tag] == 2030) { - // Update appearance effect + + [self setStatusWindowEntryEffect:[[sender selectedItem] representedObject]]; + [(MainController *)controller showCurrentTrackInfo]; + } else if ( [sender tag] == 2040) { - // Update Vanish Effect + + [self setStatusWindowExitEffect:[[sender selectedItem] representedObject]]; + [(MainController *)controller showCurrentTrackInfo]; + } else if ( [sender tag] == 2050) { - // Update appearance speed + float newTime = ( -([sender floatValue]) ); + [df setFloat:newTime forKey:@"statusWindowAppearanceSpeed"]; + [[sw entryEffect] setEffectTime:newTime]; } else if ( [sender tag] == 2060) { - // Update vanish speed + float newTime = ( -([sender floatValue]) ); + [df setFloat:newTime forKey:@"statusWindowVanishSpeed"]; + [[sw exitEffect] setEffectTime:newTime]; } else if ( [sender tag] == 2070) { - // Update vanish delay + [df setFloat:[sender floatValue] forKey:@"statusWindowVanishDelay"]; + [sw setExitDelay:[sender floatValue]]; } else if ( [sender tag] == 2080) { - // Update "Song Info window when song changes" setting. [df setBool:SENDER_STATE forKey:@"showSongInfoOnChange"]; - } -} + } else if ( [sender tag] == 2090) { + + int setting = [sender indexOfSelectedItem]; + + if ( setting == 0 ) { + [(ITTSWBackgroundView *)[sw contentView] setBackgroundMode:ITTSWBackgroundApple]; + [backgroundColorWell setEnabled:NO]; + [backgroundColorPopup setEnabled:NO]; + } else if ( setting == 1 ) { + [(ITTSWBackgroundView *)[sw contentView] setBackgroundMode:ITTSWBackgroundReadable]; + [backgroundColorWell setEnabled:NO]; + [backgroundColorPopup setEnabled:NO]; + } else if ( setting == 2 ) { + [(ITTSWBackgroundView *)[sw contentView] setBackgroundMode:ITTSWBackgroundColored]; + [backgroundColorWell setEnabled:YES]; + [backgroundColorPopup setEnabled:YES]; + } -- (IBAction)changeHotKey:(id)sender -{ - switch ([sender tag]) - { - case 4010: - [self setKeyCombo:[hotKeysDictionary objectForKey:@"PlayPause"]]; - [self setCurrentHotKey:@"PlayPause"]; - break; - case 4020: - [self setKeyCombo:[hotKeysDictionary objectForKey:@"NextTrack"]]; - [self setCurrentHotKey:@"NextTrack"]; - break; - case 4030: - [self setKeyCombo:[hotKeysDictionary objectForKey:@"PrevTrack"]]; - [self setCurrentHotKey:@"PrevTrack"]; - break; - case 4035: - [self setKeyCombo:[hotKeysDictionary objectForKey:@"ToggleVisualizer"]]; - [self setCurrentHotKey:@"ToggleVisualizer"]; - break; - case 4040: - [self setKeyCombo:[hotKeysDictionary objectForKey:@"ToggleLoop"]]; - [self setCurrentHotKey:@"ToggleLoop"]; - break; - case 4050: - [self setKeyCombo:[hotKeysDictionary objectForKey:@"ToggleShuffle"]]; - [self setCurrentHotKey:@"ToggleShuffle"]; - break; - case 4060: - [self setKeyCombo:[hotKeysDictionary objectForKey:@"TrackInfo"]]; - [self setCurrentHotKey:@"TrackInfo"]; - break; - case 4070: - [self setKeyCombo:[hotKeysDictionary objectForKey:@"UpcomingSongs"]]; - [self setCurrentHotKey:@"UpcomingSongs"]; - break; - case 4080: - [self setKeyCombo:[hotKeysDictionary objectForKey:@"IncrementVolume"]]; - [self setCurrentHotKey:@"IncrementVolume"]; - break; - case 4090: - [self setKeyCombo:[hotKeysDictionary objectForKey:@"DecrementVolume"]]; - [self setCurrentHotKey:@"DecrementVolume"]; - break; - case 4100: - [self setKeyCombo:[hotKeysDictionary objectForKey:@"IncrementRating"]]; - [self setCurrentHotKey:@"IncrementRating"]; - break; - case 4110: - [self setKeyCombo:[hotKeysDictionary objectForKey:@"DecrementRating"]]; - [self setCurrentHotKey:@"DecrementRating"]; - break; + [df setInteger:setting forKey:@"statusWindowBackgroundMode"]; + [(MainController *)controller showCurrentTrackInfo]; + + } else if ( [sender tag] == 2091) { + [self setCustomColor:[sender color] updateWell:NO]; + [(MainController *)controller showCurrentTrackInfo]; + } else if ( [sender tag] == 2092) { + + int selectedItem = [sender indexOfSelectedItem]; + + if ( selectedItem == 1 ) { // An NSPopUpButton in PullDown mode uses item 0 as its title. Its first selectable item is 1. + [self setCustomColor:[NSColor colorWithCalibratedRed:0.92549 green:0.686275 blue:0.0 alpha:1.0] updateWell:YES]; + } else if ( selectedItem == 2 ) { + [self setCustomColor:[NSColor colorWithCalibratedRed:0.380392 green:0.670588 blue:0.0 alpha:1.0] updateWell:YES]; + } else if ( selectedItem == 3 ) { + [self setCustomColor:[NSColor colorWithCalibratedRed:0.443137 green:0.231373 blue:0.619608 alpha:1.0] updateWell:YES]; + } else if ( selectedItem == 4 ) { + [self setCustomColor:[NSColor colorWithCalibratedRed:0.831373 green:0.12549 blue:0.509804 alpha:1.0] updateWell:YES]; + } else if ( selectedItem == 5 ) { + [self setCustomColor:[NSColor colorWithCalibratedRed:0.00784314 green:0.611765 blue:0.662745 alpha:1.0] updateWell:YES]; + } else { + [self setCustomColor:[NSColor colorWithCalibratedWhite:0.15 alpha:0.70] updateWell:YES]; + } + [(MainController *)controller showCurrentTrackInfo]; + + } else if ( [sender tag] == 2095) { + [df setInteger:[sender indexOfSelectedItem] forKey:@"statusWindowSizing"]; + [(MainController *)controller showCurrentTrackInfo]; } + + [df synchronize]; } - (void)registerDefaults { - BOOL found = NO; - NSMutableDictionary *loginWindow; - NSMutableArray *loginArray; - NSEnumerator *loginEnum; - id anItem; - + ITDebugLog(@"Registering defaults."); [df setObject:[NSArray arrayWithObjects: - @"Play/Pause", - @"Next Track", - @"Previous Track", - @"Fast Forward", - @"Rewind", - @"Show Player", - @"", - @"Upcoming Songs", - @"Playlists", - @"Song Rating", - @"", - @"Preferences", - @"Quit", - @"", - @"Current Track Info", + @"trackInfo", + @"separator", + @"playPause", + @"prevTrack", + @"nextTrack", + @"separator", + @"playlists", + @"upcomingSongs", + @"separator", + @"preferences", + @"quit", nil] forKey:@"menu"]; + [df setInteger:MT_CURRENT_VERSION forKey:@"appVersion"]; [df setInteger:5 forKey:@"SongsInAdvance"]; - // [df setBool:YES forKey:@"showName"]; // Song info will always show song title. +// [df setBool:YES forKey:@"showName"]; // Song info will always show song title. [df setBool:YES forKey:@"showArtist"]; + [df setBool:YES forKey:@"showAlbumArtwork"]; [df setBool:NO forKey:@"showAlbum"]; + [df setBool:NO forKey:@"showComposer"]; [df setBool:NO forKey:@"showTime"]; - + [df setBool:NO forKey:@"showToolTip"]; + + [df setObject:@"ITCutWindowEffect" forKey:@"statusWindowAppearanceEffect"]; + [df setObject:@"ITDissolveWindowEffect" forKey:@"statusWindowVanishEffect"]; + [df setFloat:0.8 forKey:@"statusWindowAppearanceSpeed"]; + [df setFloat:0.8 forKey:@"statusWindowVanishSpeed"]; + [df setFloat:4.0 forKey:@"statusWindowVanishDelay"]; + [df setInteger:(int)ITWindowPositionBottom forKey:@"statusWindowVerticalPosition"]; + [df setInteger:(int)ITWindowPositionLeft forKey:@"statusWindowHorizontalPosition"]; + [[StatusWindow sharedWindow] setVerticalPosition:(int)ITWindowPositionBottom]; + [[StatusWindow sharedWindow] setHorizontalPosition:(int)ITWindowPositionLeft]; + [df setBool:YES forKey:@"showSongInfoOnChange"]; + + [df setObject:[NSArchiver archivedDataWithRootObject:[NSColor blueColor]] forKey:@"statusWindowBackgroundColor"]; + [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]] ) { - found = YES; - } + if (ITDoesApplicationLaunchOnLogin([[NSBundle mainBundle] bundlePath])) { + [[StatusWindowController sharedController] showSetupQueryWindow]; } +} - [loginWindow release]; +- (void)autoLaunchOK +{ + [[StatusWindow sharedWindow] setLocked:NO]; + [[StatusWindow sharedWindow] vanish:self]; + [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES]; - // This is teh sux - // We must fix it so it is no longer suxy - if (!found) { - if (NSRunInformationalAlertPanel(@"Auto-launch MenuTunes", @"Would you like MenuTunes to automatically launch at login?", @"Yes", @"No", nil) == NSOKButton) { - 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]]; - ComponentInstance asComponent = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype); - - AECreateDesc(typeChar, [script cString], [script cStringLength], - &scriptDesc); - - OSADoScript(asComponent, &scriptDesc, kOSANullScript, typeChar, kOSAModeCanInteract, &resultDesc); - - AEDisposeDesc(&scriptDesc); - AEDisposeDesc(&resultDesc); - - CloseComponent(asComponent); - } - } + ITSetApplicationLaunchOnLogin([[NSBundle mainBundle] bundlePath], YES); } -- (IBAction)cancelHotKey:(id)sender +- (void)autoLaunchCancel { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - [NSApp endSheet:keyComboPanel]; - [keyComboPanel orderOut:nil]; + [[StatusWindow sharedWindow] setLocked:NO]; + [[StatusWindow sharedWindow] vanish:self]; + [[StatusWindow sharedWindow] setIgnoresMouseEvents:YES]; } -- (IBAction)clearHotKey:(id)sender +- (void)deletePressedInTableView:(NSTableView *)tableView { - [self setKeyCombo:[KeyCombo clearKeyCombo]]; -} - -- (IBAction)okHotKey:(id)sender -{ - NSString *string = [combo userDisplayRep]; - NSEnumerator *enumerator = [hotKeysDictionary keyEnumerator]; - NSString *enumKey; - - if (string == nil) { - string = @""; - } - - while ( (enumKey = [enumerator nextObject]) ) { - if (![enumKey isEqualToString:currentHotKey]) { - if (![combo isEqual:[KeyCombo clearKeyCombo]] && - [combo isEqual:[hotKeysDictionary objectForKey:enumKey]]) { - [window setLevel:NSNormalWindowLevel]; - if ( NSRunAlertPanel(@"Duplicate Key Combo", @"The specified key combo is already in use...", @"Replace", @"Cancel", nil) ) { - [hotKeysDictionary setObject:[KeyCombo clearKeyCombo] forKey:currentHotKey]; - if ([enumKey isEqualToString:@"PlayPause"]) { - [playPauseButton setTitle:@""]; - } else if ([enumKey isEqualToString:@"NextTrack"]) { - [nextTrackButton setTitle:@""]; - } else if ([enumKey isEqualToString:@"PrevTrack"]) { - [previousTrackButton setTitle:@""]; - } else if ([enumKey isEqualToString:@"ToggleVisualizer"]) { - [visualizerButton setTitle:@""]; - } else if ([enumKey isEqualToString:@"TrackInfo"]) { - [trackInfoButton setTitle:@""]; - } else if ([enumKey isEqualToString:@"UpcomingSongs"]) { - [upcomingSongsButton setTitle:@""]; - } else if ([enumKey isEqualToString:@"IncrementVolume"]) { - [volumeIncrementButton setTitle:@""]; - } else if ([enumKey isEqualToString:@"DecrementVolume"]) { - [volumeDecrementButton setTitle:@""]; - } else if ([enumKey isEqualToString:@"IncrementRating"]) { - [ratingIncrementButton setTitle:@""]; - } else if ([enumKey isEqualToString:@"DecrementRating"]) { - [ratingDecrementButton setTitle:@""]; - } else if ([enumKey isEqualToString:@"ToggleShuffle"]) { - [toggleShuffleButton setTitle:@""]; - } else if ([enumKey isEqualToString:@"ToggleLoop"]) { - [toggleLoopButton setTitle:@""]; - } - [df setKeyCombo:[KeyCombo clearKeyCombo] forKey:enumKey]; - } else { - return; - } - [window setLevel:NSStatusWindowLevel]; + if (tableView == menuTableView) { + int selRow = [tableView selectedRow]; + ITDebugLog(@"Delete pressed in menu table view."); + if (selRow != - 1) { + NSString *object = [myItems objectAtIndex:selRow]; + + if ([object isEqualToString:@"preferences"]) { + NSBeep(); + return; } + + if (![object isEqualToString:@"separator"]) + [availableItems addObject:object]; + ITDebugLog(@"Removing object named %@", object); + [myItems removeObjectAtIndex:selRow]; + [menuTableView reloadData]; + [allTableView reloadData]; } + [self changeMenus:self]; } - - [hotKeysDictionary setObject:combo forKey:currentHotKey]; - [df setKeyCombo:combo forKey:currentHotKey]; - - if ([currentHotKey isEqualToString:@"PlayPause"]) { - [playPauseButton setTitle:string]; - [[HotKeyCenter sharedCenter] addHotKey:@"PlayPause" combo:combo target:[MainController sharedController] action:@selector(playPause)]; - } else if ([currentHotKey isEqualToString:@"NextTrack"]) { - [nextTrackButton setTitle:string]; - [[HotKeyCenter sharedCenter] addHotKey:@"NextTrack" combo:combo target:[MainController sharedController] action:@selector(nextSong)]; - } else if ([currentHotKey isEqualToString:@"PrevTrack"]) { - [previousTrackButton setTitle:string]; - [[HotKeyCenter sharedCenter] addHotKey:@"PrevTrack" combo:combo target:[MainController sharedController] action:@selector(prevSong)]; - } else if ([currentHotKey isEqualToString:@"ToggleVisualizer"]) { - [visualizerButton setTitle:string]; - //[[HotKeyCenter sharedCenter] addHotKey:@"ToggleVisualizer" combo:combo target:[MainController sharedController] selector:@selector(NULL)]; - } else if ([currentHotKey isEqualToString:@"TrackInfo"]) { - [trackInfoButton setTitle:string]; - [[HotKeyCenter sharedCenter] addHotKey:@"TrackInfo" combo:combo target:[MainController sharedController] action:@selector(showCurrentTrackInfo)]; - } else if ([currentHotKey isEqualToString:@"UpcomingSongs"]) { - [upcomingSongsButton setTitle:string]; - [[HotKeyCenter sharedCenter] addHotKey:@"UpcomingSongs" combo:combo target:[MainController sharedController] action:@selector(showUpcomingSongs)]; - } else if ([currentHotKey isEqualToString:@"IncrementVolume"]) { - [volumeIncrementButton setTitle:string]; - [[HotKeyCenter sharedCenter] addHotKey:@"IncrementVolume" combo:combo target:[MainController sharedController] action:@selector(incrementVolume)]; - } else if ([currentHotKey isEqualToString:@"DecrementVolume"]) { - [volumeDecrementButton setTitle:string]; - [[HotKeyCenter sharedCenter] addHotKey:@"DecrementVolume" combo:combo target:[MainController sharedController] action:@selector(decrementVolume)]; - } else if ([currentHotKey isEqualToString:@"IncrementRating"]) { - [ratingIncrementButton setTitle:string]; - [[HotKeyCenter sharedCenter] addHotKey:@"IncrementRating" combo:combo target:[MainController sharedController] action:@selector(incrementRating)]; - } else if ([currentHotKey isEqualToString:@"DecrementRating"]) { - [ratingDecrementButton setTitle:string]; - [[HotKeyCenter sharedCenter] addHotKey:@"DecrementRating" combo:combo target:[MainController sharedController] action:@selector(decrementRating)]; - } else if ([currentHotKey isEqualToString:@"ToggleShuffle"]) { - [toggleShuffleButton setTitle:string]; - [[HotKeyCenter sharedCenter] addHotKey:@"ToggleShuffle" combo:combo target:[MainController sharedController] action:@selector(toggleShuffle)]; - } else if ([currentHotKey isEqualToString:@"ToggleLoop"]) { - [toggleLoopButton setTitle:string]; - [[HotKeyCenter sharedCenter] addHotKey:@"ToggleLoop" combo:combo target:[MainController sharedController] action:@selector(toggleLoop)]; - } - [self cancelHotKey:sender]; } - +- (void)resetRemotePlayerTextFields +{ + if ([[NetworkController sharedController] isConnectedToServer]) { + [selectedPlayerTextField setStringValue:[[[NetworkController sharedController] networkObject] serverName]]; + [locationTextField setStringValue:[[NetworkController sharedController] remoteHost]]; + } else { + [selectedPlayerTextField setStringValue:@"No shared player selected."]; + [locationTextField setStringValue:@"-"]; + } +} /*************************************************************************/ #pragma mark - #pragma mark HOTKEY SUPPORT METHODS /*************************************************************************/ -- (void)setCurrentHotKey:(NSString *)key +- (IBAction)clearHotKey:(id)sender { - [currentHotKey autorelease]; - currentHotKey = [key copy]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyEvent:) name:@"KeyBroadcasterEvent" object:nil]; - [NSApp beginSheet:keyComboPanel modalForWindow:window modalDelegate:self didEndSelector:nil contextInfo:nil]; + [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:[hotKeysArray objectAtIndex:[hotKeysTableView selectedRow]]]; + [df setObject:[[ITKeyCombo clearKeyCombo] plistRepresentation] forKey:[hotKeysArray objectAtIndex:[hotKeysTableView selectedRow]]]; + [controller setupHotKeys]; + [hotKeysTableView reloadData]; } -- (void)keyEvent:(NSNotification *)note +- (IBAction)editHotKey:(id)sender { - NSDictionary *info = [note userInfo]; - short keyCode; - long modifiers; - KeyCombo *newCombo; + ITKeyComboPanel *panel = [ITKeyComboPanel sharedPanel]; + NSString *keyComboKey = [hotKeysArray objectAtIndex:[hotKeysTableView selectedRow]]; + ITKeyCombo *keyCombo; - keyCode = [[info objectForKey:@"KeyCode"] shortValue]; - modifiers = [[info objectForKey:@"Modifiers"] longValue]; - - newCombo = [[KeyCombo alloc] initWithKeyCode:keyCode andModifiers:modifiers]; - [self setKeyCombo:newCombo]; + ITDebugLog(@"Setting key combo on hot key %@.", keyComboKey); + [controller clearHotKeys]; + [panel setKeyCombo:[hotKeysDictionary objectForKey:[hotKeysArray objectAtIndex:[hotKeysTableView selectedRow]]]]; + [panel setKeyBindingName:[hotKeyNamesArray objectAtIndex:[hotKeysTableView selectedRow]]]; + if ([panel runModal] == NSOKButton) { + NSEnumerator *keyEnumerator = [[hotKeysDictionary allKeys] objectEnumerator]; + NSString *nextKey; + keyCombo = [panel keyCombo]; + + //Check for duplicate key combo + while ( (nextKey = [keyEnumerator nextObject]) ) { + if ([[hotKeysDictionary objectForKey:nextKey] isEqual:keyCombo] && + ![keyCombo isEqual:[ITKeyCombo clearKeyCombo]]) { + [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] + forKey:nextKey]; + [df setObject:[[ITKeyCombo clearKeyCombo] plistRepresentation] + forKey:nextKey]; + } + } + + [hotKeysDictionary setObject:keyCombo forKey:keyComboKey]; + [df setObject:[keyCombo plistRepresentation] forKey:keyComboKey]; + [controller setupHotKeys]; + [hotKeysTableView reloadData]; + ITDebugLog(@"Set combo %@ on hot key %@.", keyCombo, keyComboKey); + } else { + ITDebugLog(@"Hot key setting on hot key %@ cancelled.", keyComboKey); + } } -- (void)setKeyCombo:(KeyCombo *)newCombo +- (void)hotKeysTableViewDoubleClicked:(id)sender { - NSString *string; - [combo release]; - combo = [newCombo copy]; - - string = [combo userDisplayRep]; - if (string == nil) { - string = @""; + if ([sender clickedRow] > -1) { + [self editHotKey:sender]; } - [keyComboField setStringValue:string]; } - /*************************************************************************/ #pragma mark - #pragma mark PRIVATE METHOD IMPLEMENTATIONS @@ -421,8 +700,9 @@ static PreferencesController *prefs = nil; - (void)setupWindow { - if ( ! [NSBundle loadNibNamed:@"Preferences" owner:self] ) { - NSLog( @"Failed to load Preferences.nib" ); + ITDebugLog(@"Loading Preferences.nib."); + if (![NSBundle loadNibNamed:@"Preferences" owner:self]) { + ITDebugLog(@"Failed to load Preferences.nib."); NSBeep(); return; } @@ -431,7 +711,7 @@ static PreferencesController *prefs = nil; - (void)setupCustomizationTables { NSImageCell *imgCell = [[[NSImageCell alloc] initImageCell:nil] autorelease]; - + ITDebugLog(@"Setting up table views."); // Set the table view cells up [imgCell setImageScaling:NSScaleNone]; [[menuTableView tableColumnWithIdentifier:@"submenu"] setDataCell:imgCell]; @@ -452,20 +732,24 @@ static PreferencesController *prefs = nil; { NSEnumerator *itemEnum; id anItem; + ITDebugLog(@"Setting up table view arrays."); // 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", - @"Show Player", - @"", + @"separator", + @"trackInfo", + @"upcomingSongs", + @"playlists", + @"artists", + @"albums", + @"eqPresets", + @"songRating", + @"playPause", + @"nextTrack", + @"prevTrack", + @"fastForward", + @"rewind", + @"showPlayer", + @"quit", nil]; // Get our preferred menu @@ -474,206 +758,273 @@ static PreferencesController *prefs = nil; // Delete items in the availableItems array that are already part of the menu itemEnum = [myItems objectEnumerator]; while ( (anItem = [itemEnum nextObject]) ) { - if ( ! [anItem isEqualToString:@""] ) { + if (![anItem isEqualToString:@"separator"]) { [availableItems removeObject:anItem]; } } // Items that show should a submenu image submenuItems = [[NSArray alloc] initWithObjects: - @"Upcoming Songs", - @"Playlists", - @"EQ Presets", - @"Song Rating", + @"upcomingSongs", + @"playlists", + @"artists", + @"albums", + @"eqPresets", + @"songRating", nil]; } - (void)setupUI { - NSMutableDictionary *loginwindow; - NSMutableArray *loginarray; - NSEnumerator *loginEnum; + NSEnumerator *keyArrayEnum; + NSString *serverName; + NSData *colorData; + int selectedBGStyle; id anItem; + [df setInteger:MT_CURRENT_VERSION forKey:@"appVersion"]; + + ITDebugLog(@"Setting up preferences UI."); // 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"]){ - anItem = [df keyComboForKey:@"PlayPause"]; - [hotKeysDictionary setObject:anItem forKey:@"PlayPause"]; - [playPauseButton setTitle:[anItem userDisplayRep]]; - } else { - [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"PlayPause"]; - } + // Fill hot key array + keyArrayEnum = [hotKeysArray objectEnumerator]; - if ([df objectForKey:@"NextTrack"]) { - anItem = [df keyComboForKey:@"NextTrack"]; - [hotKeysDictionary setObject:anItem forKey:@"NextTrack"]; - [nextTrackButton setTitle:[anItem userDisplayRep]]; - } else { - [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"NextTrack"]; + while ( (anItem = [keyArrayEnum nextObject]) ) { + if ([df objectForKey:anItem]) { + ITDebugLog(@"Setting up \"%@\" hot key.", anItem); + [hotKeysDictionary setObject:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:anItem]] forKey:anItem]; + } else { + [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:anItem]; + } } - if ([df objectForKey:@"PrevTrack"]) { - anItem = [df keyComboForKey:@"PrevTrack"]; - [hotKeysDictionary setObject:anItem forKey:@"PrevTrack"]; - [previousTrackButton setTitle:[anItem userDisplayRep]]; + ITDebugLog(@"Setting up track info checkboxes."); + // Check current track info buttons + [albumCheckbox setState:[df boolForKey:@"showAlbum"] ? 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]; + [composerCheckbox setState:[df boolForKey:@"showComposer"] ? NSOnState : NSOffState]; + [trackTimeCheckbox setState:[df boolForKey:@"showTime"] ? NSOnState : NSOffState]; + [trackNumberCheckbox setState:[df boolForKey:@"showTrackNumber"] ? NSOnState : NSOffState]; + [playCountCheckbox setState:[df boolForKey:@"showPlayCount"] ? NSOnState : NSOffState]; + [ratingCheckbox setState:[df boolForKey:@"showTrackRating"] ? NSOnState : NSOffState]; + [albumArtworkCheckbox setState:[df boolForKey:@"showAlbumArtwork"] ? NSOnState : NSOffState]; + + if ([df boolForKey:@"runScripts"]) { + [runScriptsCheckbox setState:NSOnState]; + [showScriptsButton setEnabled:YES]; } else { - [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"PrevTrack"]; + [showScriptsButton setEnabled:NO]; } - if ([df objectForKey:@"ToggleVisualizer"]) { - anItem = [df keyComboForKey:@"ToggleVisualizer"]; - [hotKeysDictionary setObject:anItem forKey:@"ToggleVisualizer"]; - [visualizerButton setTitle:[anItem userDisplayRep]]; - } else { - [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"ToggleVisualizer"]; + // Set the launch at login checkbox state + ITDebugLog(@"Setting launch at login state."); + if (ITDoesApplicationLaunchOnLogin([[NSBundle mainBundle] bundlePath])) { + [launchAtLoginCheckbox setState:NSOnState]; } - if ([df objectForKey:@"TrackInfo"]) { - anItem = [df keyComboForKey:@"TrackInfo"]; - [hotKeysDictionary setObject:anItem forKey:@"TrackInfo"]; - [trackInfoButton setTitle:[anItem userDisplayRep]]; + // Set the launch player checkbox state + ITDebugLog(@"Setting launch player with MenuTunes state."); + [launchPlayerAtLaunchCheckbox setState:[df boolForKey:@"LaunchPlayerWithMT"] ? NSOnState : NSOffState]; + + // Setup the positioning controls + [positionMatrix selectCellAtRow:[df integerForKey:@"statusWindowVerticalPosition"] + column:[df integerForKey:@"statusWindowHorizontalPosition"]]; + + // Setup effects controls + // Populate the effects popups + [appearanceEffectPopup setAutoenablesItems:NO]; + [vanishEffectPopup setAutoenablesItems:NO]; + [self repopulateEffectPopupsForVerticalPosition:[df integerForKey:@"statusWindowVerticalPosition"] + horizontalPosition:[df integerForKey:@"statusWindowHorizontalPosition"]]; + + // Attempt to find the pref'd effect in the list. + // If it's not there, use cut/dissolve. + if ( [effectClasses containsObject:NSClassFromString([df stringForKey:@"statusWindowAppearanceEffect"])] ) { + [appearanceEffectPopup selectItemAtIndex:[effectClasses indexOfObject:NSClassFromString([df stringForKey:@"statusWindowAppearanceEffect"])]]; } else { - [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"TrackInfo"]; + [appearanceEffectPopup selectItemAtIndex:[effectClasses indexOfObject:NSClassFromString(@"ITCutWindowEffect")]]; } - if ([df objectForKey:@"UpcomingSongs"]) { - anItem = [df keyComboForKey:@"UpcomingSongs"]; - [hotKeysDictionary setObject:anItem forKey:@"UpcomingSongs"]; - [upcomingSongsButton setTitle:[anItem userDisplayRep]]; + if ( [effectClasses containsObject:NSClassFromString([df stringForKey:@"statusWindowVanishEffect"])] ) { + [vanishEffectPopup selectItemAtIndex:[effectClasses indexOfObject:NSClassFromString([df stringForKey:@"statusWindowVanishEffect"])]]; } else { - [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"UpcomingSongs"]; + [vanishEffectPopup selectItemAtIndex:[effectClasses indexOfObject:NSClassFromString(@"ITCutWindowEffect")]]; } - if ([df objectForKey:@"IncrementVolume"]) { - anItem = [df keyComboForKey:@"IncrementVolume"]; - [hotKeysDictionary setObject:anItem forKey:@"IncrementVolume"]; - [volumeIncrementButton setTitle:[anItem userDisplayRep]]; + [appearanceSpeedSlider setFloatValue:( -([df floatForKey:@"statusWindowAppearanceSpeed"]) )]; + [vanishSpeedSlider setFloatValue:( -([df floatForKey:@"statusWindowVanishSpeed"]) )]; + [vanishDelaySlider setFloatValue:[df floatForKey:@"statusWindowVanishDelay"]]; + + // Setup General Controls + selectedBGStyle = [df integerForKey:@"statusWindowBackgroundMode"]; + [backgroundStylePopup selectItem:[backgroundStylePopup itemAtIndex:[backgroundStylePopup indexOfItemWithTag:selectedBGStyle]]]; + + if ( selectedBGStyle == ITTSWBackgroundColored ) { + [backgroundColorWell setEnabled:YES]; + [backgroundColorPopup setEnabled:YES]; } else { - [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"IncrementVolume"]; + [backgroundColorWell setEnabled:NO]; + [backgroundColorPopup setEnabled:NO]; } - - if ([df objectForKey:@"DecrementVolume"]) { - anItem = [df keyComboForKey:@"DecrementVolume"]; - [hotKeysDictionary setObject:anItem forKey:@"DecrementVolume"]; - [volumeDecrementButton setTitle:[anItem userDisplayRep]]; + + colorData = [df dataForKey:@"statusWindowBackgroundColor"]; + + if ( colorData ) { + [backgroundColorWell setColor:(NSColor *)[NSUnarchiver unarchiveObjectWithData:colorData]]; } else { - [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"DecrementVolume"]; + [backgroundColorWell setColor:[NSColor blueColor]]; } - if ([df objectForKey:@"IncrementRating"]) { - anItem = [df keyComboForKey:@"IncrementRating"]; - [hotKeysDictionary setObject:anItem forKey:@"IncrementRating"]; - [ratingIncrementButton setTitle:[anItem userDisplayRep]]; - } else { - [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"IncrementRating"]; + [showOnChangeCheckbox setState:([df boolForKey:@"showSongInfoOnChange"] ? NSOnState : NSOffState)]; + + [windowSizingPopup selectItem:[windowSizingPopup itemAtIndex:[windowSizingPopup indexOfItemWithTag:[df integerForKey:@"statusWindowSizing"]]]]; + + // Setup the sharing controls + if ([df boolForKey:@"enableSharing"]) { + [shareMenuTunesCheckbox setState:NSOnState]; + [useSharedMenuTunesCheckbox setEnabled:NO]; + [selectSharedPlayerButton setEnabled:NO]; + [passwordTextField setEnabled:YES]; + [nameTextField setEnabled:YES]; + } else if ([df boolForKey:@"useSharedPlayer"]) { + [useSharedMenuTunesCheckbox setState:NSOnState]; + [shareMenuTunesCheckbox setEnabled:NO]; + [selectSharedPlayerButton setEnabled:YES]; } - if ([df objectForKey:@"DecrementRating"]) { - anItem = [df keyComboForKey:@"DecrementRating"]; - [hotKeysDictionary setObject:anItem forKey:@"DecrementRating"]; - [ratingDecrementButton setTitle:[anItem userDisplayRep]]; - } else { - [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"DecrementRating"]; + [[NSNotificationCenter defaultCenter] addObserver:sharingTableView selector:@selector(reloadData) name:@"ITMTFoundNetService" object:nil]; + + serverName = [df stringForKey:@"sharedPlayerName"]; + if (!serverName || [serverName length] == 0) { + serverName = @"MenuTunes Shared Player"; } + [nameTextField setStringValue:serverName]; - if ([df objectForKey:@"ToggleLoop"]) { - anItem = [df keyComboForKey:@"ToggleLoop"]; - [hotKeysDictionary setObject:anItem forKey:@"ToggleLoop"]; - [toggleLoopButton setTitle:[anItem userDisplayRep]]; + [selectPlayerBox setContentView:zeroConfView]; + if ([[df dataForKey:@"sharedPlayerPassword"] length] > 0) { + [passwordTextField setStringValue:@"p4s5w0rdMT1.2"]; } else { - [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"ToggleLoop"]; + [passwordTextField setStringValue:@""]; + } + if ([df stringForKey:@"sharedPlayerHost"]) { + [hostTextField setStringValue:[df stringForKey:@"sharedPlayerHost"]]; } - if ([df objectForKey:@"ToggleShuffle"]) { - anItem = [df keyComboForKey:@"ToggleShuffle"]; - [hotKeysDictionary setObject:anItem forKey:@"ToggleShuffle"]; - [toggleShuffleButton setTitle:[anItem userDisplayRep]]; + if ([[NetworkController sharedController] isConnectedToServer]) { + [selectedPlayerTextField setStringValue:[[[NetworkController sharedController] networkObject] serverName]]; + [locationTextField setStringValue:[[NetworkController sharedController] remoteHost]]; } else { - [hotKeysDictionary setObject:[KeyCombo keyCombo] forKey:@"ToggleShuffle"]; + [selectedPlayerTextField setStringValue:@"No shared player selected."]; + [locationTextField setStringValue:@"-"]; } +} + +- (void)setStatusWindowEntryEffect:(Class)effectClass +{ + StatusWindow *sw = [StatusWindow sharedWindow]; - // Check current track info buttons - [albumCheckbox setState:[df boolForKey:@"showAlbum"] ? 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]; - [trackNumberCheckbox setState:[df boolForKey:@"showTrackNumber"] ? NSOnState : NSOffState]; - - // Set the launch at login checkbox state - [df synchronize]; - loginwindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy]; - loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"]; + float time = ([df floatForKey:@"statusWindowAppearanceSpeed"] ? [df floatForKey:@"statusWindowAppearanceSpeed"] : 0.8); + [df setObject:NSStringFromClass(effectClass) forKey:@"statusWindowAppearanceEffect"]; - loginEnum = [loginarray objectEnumerator]; - while ( (anItem = [loginEnum nextObject]) ) { - if ([[[anItem objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]]) { - [launchAtLoginCheckbox setState:NSOnState]; - } - } + [sw setEntryEffect:[[[effectClass alloc] initWithWindow:sw] autorelease]]; + [[sw entryEffect] setEffectTime:time]; } -- (IBAction)changeMenus:(id)sender +- (void)setStatusWindowExitEffect:(Class)effectClass { - [df setObject:myItems forKey:@"menu"]; - [df synchronize]; + StatusWindow *sw = [StatusWindow sharedWindow]; + + float time = ([df floatForKey:@"statusWindowVanishSpeed"] ? [df floatForKey:@"statusWindowVanishSpeed"] : 0.8); + [df setObject:NSStringFromClass(effectClass) forKey:@"statusWindowVanishEffect"]; + + [sw setExitEffect:[[[effectClass alloc] initWithWindow:sw] autorelease]]; + [[sw exitEffect] setEffectTime:time]; } -- (void)setLaunchesAtLogin:(BOOL)flag +- (void)setCustomColor:(NSColor *)color updateWell:(BOOL)update { - 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"]; + [(ITTSWBackgroundView *)[[StatusWindow sharedWindow] contentView] setBackgroundColor:color]; + [df setObject:[NSArchiver archivedDataWithRootObject:color] forKey:@"statusWindowBackgroundColor"]; + + if ( update ) { + [backgroundColorWell setColor:color]; + } +} - for (i = 0; i < [loginarray count]; i++) { - NSDictionary *tempDict = [loginarray objectAtIndex:i]; - if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]]) { - skip = YES; - } +- (void)repopulateEffectPopupsForVerticalPosition:(ITVerticalWindowPosition)vPos horizontalPosition:(ITHorizontalWindowPosition)hPos +{ + NSEnumerator *effectEnum = [effectClasses objectEnumerator]; + id anItem; + + [appearanceEffectPopup removeAllItems]; + [vanishEffectPopup removeAllItems]; + + while ( (anItem = [effectEnum nextObject]) ) { + [appearanceEffectPopup addItemWithTitle:[anItem effectName]]; + [vanishEffectPopup addItemWithTitle:[anItem effectName]]; + + [[appearanceEffectPopup lastItem] setRepresentedObject:anItem]; + [[vanishEffectPopup lastItem] setRepresentedObject:anItem]; + + if ( [self effect:anItem supportsVerticalPosition:vPos withHorizontalPosition:hPos] ) { + [[appearanceEffectPopup lastItem] setEnabled:YES]; + [[vanishEffectPopup lastItem] setEnabled:YES]; + } else { + [[appearanceEffectPopup lastItem] setEnabled:NO]; + [[vanishEffectPopup lastItem] setEnabled:NO]; } + } + +} - 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); +- (BOOL)effect:(Class)effectClass supportsVerticalPosition:(ITVerticalWindowPosition)vPos withHorizontalPosition:(ITHorizontalWindowPosition)hPos +{ + BOOL valid = NO; + + if ( vPos == ITWindowPositionTop ) { + if ( hPos == ITWindowPositionLeft ) { + valid = ( [[[[effectClass supportedPositions] objectForKey:@"Top"] objectForKey:@"Left"] boolValue] ) ; + } else if ( hPos == ITWindowPositionCenter ) { + valid = ( [[[[effectClass supportedPositions] objectForKey:@"Top"] objectForKey:@"Center"] boolValue] ); + } else if ( hPos == ITWindowPositionRight ) { + valid = ( [[[[effectClass supportedPositions] objectForKey:@"Top"] objectForKey:@"Right"] boolValue] ); } - - } 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; - } + } else if ( vPos == ITWindowPositionMiddle ) { + if ( hPos == ITWindowPositionLeft ) { + valid = ( [[[[effectClass supportedPositions] objectForKey:@"Middle"] objectForKey:@"Left"] boolValue] ); + } else if ( hPos == ITWindowPositionCenter ) { + valid = ( [[[[effectClass supportedPositions] objectForKey:@"Middle"] objectForKey:@"Center"] boolValue] ); + } else if ( hPos == ITWindowPositionRight ) { + valid = ( [[[[effectClass supportedPositions] objectForKey:@"Middle"] objectForKey:@"Right"] boolValue] ); } + } else if ( vPos == ITWindowPositionBottom ) { + if ( hPos == ITWindowPositionLeft ) { + valid = ( [[[[effectClass supportedPositions] objectForKey:@"Bottom"] objectForKey:@"Left"] boolValue] ); + } else if ( hPos == ITWindowPositionCenter ) { + valid = ( [[[[effectClass supportedPositions] objectForKey:@"Bottom"] objectForKey:@"Center"] boolValue] ); + } else if ( hPos == ITWindowPositionRight ) { + valid = ( [[[[effectClass supportedPositions] objectForKey:@"Bottom"] objectForKey:@"Right"] boolValue] ); + } + } + + return valid; +} + +- (IBAction)changeMenus:(id)sender +{ + ITDebugLog(@"Synchronizing menus"); + [df setObject:myItems forKey:@"menu"]; + [df synchronize]; + + [[controller menuController] performSelector:@selector(rebuildSubmenus) withObject:nil afterDelay:0.0]; + + //If we're connected over a network, refresh the menu immediately + if ([[NetworkController sharedController] isConnectedToServer]) { + [controller timerUpdate]; } } @@ -688,6 +1039,21 @@ static PreferencesController *prefs = nil; [(MainController *)controller closePreferences]; } +/*************************************************************************/ +#pragma mark - +#pragma mark NSTextField DELEGATE METHODS +/*************************************************************************/ + +- (void)controlTextDidChange:(NSNotification*)note +{ + if ([note object] == hostTextField) { + if ([[hostTextField stringValue] length] == 0) { + [sharingPanelOKButton setEnabled:NO]; + } else { + [sharingPanelOKButton setEnabled:YES]; + } + } +} /*************************************************************************/ #pragma mark - @@ -698,38 +1064,66 @@ static PreferencesController *prefs = nil; { if (aTableView == menuTableView) { return [myItems count]; - } else { + } else if (aTableView == allTableView) { return [availableItems count]; + } else if (aTableView == hotKeysTableView) { + return [hotKeysArray count]; + } else { + return [[[NetworkController sharedController] remoteServices] count]; } } - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex { if (aTableView == menuTableView) { + NSString *object = [myItems objectAtIndex:rowIndex]; if ([[aTableColumn identifier] isEqualToString:@"name"]) { - NSString *object = [myItems objectAtIndex:rowIndex]; - if ([object isEqualToString:@"Show Player"]) { - return [NSString stringWithFormat:@"Show %@", [[controller currentRemote] playerSimpleName]]; + if ([object isEqualToString:@"showPlayer"]) { + NSString *string = nil; + NS_DURING + string = [NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"show", @"Show"), [[controller currentRemote] playerSimpleName]]; + NS_HANDLER + [controller networkError:localException]; + NS_ENDHANDLER + return string; } - return object; + return NSLocalizedString(object, @"ERROR"); } else { - if ([submenuItems containsObject:[myItems objectAtIndex:rowIndex]]) + if ([submenuItems containsObject:object]) { return [NSImage imageNamed:@"submenu"]; } else { return nil; } } - } else { + } else if (aTableView == allTableView) { + NSString *object = [availableItems objectAtIndex:rowIndex]; if ([[aTableColumn identifier] isEqualToString:@"name"]) { - return [availableItems objectAtIndex:rowIndex]; + if ([object isEqualToString:@"showPlayer"]) { + NSString *string = nil; + NS_DURING + string = [NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"show", @"Show"), [[controller currentRemote] playerSimpleName]]; + NS_HANDLER + [controller networkError:localException]; + NS_ENDHANDLER + return string; + } + return NSLocalizedString(object, @"ERROR"); } else { - if ([submenuItems containsObject:[availableItems objectAtIndex:rowIndex]]) { + if ([submenuItems containsObject:object]) { return [NSImage imageNamed:@"submenu"]; } else { return nil; } } + } else if (aTableView == hotKeysTableView) { + if ([[aTableColumn identifier] isEqualToString:@"name"]) { + return [hotKeyNamesArray objectAtIndex:rowIndex]; + } else { + return [[hotKeysDictionary objectForKey:[hotKeysArray objectAtIndex:rowIndex]] description]; + } + } else { + return [[[[NetworkController sharedController] remoteServices] objectAtIndex:rowIndex] name]; } } @@ -761,28 +1155,30 @@ static PreferencesController *prefs = nil; dragData = [pb stringForType:@"MenuTableViewPboardType"]; dragRow = [dragData intValue]; temp = [myItems objectAtIndex:dragRow]; - [myItems removeObjectAtIndex:dragRow]; if (tableView == menuTableView) { + [myItems insertObject:temp atIndex:row]; if (row > dragRow) { - [myItems insertObject:temp atIndex:row - 1]; + [myItems removeObjectAtIndex:dragRow]; } else { - [myItems insertObject:temp atIndex:row]; + [myItems removeObjectAtIndex:dragRow + 1]; } - } else { - if (![temp isEqualToString:@""]) { + } else if (tableView == allTableView) { + if (![temp isEqualToString:@"separator"]) { [availableItems addObject:temp]; } + [myItems removeObjectAtIndex:dragRow]; } } else if ([[pb types] containsObject:@"AllTableViewPboardType"]) { dragData = [pb stringForType:@"AllTableViewPboardType"]; dragRow = [dragData intValue]; temp = [availableItems objectAtIndex:dragRow]; - if (![temp isEqualToString:@""]) { + [myItems insertObject:temp atIndex:row]; + + if (![temp isEqualToString:@"separator"]) { [availableItems removeObjectAtIndex:dragRow]; } - [myItems insertObject:temp atIndex:row]; } [menuTableView reloadData]; @@ -800,7 +1196,7 @@ static PreferencesController *prefs = nil; 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; } } @@ -813,7 +1209,6 @@ static PreferencesController *prefs = nil; { return NSDragOperationNone; } - return NSDragOperationGeneric; } @@ -825,9 +1220,9 @@ static PreferencesController *prefs = nil; - (void)dealloc { - [self setKeyCombo:nil]; + [hotKeysArray release]; [hotKeysDictionary release]; - [keyComboPanel release]; + [effectClasses release]; [menuTableView setDataSource:nil]; [allTableView setDataSource:nil]; [controller release]; @@ -837,5 +1232,4 @@ static PreferencesController *prefs = nil; [df release]; } - @end