X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/775df65cfdd7c0d32917a5b9b1ffb5923b1297d7..5e4dec969868a410da088273791f228def3b36a7:/PreferencesController.m diff --git a/PreferencesController.m b/PreferencesController.m index 7e953d9..02ba0a0 100755 --- a/PreferencesController.m +++ b/PreferencesController.m @@ -13,7 +13,7 @@ #import #import -#import +#import #import #import @@ -42,6 +42,7 @@ - (void)setupCustomizationTables; - (void)setupMenuItems; - (void)setupUI; +- (void)setupScreenPopup; - (void)setStatusWindowEntryEffect:(Class)effectClass; - (void)setStatusWindowExitEffect:(Class)effectClass; - (void)setCustomColor:(NSColor *)color updateWell:(BOOL)update; @@ -97,6 +98,7 @@ static PreferencesController *prefs = nil; @"DecrementRating", @"ToggleShuffle", @"ToggleLoop", + @"ToggleShufflability", @"PopupMenu", @"SetRating0", @"SetRating1", @@ -120,6 +122,7 @@ static PreferencesController *prefs = nil; @"Decrement Rating", @"Toggle Shuffle", @"Toggle Loop", + @"Toggle Song Included In Shuffle", @"Pop-up status menu", [NSString stringWithUTF8String:"Set Rating: ☆☆☆☆☆"], [NSString stringWithUTF8String:"Set Rating: ★☆☆☆☆"], @@ -220,7 +223,9 @@ static PreferencesController *prefs = nil; [self resetRemotePlayerTextFields]; [launchAtLoginCheckbox becomeFirstResponder]; [NSApp activateIgnoringOtherApps:YES]; - [window center]; + if (![window isVisible]) { + [window center]; + } [window orderFrontRegardless]; [window makeKeyWindow]; } @@ -464,7 +469,10 @@ static PreferencesController *prefs = nil; } else if ( [sender tag] == 2020) { // Update screen selection. - + [[StatusWindow sharedWindow] setScreen:[[NSScreen screens] objectAtIndex:[sender indexOfSelectedItem]]]; + [df setInteger:[sender indexOfSelectedItem] forKey:@"statusWindowScreenIndex"]; + [(MainController *)controller showCurrentTrackInfo]; + } else if ( [sender tag] == 2030) { [self setStatusWindowEntryEffect:[[sender selectedItem] representedObject]]; @@ -553,6 +561,7 @@ static PreferencesController *prefs = nil; @"upcomingSongs", @"separator", @"preferences", + @"about", @"quit", nil] forKey:@"menu"]; @@ -573,6 +582,7 @@ static PreferencesController *prefs = nil; [df setFloat:4.0 forKey:@"statusWindowVanishDelay"]; [df setInteger:(int)ITWindowPositionBottom forKey:@"statusWindowVerticalPosition"]; [df setInteger:(int)ITWindowPositionLeft forKey:@"statusWindowHorizontalPosition"]; + [df setInteger:0 forKey:@"statusWindowScreenIndex"]; [[StatusWindow sharedWindow] setVerticalPosition:(int)ITWindowPositionBottom]; [[StatusWindow sharedWindow] setHorizontalPosition:(int)ITWindowPositionLeft]; [df setBool:YES forKey:@"showSongInfoOnChange"]; @@ -749,6 +759,7 @@ static PreferencesController *prefs = nil; @"fastForward", @"rewind", @"showPlayer", + @"about", @"quit", nil]; @@ -781,7 +792,7 @@ static PreferencesController *prefs = nil; NSData *colorData; int selectedBGStyle; id anItem; - + [df setInteger:MT_CURRENT_VERSION forKey:@"appVersion"]; ITDebugLog(@"Setting up preferences UI."); @@ -800,6 +811,9 @@ static PreferencesController *prefs = nil; } } + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(setupScreenPopup) name:NSApplicationDidChangeScreenParametersNotification object:nil]; + [self setupScreenPopup]; + ITDebugLog(@"Setting up track info checkboxes."); // Check current track info buttons [albumCheckbox setState:[df boolForKey:@"showAlbum"] ? NSOnState : NSOffState]; @@ -923,6 +937,30 @@ static PreferencesController *prefs = nil; } } +- (void)setupScreenPopup +{ + ITDebugLog(@"Setting up screen popup"); + NSArray *screens = [NSScreen screens]; + if ([screens count] > 1) { + int i, index = [df integerForKey:@"statusWindowScreenIndex"]; + [screenPopup setEnabled:YES]; + for (i = 0; i < [screens count]; i++) { + NSScreen *screen = [screens objectAtIndex:i]; + if (![screen isEqual:[NSScreen mainScreen]]) { + [screenPopup addItemWithTitle:[NSString stringWithFormat:@"Screen %i", i + 1]]; + } + } + [screenPopup selectItemAtIndex:index]; + [[StatusWindow sharedWindow] setScreen:[[NSScreen screens] objectAtIndex:index]]; + } else { + while ([screenPopup numberOfItems] > 1) { + [screenPopup removeItemAtIndex:1]; + } + [screenPopup setEnabled:NO]; + [[StatusWindow sharedWindow] setScreen:[NSScreen mainScreen]]; + } +} + - (void)setStatusWindowEntryEffect:(Class)effectClass { StatusWindow *sw = [StatusWindow sharedWindow]; @@ -1220,6 +1258,7 @@ static PreferencesController *prefs = nil; - (void)dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; [hotKeysArray release]; [hotKeysDictionary release]; [effectClasses release]; @@ -1230,6 +1269,7 @@ static PreferencesController *prefs = nil; [submenuItems release]; [myItems release]; [df release]; + [super dealloc]; } @end