From: Kent Sutherland Date: Sun, 28 Sep 2003 20:06:30 +0000 (+0000) Subject: Added ITDebugLogs to MainController and PreferencesController. X-Git-Tag: v1.0~42 X-Git-Url: http://git.ithinksw.org/MenuTunes.git/commitdiff_plain/a509b00348962d2980891d0c66657028e280e162 Added ITDebugLogs to MainController and PreferencesController. --- diff --git a/MainController.m b/MainController.m index 10a944b..a480e3b 100755 --- a/MainController.m +++ b/MainController.m @@ -79,13 +79,9 @@ static MainController *sharedController; [self applicationLaunched:nil]; } else { if ([df boolForKey:@"LaunchPlayerWithMT"]) - { [self showPlayer]; - } else - { [self applicationTerminated:nil]; - } } [statusItem setImage:[NSImage imageNamed:@"MenuNormal"]]; @@ -95,7 +91,7 @@ static MainController *sharedController; - (ITMTRemote *)loadRemote { NSString *folderPath = [[NSBundle mainBundle] builtInPlugInsPath]; - + ITDebugLog(@"Gathering remotes."); if (folderPath) { NSArray *bundlePathList = [NSBundle pathsForResourcesOfType:@"remote" inDirectory:folderPath]; NSEnumerator *enumerator = [bundlePathList objectEnumerator]; @@ -109,8 +105,8 @@ static MainController *sharedController; if ([remoteClass conformsToProtocol:@protocol(ITMTRemote)] && [remoteClass isKindOfClass:[NSObject class]]) { - id remote = [remoteClass remote]; + ITDebugLog(@"Adding remote at path %@", bundlePath); [remoteArray addObject:remote]; } } @@ -132,7 +128,7 @@ static MainController *sharedController; #pragma mark INSTANCE METHODS /*************************************************************************/ -- (void)startTimerInNewThread +/*- (void)startTimerInNewThread { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSRunLoop *runLoop = [NSRunLoop currentRunLoop]; @@ -142,8 +138,9 @@ static MainController *sharedController; userInfo:nil repeats:YES] retain]; [runLoop run]; + ITDebugLog(@"Timer started."); [pool release]; -} +}*/ - (BOOL)songIsPlaying { @@ -167,18 +164,15 @@ static MainController *sharedController; - (void)setLatestSongIdentifier:(NSString *)newIdentifier { + ITDebugLog(@"Setting latest song identifier to %@", newIdentifier); [_latestSongIdentifier autorelease]; _latestSongIdentifier = [newIdentifier copy]; } - (void)timerUpdate { - //This huge if statement is being nasty - /*if ( ( [self songChanged] ) || - ( ([self radioIsPlaying]) && (latestPlaylistClass != ITMTRemotePlayerRadioPlaylist) ) || - ( (! [self radioIsPlaying]) && (latestPlaylistClass == ITMTRemotePlayerRadioPlaylist) ) )*/ - if ( [self songChanged] ) { + ITDebugLog(@"The song changed."); [self setLatestSongIdentifier:[currentRemote playerStateUniqueIdentifier]]; latestPlaylistClass = [currentRemote currentPlaylistClass]; [menuController rebuildSubmenus]; @@ -191,6 +185,7 @@ static MainController *sharedController; - (void)menuClicked { + ITDebugLog(@"Menu clicked."); if ([currentRemote playerRunningState] == ITMTRemotePlayerRunning) { [statusItem setMenu:[menuController menu]]; } else { @@ -207,7 +202,7 @@ static MainController *sharedController; - (void)playPause { ITMTRemotePlayerPlayingState state = [currentRemote playerPlayingState]; - + ITDebugLog(@"Play/Pause toggled"); if (state == ITMTRemotePlayerPlaying) { [currentRemote pause]; } else if ((state == ITMTRemotePlayerForwarding) || (state == ITMTRemotePlayerRewinding)) { @@ -216,85 +211,90 @@ static MainController *sharedController; } else { [currentRemote play]; } - [self timerUpdate]; } - (void)nextSong { + ITDebugLog(@"Going to next song."); [currentRemote goToNextSong]; - [self timerUpdate]; } - (void)prevSong { + ITDebugLog(@"Going to previous song."); [currentRemote goToPreviousSong]; - [self timerUpdate]; } - (void)fastForward { + ITDebugLog(@"Fast forwarding."); [currentRemote forward]; - [self timerUpdate]; } - (void)rewind { + ITDebugLog(@"Rewinding."); [currentRemote rewind]; - [self timerUpdate]; } - (void)selectPlaylistAtIndex:(int)index { + ITDebugLog(@"Selecting playlist %i", index); [currentRemote switchToPlaylistAtIndex:index]; - [self timerUpdate]; } - (void)selectSongAtIndex:(int)index { + ITDebugLog(@"Selecting song %i", index); [currentRemote switchToSongAtIndex:index]; - [self timerUpdate]; } - (void)selectSongRating:(int)rating { + ITDebugLog(@"Selecting song rating %i", rating); [currentRemote setCurrentSongRating:(float)rating / 100.0]; - [self timerUpdate]; } - (void)selectEQPresetAtIndex:(int)index { + ITDebugLog(@"Selecting EQ preset %i", index); [currentRemote switchToEQAtIndex:index]; - [self timerUpdate]; } - (void)showPlayer { + ITDebugLog(@"Beginning show player."); if ( ( playerRunningState == ITMTRemotePlayerRunning) ) { + ITDebugLog(@"Showing player interface."); [currentRemote showPrimaryInterface]; } else { + ITDebugLog(@"Launching player."); if (![[NSWorkspace sharedWorkspace] launchApplication:[currentRemote playerFullName]]) { - NSLog(@"MenuTunes: Error Launching Player"); + ITDebugLog(@"Error Launching Player"); } } + ITDebugLog(@"Finished show player."); } - (void)showPreferences { + ITDebugLog(@"Show preferences."); [[PreferencesController sharedPrefs] setController:self]; [[PreferencesController sharedPrefs] showPrefsWindow:self]; } - (void)quitMenuTunes { + ITDebugLog(@"Quitting MenuTunes."); [NSApp terminate:self]; } @@ -303,6 +303,7 @@ static MainController *sharedController; - (void)closePreferences { + ITDebugLog(@"Preferences closed."); if ( ( playerRunningState == ITMTRemotePlayerRunning) ) { [self setupHotKeys]; } @@ -323,17 +324,19 @@ static MainController *sharedController; { NSEnumerator *hotKeyEnumerator = [[[ITHotKeyCenter sharedCenter] allHotKeys] objectEnumerator]; ITHotKey *nextHotKey; - + ITDebugLog(@"Clearing hot keys."); while ( (nextHotKey = [hotKeyEnumerator nextObject]) ) { [[ITHotKeyCenter sharedCenter] unregisterHotKey:nextHotKey]; } + ITDebugLog(@"Done clearing hot keys."); } - (void)setupHotKeys { ITHotKey *hotKey; - + ITDebugLog(@"Setting up hot keys."); if ([df objectForKey:@"PlayPause"] != nil) { + ITDebugLog(@"Setting up play pause hot key."); hotKey = [[ITHotKey alloc] init]; [hotKey setName:@"PlayPause"]; [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PlayPause"]]]; @@ -343,6 +346,7 @@ static MainController *sharedController; } if ([df objectForKey:@"NextTrack"] != nil) { + ITDebugLog(@"Setting up next track hot key."); hotKey = [[ITHotKey alloc] init]; [hotKey setName:@"NextTrack"]; [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"NextTrack"]]]; @@ -352,6 +356,7 @@ static MainController *sharedController; } if ([df objectForKey:@"PrevTrack"] != nil) { + ITDebugLog(@"Setting up previous track hot key."); hotKey = [[ITHotKey alloc] init]; [hotKey setName:@"PrevTrack"]; [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PrevTrack"]]]; @@ -361,6 +366,7 @@ static MainController *sharedController; } if ([df objectForKey:@"ShowPlayer"] != nil) { + ITDebugLog(@"Setting up show player hot key."); hotKey = [[ITHotKey alloc] init]; [hotKey setName:@"ShowPlayer"]; [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ShowPlayer"]]]; @@ -370,6 +376,7 @@ static MainController *sharedController; } if ([df objectForKey:@"TrackInfo"] != nil) { + ITDebugLog(@"Setting up track info hot key."); hotKey = [[ITHotKey alloc] init]; [hotKey setName:@"TrackInfo"]; [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"TrackInfo"]]]; @@ -379,6 +386,7 @@ static MainController *sharedController; } if ([df objectForKey:@"UpcomingSongs"] != nil) { + ITDebugLog(@"Setting up upcoming songs hot key."); hotKey = [[ITHotKey alloc] init]; [hotKey setName:@"UpcomingSongs"]; [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"UpcomingSongs"]]]; @@ -388,6 +396,7 @@ static MainController *sharedController; } if ([df objectForKey:@"ToggleLoop"] != nil) { + ITDebugLog(@"Setting up toggle loop hot key."); hotKey = [[ITHotKey alloc] init]; [hotKey setName:@"ToggleLoop"]; [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleLoop"]]]; @@ -397,6 +406,7 @@ static MainController *sharedController; } if ([df objectForKey:@"ToggleShuffle"] != nil) { + ITDebugLog(@"Setting up toggle shuffle hot key."); hotKey = [[ITHotKey alloc] init]; [hotKey setName:@"ToggleShuffle"]; [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleShuffle"]]]; @@ -406,6 +416,7 @@ static MainController *sharedController; } if ([df objectForKey:@"IncrementVolume"] != nil) { + ITDebugLog(@"Setting up increment volume hot key."); hotKey = [[ITHotKey alloc] init]; [hotKey setName:@"IncrementVolume"]; [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"IncrementVolume"]]]; @@ -415,6 +426,7 @@ static MainController *sharedController; } if ([df objectForKey:@"DecrementVolume"] != nil) { + ITDebugLog(@"Setting up decrement volume hot key."); hotKey = [[ITHotKey alloc] init]; [hotKey setName:@"DecrementVolume"]; [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"DecrementVolume"]]]; @@ -424,6 +436,7 @@ static MainController *sharedController; } if ([df objectForKey:@"IncrementRating"] != nil) { + ITDebugLog(@"Setting up increment rating hot key."); hotKey = [[ITHotKey alloc] init]; [hotKey setName:@"IncrementRating"]; [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"IncrementRating"]]]; @@ -433,6 +446,7 @@ static MainController *sharedController; } if ([df objectForKey:@"DecrementRating"] != nil) { + ITDebugLog(@"Setting up decrement rating hot key."); hotKey = [[ITHotKey alloc] init]; [hotKey setName:@"DecrementRating"]; [hotKey setKeyCombo:[ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"DecrementRating"]]]; @@ -440,6 +454,7 @@ static MainController *sharedController; [hotKey setAction:@selector(decrementRating)]; [[ITHotKeyCenter sharedCenter] registerHotKey:[hotKey autorelease]]; } + ITDebugLog(@"Finished setting up hot keys."); } - (void)showCurrentTrackInfo @@ -452,7 +467,7 @@ static MainController *sharedController; int trackNumber = 0; int trackTotal = 0; int rating = -1; - + ITDebugLog(@"Showing track info status window."); if ( title ) { if ( [df boolForKey:@"showAlbum"] ) { @@ -494,7 +509,7 @@ static MainController *sharedController; { int curPlaylist = [currentRemote currentPlaylistIndex]; int numSongs = [currentRemote numberOfSongsInPlaylistAtIndex:curPlaylist]; - + ITDebugLog(@"Showing upcoming songs status window."); if (numSongs > 0) { NSMutableArray *songList = [NSMutableArray arrayWithCapacity:5]; int numSongsInAdvance = [df integerForKey:@"SongsInAdvance"]; @@ -518,7 +533,7 @@ static MainController *sharedController; { float volume = [currentRemote volume]; float dispVol = volume; - + ITDebugLog(@"Incrementing volume."); volume += 0.110; dispVol += 0.100; @@ -527,9 +542,10 @@ static MainController *sharedController; dispVol = 1.0; } + ITDebugLog(@"Setting volume to %f", volume); [currentRemote setVolume:volume]; - // Show volume status window + // Show volume status window [statusWindowController showVolumeWindowWithLevel:dispVol]; } @@ -537,7 +553,7 @@ static MainController *sharedController; { float volume = [currentRemote volume]; float dispVol = volume; - + ITDebugLog(@"Decrementing volume."); volume -= 0.090; dispVol -= 0.100; @@ -546,6 +562,7 @@ static MainController *sharedController; dispVol = 0.0; } + ITDebugLog(@"Setting volume to %f", volume); [currentRemote setVolume:volume]; //Show volume status window @@ -555,10 +572,12 @@ static MainController *sharedController; - (void)incrementRating { float rating = [currentRemote currentSongRating]; + ITDebugLog(@"Incrementing rating."); rating += 0.2; if (rating > 1.0) { rating = 1.0; } + ITDebugLog(@"Setting rating to %f", rating); [currentRemote setCurrentSongRating:rating]; //Show rating status window @@ -568,10 +587,12 @@ static MainController *sharedController; - (void)decrementRating { float rating = [currentRemote currentSongRating]; + ITDebugLog(@"Decrementing rating."); rating -= 0.2; if (rating < 0.0) { rating = 0.0; } + ITDebugLog(@"Setting rating to %f", rating); [currentRemote setCurrentSongRating:rating]; //Show rating status window @@ -581,6 +602,7 @@ static MainController *sharedController; - (void)toggleLoop { ITMTRemotePlayerRepeatMode repeatMode = [currentRemote repeatMode]; + ITDebugLog(@"Toggling repeat mode."); switch (repeatMode) { case ITMTRemotePlayerRepeatOff: repeatMode = ITMTRemotePlayerRepeatAll; @@ -592,6 +614,7 @@ static MainController *sharedController; repeatMode = ITMTRemotePlayerRepeatOff; break; } + ITDebugLog(@"Setting repeat mode to %i", repeatMode); [currentRemote setRepeatMode:repeatMode]; //Show loop status window @@ -601,8 +624,10 @@ static MainController *sharedController; - (void)toggleShuffle { bool newShuffleEnabled = ![currentRemote shuffleEnabled]; + ITDebugLog(@"Toggling shuffle mode."); [currentRemote setShuffleEnabled:newShuffleEnabled]; //Show shuffle status window + ITDebugLog(@"Setting shuffle mode to %i", newShuffleEnabled); [statusWindowController showRepeatWindowWithMode:newShuffleEnabled]; } @@ -614,6 +639,7 @@ static MainController *sharedController; - (void)applicationLaunched:(NSNotification *)note { if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) { + ITDebugLog(@"Remote application launched."); [currentRemote begin]; [self setLatestSongIdentifier:@""]; [self timerUpdate]; @@ -631,6 +657,7 @@ static MainController *sharedController; - (void)applicationTerminated:(NSNotification *)note { if (!note || [[[note userInfo] objectForKey:@"NSApplicationName"] isEqualToString:[currentRemote playerFullName]]) { + ITDebugLog(@"Remote application terminated."); [currentRemote halt]; [refreshTimer invalidate]; [refreshTimer release]; diff --git a/PreferencesController.m b/PreferencesController.m index 327aa90..b827375 100755 --- a/PreferencesController.m +++ b/PreferencesController.m @@ -59,6 +59,7 @@ static PreferencesController *prefs = nil; - (id)init { if ( (self = [super init]) ) { + ITDebugLog(@"Preferences initialized."); df = [[NSUserDefaults standardUserDefaults] retain]; hotKeysDictionary = [[NSMutableDictionary alloc] init]; controller = nil; @@ -91,7 +92,9 @@ static PreferencesController *prefs = nil; - (IBAction)showPrefsWindow:(id)sender { + ITDebugLog(@"Showing preferences window."); if (! window) { // If window does not exist yet, then the nib hasn't been loaded. + ITDebugLog(@"Window doesn't exist, initial setup."); [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 @@ -102,7 +105,6 @@ static PreferencesController *prefs = nil; //Change the launch player checkbox to the proper name [launchPlayerAtLaunchCheckbox setTitle:[NSString stringWithFormat:@"Launch %@ when MenuTunes launches", [[controller currentRemote] playerSimpleName]]]; //This isn't localized... } - [window setLevel:NSStatusWindowLevel]; [window center]; [window makeKeyAndOrderFront:self]; @@ -110,6 +112,7 @@ static PreferencesController *prefs = nil; - (IBAction)changeGeneralSetting:(id)sender { + ITDebugLog(@"Changing general setting of tag %i.", [sender tag]); if ( [sender tag] == 1010) { [self setLaunchesAtLogin:SENDER_STATE]; } else if ( [sender tag] == 1020) { @@ -131,14 +134,13 @@ static PreferencesController *prefs = nil; } else if ( [sender tag] == 1090) { [df setBool:SENDER_STATE forKey:@"showTrackRating"]; } - [df synchronize]; } - (IBAction)changeStatusWindowSetting:(id)sender { StatusWindow *sw = [StatusWindow sharedWindow]; - + ITDebugLog(@"Changing status window setting of tag %i", [sender tag]); if ( [sender tag] == 2010) { [df setInteger:[sender selectedRow] forKey:@"statusWindowVerticalPosition"]; [df setInteger:[sender selectedColumn] forKey:@"statusWindowHorizontalPosition"]; @@ -199,12 +201,12 @@ static PreferencesController *prefs = nil; } else if ( [sender tag] == 2080) { [df setBool:SENDER_STATE forKey:@"showSongInfoOnChange"]; } - [df synchronize]; } - (IBAction)changeHotKey:(id)sender { + ITDebugLog(@"Changing hot keys."); [controller clearHotKeys]; switch ([sender tag]) { @@ -266,7 +268,7 @@ static PreferencesController *prefs = nil; NSMutableArray *loginArray; NSEnumerator *loginEnum; id anItem; - + ITDebugLog(@"Registering defaults."); [df setObject:[NSArray arrayWithObjects: @"playPause", @"prevTrack", @@ -303,32 +305,18 @@ static PreferencesController *prefs = nil; found = YES; } } - [loginWindow release]; - // This is teh sux - // We must fix it so it is no longer suxy if (!found) { if (NSRunInformationalAlertPanel(NSLocalizedString(@"autolaunch", @"Auto-launch MenuTunes"), NSLocalizedString(@"autolaunch_msg", @"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); + [self setLaunchesAtLogin:YES]; } } } - (IBAction)cancelHotKey:(id)sender { + ITDebugLog(@"Hot key canceled."); [[NSNotificationCenter defaultCenter] removeObserver:self]; [NSApp endSheet:keyComboPanel]; [keyComboPanel orderOut:nil]; @@ -336,6 +324,7 @@ static PreferencesController *prefs = nil; - (IBAction)clearHotKey:(id)sender { + ITDebugLog(@"Hot key cleared."); [self setKeyCombo:[ITKeyCombo clearKeyCombo]]; } @@ -345,15 +334,19 @@ static PreferencesController *prefs = nil; NSEnumerator *enumerator = [hotKeysDictionary keyEnumerator]; NSString *enumKey; + ITDebugLog(@"Hot key ok'd, saving."); + if (string == nil) { string = @""; } + ITDebugLog(@"Checking for duplicate hot keys."); while ( (enumKey = [enumerator nextObject]) ) { if (![enumKey isEqualToString:currentHotKey]) { if (![combo isEqual:[ITKeyCombo clearKeyCombo]] && [combo isEqual:[hotKeysDictionary objectForKey:enumKey]]) { [window setLevel:NSNormalWindowLevel]; + ITDebugLog(@"Duplicate hot key found: %@", enumKey); if ( NSRunAlertPanel(NSLocalizedString(@"duplicateCombo", @"Duplicate Key Combo") , NSLocalizedString(@"duplicateCombo_msg", @"The specified key combo is already in use..."), NSLocalizedString(@"replace", @"Replace"), NSLocalizedString(@"cancel", @"Cancel"), nil) ) { [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:currentHotKey]; if ([enumKey isEqualToString:@"PlayPause"]) { @@ -381,6 +374,7 @@ static PreferencesController *prefs = nil; } else if ([enumKey isEqualToString:@"ToggleLoop"]) { [toggleLoopButton setTitle:@"(None)"]; } + ITDebugLog(@"Saved hot key named %@.", enumKey); [df setObject:[[ITKeyCombo clearKeyCombo] plistRepresentation] forKey:enumKey]; [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:enumKey]; } else { @@ -391,9 +385,11 @@ static PreferencesController *prefs = nil; } } + ITDebugLog(@"Saved hot key named %@.", currentHotKey); [hotKeysDictionary setObject:combo forKey:currentHotKey]; [df setObject:[combo plistRepresentation] forKey:currentHotKey]; + ITDebugLog(@"Setting button name."); if ([currentHotKey isEqualToString:@"PlayPause"]) { [playPauseButton setTitle:string]; } else if ([currentHotKey isEqualToString:@"NextTrack"]) { @@ -427,6 +423,7 @@ static PreferencesController *prefs = nil; { if (tableView == menuTableView) { int selRow = [tableView selectedRow]; + ITDebugLog(@"Delete pressed in menu table view."); if (selRow != - 1) { NSString *object = [myItems objectAtIndex:selRow]; @@ -437,6 +434,7 @@ static PreferencesController *prefs = nil; if (![object isEqualToString:@"separator"]) [availableItems addObject:object]; + ITDebugLog(@"Removing object named %@", object); [myItems removeObjectAtIndex:selRow]; [menuTableView reloadData]; [allTableView reloadData]; @@ -453,6 +451,7 @@ static PreferencesController *prefs = nil; - (void)setCurrentHotKey:(NSString *)key { + ITDebugLog(@"Setting current hot key to %@", key); [currentHotKey autorelease]; currentHotKey = [key copy]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyEvent:) name:ITKeyBroadcasterKeyEvent object:nil]; @@ -469,7 +468,7 @@ static PreferencesController *prefs = nil; NSString *string; [combo release]; combo = [newCombo copy]; - + ITDebugLog(@"Setting key combo to %@", newCombo); string = [combo description]; if (string == nil) { string = @"(None)"; @@ -485,8 +484,9 @@ static PreferencesController *prefs = nil; - (void)setupWindow { + ITDebugLog(@"Loading Preferences.nib."); if (![NSBundle loadNibNamed:@"Preferences" owner:self]) { - NSLog(@"MenuTunes: Failed to load Preferences.nib"); + ITDebugLog(@"Failed to load Preferences.nib."); NSBeep(); return; } @@ -495,7 +495,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]; @@ -516,6 +516,7 @@ 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: @"separator", @@ -559,12 +560,13 @@ static PreferencesController *prefs = nil; NSMutableArray *loginarray; NSEnumerator *loginEnum; id anItem; - + 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"]) { + ITDebugLog(@"Setting up \"PlayPause\" hot key."); anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PlayPause"]]; [hotKeysDictionary setObject:anItem forKey:@"PlayPause"]; [playPauseButton setTitle:[anItem description]]; @@ -574,6 +576,7 @@ static PreferencesController *prefs = nil; } if ([df objectForKey:@"NextTrack"]) { + ITDebugLog(@"Setting up \"NextTrack\" hot key."); anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"NextTrack"]]; [hotKeysDictionary setObject:anItem forKey:@"NextTrack"]; [nextTrackButton setTitle:[anItem description]]; @@ -583,6 +586,7 @@ static PreferencesController *prefs = nil; } if ([df objectForKey:@"PrevTrack"]) { + ITDebugLog(@"Setting up \"PrevTrack\" hot key."); anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PrevTrack"]]; [hotKeysDictionary setObject:anItem forKey:@"PrevTrack"]; [previousTrackButton setTitle:[anItem description]]; @@ -592,6 +596,7 @@ static PreferencesController *prefs = nil; } if ([df objectForKey:@"ShowPlayer"]) { + ITDebugLog(@"Setting up \"ShowPlayer\" hot key."); anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ShowPlayer"]]; [hotKeysDictionary setObject:anItem forKey:@"ShowPlayer"]; [showPlayerButton setTitle:[anItem description]]; @@ -601,6 +606,7 @@ static PreferencesController *prefs = nil; } if ([df objectForKey:@"TrackInfo"]) { + ITDebugLog(@"Setting up \"TrackInfo\" hot key."); anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"TrackInfo"]]; [hotKeysDictionary setObject:anItem forKey:@"TrackInfo"]; [trackInfoButton setTitle:[anItem description]]; @@ -610,6 +616,7 @@ static PreferencesController *prefs = nil; } if ([df objectForKey:@"UpcomingSongs"]) { + ITDebugLog(@"Setting up \"UpcomingSongs\" hot key."); anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"UpcomingSongs"]]; [hotKeysDictionary setObject:anItem forKey:@"UpcomingSongs"]; [upcomingSongsButton setTitle:[anItem description]]; @@ -619,6 +626,7 @@ static PreferencesController *prefs = nil; } if ([df objectForKey:@"IncrementVolume"]) { + ITDebugLog(@"Setting up \"IncrementVolume\" hot key."); anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"IncrementVolume"]]; [hotKeysDictionary setObject:anItem forKey:@"IncrementVolume"]; [volumeIncrementButton setTitle:[anItem description]]; @@ -628,6 +636,7 @@ static PreferencesController *prefs = nil; } if ([df objectForKey:@"DecrementVolume"]) { + ITDebugLog(@"Setting up \"DecrementVolume\" hot key."); anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"DecrementVolume"]]; [hotKeysDictionary setObject:anItem forKey:@"DecrementVolume"]; [volumeDecrementButton setTitle:[anItem description]]; @@ -637,6 +646,7 @@ static PreferencesController *prefs = nil; } if ([df objectForKey:@"IncrementRating"]) { + ITDebugLog(@"Setting up \"IncrementRating\" hot key."); anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"IncrementRating"]]; [hotKeysDictionary setObject:anItem forKey:@"IncrementRating"]; [ratingIncrementButton setTitle:[anItem description]]; @@ -646,6 +656,7 @@ static PreferencesController *prefs = nil; } if ([df objectForKey:@"DecrementRating"]) { + ITDebugLog(@"Setting up \"DecrementRating\" hot key."); anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"DecrementRating"]]; [hotKeysDictionary setObject:anItem forKey:@"DecrementRating"]; [ratingDecrementButton setTitle:[anItem description]]; @@ -655,6 +666,7 @@ static PreferencesController *prefs = nil; } if ([df objectForKey:@"ToggleLoop"]) { + ITDebugLog(@"Setting up \"ToggleLoop\" hot key."); anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleLoop"]]; [hotKeysDictionary setObject:anItem forKey:@"ToggleLoop"]; [toggleLoopButton setTitle:[anItem description]]; @@ -664,6 +676,7 @@ static PreferencesController *prefs = nil; } if ([df objectForKey:@"ToggleShuffle"]) { + ITDebugLog(@"Setting up \"ToggleShuffle\" hot key."); anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleShuffle"]]; [hotKeysDictionary setObject:anItem forKey:@"ToggleShuffle"]; [toggleShuffleButton setTitle:[anItem description]]; @@ -672,6 +685,7 @@ static PreferencesController *prefs = nil; [toggleShuffleButton setTitle:[[ITKeyCombo clearKeyCombo] description]]; } + 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. @@ -682,6 +696,7 @@ static PreferencesController *prefs = nil; [ratingCheckbox setState:[df boolForKey:@"showTrackRating"] ? NSOnState : NSOffState]; // Set the launch at login checkbox state + ITDebugLog(@"Setting launch at login state."); [df synchronize]; loginwindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy]; loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"]; @@ -696,6 +711,7 @@ static PreferencesController *prefs = nil; - (IBAction)changeMenus:(id)sender { + ITDebugLog(@"Synchronizing menus"); [df setObject:myItems forKey:@"menu"]; [df synchronize]; } @@ -704,7 +720,7 @@ static PreferencesController *prefs = nil; { NSMutableDictionary *loginwindow; NSMutableArray *loginarray; - + ITDebugLog(@"Setting launches at login: %i", flag); [df synchronize]; loginwindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy]; loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"]; @@ -727,6 +743,7 @@ static PreferencesController *prefs = nil; [df setPersistentDomain:loginwindow forName:@"loginwindow"]; [df synchronize]; [loginwindow release]; + ITDebugLog(@"Finished setting launches at login."); }