#import "PreferencesController.h"
-#import "MenuTunes.h"
-#import "HotKeyCenter.h"
+#import "MainController.h"
+#import <ITKit/ITHotKeyCenter.h>
+#import <ITKit/ITKeyCombo.h>
+#import <ITKit/ITWindowPositioning.h>
+#import <ITKit/ITKeyBroadcaster.h>
+
+#define SENDER_STATE (([sender state] == NSOnState) ? YES : NO)
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark PRIVATE INTERFACE
+/*************************************************************************/
+
+@interface PreferencesController (Private)
+- (void)setupWindow;
+- (void)setupCustomizationTables;
+- (void)setupMenuItems;
+- (void)setupUI;
+- (IBAction)changeMenus:(id)sender;
+- (void)setLaunchesAtLogin:(BOOL)flag;
+@end
+
@implementation PreferencesController
-- (id)initWithMenuTunes:(MenuTunes *)tunes;
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark STATIC VARIABLES
+/*************************************************************************/
+
+static PreferencesController *prefs = nil;
+
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark INITIALIZATION METHODS
+/*************************************************************************/
+
++ (PreferencesController *)sharedPrefs;
{
- if ( (self = [super init]) )
- {
- int i;
- NSImageCell *imgCell = [[[NSImageCell alloc] init] autorelease];
- NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
- NSString *temp;
-
- mt = [tunes retain];
-
- //Load the nib
- [NSBundle loadNibNamed:@"Preferences" owner:self];
-
- //Show our window
- [window setLevel:NSStatusWindowLevel];
- [window center];
- [window makeKeyAndOrderFront:nil];
-
- //Set the table view cells up
- [imgCell setImageScaling:NSScaleNone];
- [[menuTableView tableColumnWithIdentifier:@"submenu"] setDataCell:imgCell];
- [[allTableView tableColumnWithIdentifier:@"submenu"] setDataCell:imgCell];
-
- //Register for drag and drop
- [menuTableView registerForDraggedTypes:[NSArray arrayWithObjects:@"MenuTableViewPboardType", @"AllTableViewPboardType", nil]];
- [allTableView registerForDraggedTypes:[NSArray arrayWithObjects:@"MenuTableViewPboardType", @"AllTableViewPboardType", nil]];
-
- //Set the list of items you can have.
- availableItems = [[NSMutableArray alloc] initWithObjects:@"Current Track Info", @"Upcoming Songs", @"Playlists", @"EQ Presets", @"Play/Pause", @"Next Track", @"Previous Track", @"Fast Forward", @"Rewind", @"<separator>", nil];
-
- //Get our preferred menu
- myItems = [[[NSUserDefaults standardUserDefaults] arrayForKey:@"menu"] mutableCopy];
- if (myItems == nil)
- {
- myItems = [[NSMutableArray alloc] initWithObjects:@"Play/Pause", @"Next Track", @"Previous Track", @"Fast Forward", @"Rewind", @"<separator>", @"Upcoming Songs", @"Playlists", @"EQ Presets", @"<separator>", @"PreferencesÉ", @"Quit", @"<separator>", @"Current Track Info", nil];
- [[NSUserDefaults standardUserDefaults] setObject:myItems forKey:@"menu"];
- }
-
- //Delete items in the availableItems array that are already part of the menu
- for (i = 0; i < [myItems count]; i++)
- {
- NSString *item = [myItems objectAtIndex:i];
- if (![item isEqualToString:@"<separator>"])
- {
- [availableItems removeObject:item];
- }
- }
-
- //Items that show should a submenu image
- submenuItems = [[NSArray alloc] initWithObjects:@"Upcoming Songs", @"Playlists", @"EQ Presets", nil];
-
- //Fill in the number of songs in advance to show field
- if ([defaults integerForKey:@"SongsInAdvance"])
- {
- [songsInAdvance setIntValue:[defaults integerForKey:@"SongsInAdvance"]];
- }
- else
- {
- [songsInAdvance setIntValue:5];
- }
-
- //Fill in hot key buttons
- if ([defaults objectForKey:@"PlayPause"])
- {
- playPauseCombo = [defaults keyComboForKey:@"PlayPause"];
- [playPauseButton setTitle:[playPauseCombo userDisplayRep]];
- }
- else
- {
- playPauseCombo = [[KeyCombo alloc] init];
- }
-
- if ([defaults objectForKey:@"NextTrack"])
- {
- nextTrackCombo = [defaults keyComboForKey:@"NextTrack"];
- [nextTrackButton setTitle:[nextTrackCombo userDisplayRep]];
- }
- else
- {
- nextTrackCombo = [[KeyCombo alloc] init];
- }
-
- if ([defaults objectForKey:@"PrevTrack"])
- {
- prevTrackCombo = [defaults keyComboForKey:@"PrevTrack"];
- [previousTrackButton setTitle:[prevTrackCombo userDisplayRep]];
- }
- else
- {
- prevTrackCombo = [[KeyCombo alloc] init];
- }
-
- if ([defaults objectForKey:@"TrackInfo"])
- {
- trackInfoCombo = [defaults keyComboForKey:@"TrackInfo"];
- [trackInfoButton setTitle:[trackInfoCombo userDisplayRep]];
- }
- else
- {
- trackInfoCombo = [[KeyCombo alloc] init];
- }
-
- if ([defaults objectForKey:@"UpcomingSongs"])
- {
- upcomingSongsCombo = [defaults keyComboForKey:@"UpcomingSongs"];
- [upcomingSongsButton setTitle:[upcomingSongsCombo userDisplayRep]];
- }
- else
- {
- upcomingSongsCombo = [[KeyCombo alloc] init];
- }
-
- //Check current track info buttons
-
- //Album and name get special treatment because they are defaults
- if ( (temp = [defaults stringForKey:@"showAlbum"]) )
- {
- if ((temp == nil) || [temp isEqualToString:@"1"])
- {
- [albumCheckbox setState:NSOnState];
- }
- else
- {
- [albumCheckbox setState:NSOffState];
- }
- }
-
- if ( (temp = [defaults stringForKey:@"showName"]) )
- {
- if ((temp == nil) || [temp isEqualToString:@"1"])
- {
- [nameCheckbox setState:NSOnState];
- }
- else
- {
- [nameCheckbox setState:NSOffState];
- }
- }
-
- [artistCheckbox setState:[defaults boolForKey:@"showArtist"] ? NSOnState : NSOffState];
- [trackTimeCheckbox setState:[defaults boolForKey:@"showTime"] ? NSOnState : NSOffState];
-
- //Set the launch at login checkbox state
- {
- NSMutableDictionary *loginwindow;
- NSMutableArray *loginarray;
- int i;
-
- [defaults synchronize];
- loginwindow = [[defaults persistentDomainForName:@"loginwindow"] mutableCopy];
- loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
-
- for (i = 0; i < [loginarray count]; i++)
- {
- NSDictionary *tempDict = [loginarray objectAtIndex:i];
-
- //Here we are seeing if our program is already in loginwindow.plist.
- //See the problem below for this problem here. We will do the same thing.
-
- if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:@"VocabularyBuilder.app"])
- {
- [launchAtLoginCheckbox setState:NSOnState];
- }
- }
- }
+ if (! prefs) {
+ prefs = [[self alloc] init];
+ }
+ return prefs;
+}
+
+- (id)init
+{
+ if ( (self = [super init]) ) {
+ df = [[NSUserDefaults standardUserDefaults] retain];
+ hotKeysDictionary = [[NSMutableDictionary alloc] init];
+ controller = nil;
}
return self;
}
-- (void)dealloc
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark ACCESSOR METHODS
+/*************************************************************************/
+
+- (id)controller
{
- [self setKeyCombo:nil];
- [playPauseCombo release];
- [nextTrackCombo release];
- [prevTrackCombo release];
- [trackInfoCombo release];
- [upcomingSongsCombo release];
- [keyComboPanel release];
- [menuTableView setDataSource:nil];
- [allTableView setDataSource:nil];
- [mt release];
- [availableItems release];
- [submenuItems release];
- [myItems release];
+ return controller;
}
-- (IBAction)apply:(id)sender
+- (void)setController:(id)object
{
- ProcessSerialNumber psn;
- NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
- [defaults setObject:myItems forKey:@"menu"];
-
- //Set key combos
- [defaults setKeyCombo:playPauseCombo forKey:@"PlayPause"];
- [defaults setKeyCombo:nextTrackCombo forKey:@"NextTrack"];
- [defaults setKeyCombo:prevTrackCombo forKey:@"PrevTrack"];
- [defaults setKeyCombo:trackInfoCombo forKey:@"TrackInfo"];
- [defaults setKeyCombo:upcomingSongsCombo forKey:@"UpcomingSongs"];
-
- //Set info checkboxes
- [defaults setBool:[albumCheckbox state] forKey:@"showAlbum"];
- [defaults setBool:[nameCheckbox state] forKey:@"showName"];
- [defaults setBool:[artistCheckbox state] forKey:@"showArtist"];
- [defaults setBool:[trackTimeCheckbox state] forKey:@"showTime"];
-
- //Here we set whether we will launch at login by modifying loginwindow.plist
- if ([launchAtLoginCheckbox state] == NSOnState)
- {
- NSMutableDictionary *loginwindow;
- NSMutableArray *loginarray;
- int i;
- BOOL skip = NO;
-
- [defaults synchronize];
- loginwindow = [[defaults persistentDomainForName:@"loginwindow"] mutableCopy];
- loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
-
- for (i = 0; i < [loginarray count]; i++)
- {
- NSDictionary *tempDict = [loginarray objectAtIndex:i];
-
- //Here we are seeing if our program is already in loginwindow.plist.
- //See the problem below for this problem here. We will do the same thing.
-
- if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:@"VocabularyBuilder.app"])
- {
- skip = YES;
- }
- }
-
- if (!skip)
- {
- [loginarray addObject:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:NO], @"Hide", [[NSBundle mainBundle] bundlePath], @"Path", nil]];
-
- [defaults setPersistentDomain:loginwindow forName:@"loginwindow"];
- [defaults synchronize];
- }
- }
- else
- {
- NSMutableDictionary *loginwindow;
- NSMutableArray *loginarray;
- int i;
-
- [[NSUserDefaults standardUserDefaults] synchronize];
- loginwindow = [[[NSUserDefaults standardUserDefaults] persistentDomainForName:@"loginwindow"] mutableCopy];
- loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
+ [controller autorelease];
+ controller = [object retain];
+}
+
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark INSTANCE METHODS
+/*************************************************************************/
+
+- (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.
+ [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];
- for (i = 0; i < [loginarray count]; i++)
- {
- NSDictionary *tempDict = [loginarray objectAtIndex:i];
-
- if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:@"VocabularyBuilder.app"])
- {
- [loginarray removeObjectAtIndex:i];
- [defaults setPersistentDomain:loginwindow forName:@"loginwindow"];
- [defaults synchronize];
- break;
- }
- }
+ //Change the launch player checkbox to the proper name
+ [launchPlayerAtLaunchCheckbox setTitle:[NSString stringWithFormat:@"Launch %@ when MenuTunes launches", [[controller currentRemote] playerSimpleName]]]; //This isn't localized...
}
- //Set songs in advance
- if ([songsInAdvance intValue])
- {
- [defaults setInteger:[songsInAdvance intValue] forKey:@"SongsInAdvance"];
+ [window setLevel:NSStatusWindowLevel];
+ [window center];
+ [window makeKeyAndOrderFront:self];
+ [NSApp activateIgnoringOtherApps:YES];
+}
+
+- (IBAction)changeGeneralSetting:(id)sender
+{
+ if ( [sender tag] == 1010) {
+ [self setLaunchesAtLogin:SENDER_STATE];
+ } else if ( [sender tag] == 1020) {
+ [df setBool:SENDER_STATE forKey:@"LaunchPlayerWithMT"];
+ } else if ( [sender tag] == 1030) {
+ [df setInteger:[sender intValue] forKey:@"SongsInAdvance"];
+
+ } 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] == 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] == 1090) {
+ [df setBool:SENDER_STATE forKey:@"showTrackRating"];
}
- else
- {
- [defaults setInteger:5 forKey:@"SongsInAdvance"];
+ [df synchronize];
+}
+
+- (IBAction)changeStatusWindowSetting:(id)sender
+{
+ if ( [sender tag] == 2010) {
+ [df setInteger:[sender selectedRow] forKey:@"statusWindowVerticalPosition"];
+ [df setInteger:[sender selectedColumn] forKey:@"statusWindowHorizontalPosition"];
+ // update the window's position here
+ } else if ( [sender tag] == 2020) {
+ // update screen selection
+ } else if ( [sender tag] == 2030) {
+ // Update appearance effect
+ } else if ( [sender tag] == 2040) {
+ // Update Vanish Effect
+ } else if ( [sender tag] == 2050) {
+ // Update appearance speed
+ } else if ( [sender tag] == 2060) {
+ // Update vanish speed
+ } else if ( [sender tag] == 2070) {
+ // Update vanish delay
+ } else if ( [sender tag] == 2080) {
+ // Update "Song Info window when song changes" setting.
+ [df setBool:SENDER_STATE forKey:@"showSongInfoOnChange"];
}
-
- psn = [mt iTunesPSN];
- if (!((psn.highLongOfPSN == kNoProcess) && (psn.lowLongOfPSN == 0)))
+}
+
+- (IBAction)changeHotKey:(id)sender
+{
+ [controller clearHotKeys];
+ switch ([sender tag])
{
- [mt rebuildMenu];
+ 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:@"ShowPlayer"]];
+ [self setCurrentHotKey:@"ShowPlayer"];
+ 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;
}
- [mt clearHotKeys];
}
-- (IBAction)cancel:(id)sender
+- (void)registerDefaults
{
- [window close];
- [mt closePreferences];
+ BOOL found = NO;
+ NSMutableDictionary *loginWindow;
+ NSMutableArray *loginArray;
+ NSEnumerator *loginEnum;
+ id anItem;
+
+ [df setObject:[NSArray arrayWithObjects:
+ @"playPause",
+ @"prevTrack",
+ @"nextTrack",
+ @"fastForward",
+ @"rewind",
+ @"showPlayer",
+ @"separator",
+ @"songRating",
+ @"eqPresets",
+ @"playlists",
+ @"upcomingSongs",
+ @"separator",
+ @"preferences",
+ @"quit",
+ @"separator",
+ @"trackInfo",
+ nil] forKey:@"menu"];
+
+ [df setInteger:5 forKey:@"SongsInAdvance"];
+ // [df setBool:YES forKey:@"showName"]; // Song info will always show song title.
+ [df setBool:YES forKey:@"showArtist"];
+ [df setBool:NO forKey:@"showAlbum"];
+ [df setBool:NO forKey:@"showTime"];
+
+ [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;
+ }
+ }
+
+ [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);
+ }
+ }
}
- (IBAction)cancelHotKey:(id)sender
- (IBAction)clearHotKey:(id)sender
{
- [self setKeyCombo:[KeyCombo clearKeyCombo]];
+ [self setKeyCombo:[ITKeyCombo clearKeyCombo]];
}
- (IBAction)okHotKey:(id)sender
{
- NSString *string;
- if (([combo modifiers] <= 0) && ([combo keyCode] >= 0))
- {
- [window setLevel:NSNormalWindowLevel];
- NSRunAlertPanel(@"Bad Key Combo", @"Please enter a valid key combo. A valid combo must have a modifier key in it. (Command, option, shift, control).", @"OK", nil, nil, nil);
- [window setLevel:NSStatusWindowLevel];
- return;
- }
+ NSString *string = [combo description];
+ NSEnumerator *enumerator = [hotKeysDictionary keyEnumerator];
+ NSString *enumKey;
- string = [combo userDisplayRep];
-
- if (string == nil)
- {
- string = @"None";
+ if (string == nil) {
+ string = @"";
}
- if ([setHotKey isEqualToString:@"PlayPause"])
- {
- if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] ||
- [combo isEqual:trackInfoCombo] || [combo isEqual:upcomingSongsCombo]) &&
- !(([combo modifiers] == -1) && ([combo keyCode] == -1)))
- {
- [window setLevel:NSNormalWindowLevel];
- NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil);
- [window setLevel:NSStatusWindowLevel];
- return;
+
+ while ( (enumKey = [enumerator nextObject]) ) {
+ if (![enumKey isEqualToString:currentHotKey]) {
+ if (![combo isEqual:[ITKeyCombo clearKeyCombo]] &&
+ [combo isEqual:[hotKeysDictionary objectForKey:enumKey]]) {
+ [window setLevel:NSNormalWindowLevel];
+ 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"]) {
+ [playPauseButton setTitle:@""];
+ } else if ([enumKey isEqualToString:@"NextTrack"]) {
+ [nextTrackButton setTitle:@""];
+ } else if ([enumKey isEqualToString:@"PrevTrack"]) {
+ [previousTrackButton setTitle:@""];
+ } else if ([enumKey isEqualToString:@"ShowPlayer"]) {
+ [showPlayerButton 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 setObject:[[ITKeyCombo clearKeyCombo] plistRepresentation] forKey:enumKey];
+ } else {
+ return;
+ }
+ [window setLevel:NSStatusWindowLevel];
+ }
}
- playPauseCombo = [combo copy];
- [playPauseButton setTitle:string];
}
- else if ([setHotKey isEqualToString:@"NextTrack"])
- {
- if (([combo isEqual:playPauseCombo] || [combo isEqual:prevTrackCombo] ||
- [combo isEqual:trackInfoCombo] || [combo isEqual:upcomingSongsCombo]) &&
- !(([combo modifiers] == -1) && ([combo keyCode] == -1)))
- {
- [window setLevel:NSNormalWindowLevel];
- NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil);
- [window setLevel:NSStatusWindowLevel];
- return;
- }
- nextTrackCombo = [combo copy];
+
+ [hotKeysDictionary setObject:combo forKey:currentHotKey];
+ [df setObject:[combo plistRepresentation] forKey:currentHotKey];
+
+ if ([currentHotKey isEqualToString:@"PlayPause"]) {
+ [playPauseButton setTitle:string];
+ } else if ([currentHotKey isEqualToString:@"NextTrack"]) {
[nextTrackButton setTitle:string];
- }
- else if ([setHotKey isEqualToString:@"PrevTrack"])
- {
- if (([combo isEqual:nextTrackCombo] || [combo isEqual:playPauseCombo] ||
- [combo isEqual:trackInfoCombo] || [combo isEqual:upcomingSongsCombo]) &&
- !(([combo modifiers] == -1) && ([combo keyCode] == -1)))
- {
- [window setLevel:NSNormalWindowLevel];
- NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil);
- [window setLevel:NSStatusWindowLevel];
- return;
- }
- prevTrackCombo = [combo copy];
+ } else if ([currentHotKey isEqualToString:@"PrevTrack"]) {
[previousTrackButton setTitle:string];
- }
- else if ([setHotKey isEqualToString:@"TrackInfo"])
- {
- if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] ||
- [combo isEqual:playPauseCombo] || [combo isEqual:upcomingSongsCombo]) &&
- !(([combo modifiers] == -1) && ([combo keyCode] == -1)))
- {
- [window setLevel:NSNormalWindowLevel];
- NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil);
- [window setLevel:NSStatusWindowLevel];
- return;
- }
- trackInfoCombo = [combo copy];
+ } else if ([currentHotKey isEqualToString:@"ShowPlayer"]) {
+ [showPlayerButton setTitle:string];
+ } else if ([currentHotKey isEqualToString:@"TrackInfo"]) {
[trackInfoButton setTitle:string];
- }
- else if ([setHotKey isEqualToString:@"UpcomingSongs"])
- {
- if (([combo isEqual:nextTrackCombo] || [combo isEqual:prevTrackCombo] ||
- [combo isEqual:trackInfoCombo] || [combo isEqual:playPauseCombo]) &&
- !(([combo modifiers] == -1) && ([combo keyCode] == -1)))
- {
- [window setLevel:NSNormalWindowLevel];
- NSRunAlertPanel(@"Duplicate Key Combo", @"Please choose a unique key combo.", @"OK", nil, nil, nil);
- [window setLevel:NSStatusWindowLevel];
- return;
- }
- upcomingSongsCombo = [combo copy];
+ } else if ([currentHotKey isEqualToString:@"UpcomingSongs"]) {
[upcomingSongsButton setTitle:string];
+ } else if ([currentHotKey isEqualToString:@"IncrementVolume"]) {
+ [volumeIncrementButton setTitle:string];
+ } else if ([currentHotKey isEqualToString:@"DecrementVolume"]) {
+ [volumeDecrementButton setTitle:string];
+ } else if ([currentHotKey isEqualToString:@"IncrementRating"]) {
+ [ratingIncrementButton setTitle:string];
+ } else if ([currentHotKey isEqualToString:@"DecrementRating"]) {
+ [ratingDecrementButton setTitle:string];
+ } else if ([currentHotKey isEqualToString:@"ToggleShuffle"]) {
+ [toggleShuffleButton setTitle:string];
+ } else if ([currentHotKey isEqualToString:@"ToggleLoop"]) {
+ [toggleLoopButton setTitle:string];
}
+ [controller setupHotKeys];
[self cancelHotKey:sender];
}
-- (IBAction)save:(id)sender
-{
- [self apply:nil];
- [window close];
- [mt closePreferences];
-}
-- (IBAction)setCurrentTrackInfo:(id)sender
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark HOTKEY SUPPORT METHODS
+/*************************************************************************/
+
+- (void)setCurrentHotKey:(NSString *)key
{
- [self setKeyCombo:trackInfoCombo];
- [self setHotKey:@"TrackInfo"];
+ [currentHotKey autorelease];
+ currentHotKey = [key copy];
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyEvent:) name:ITKeyBroadcasterKeyEvent object:nil];
+ [NSApp beginSheet:keyComboPanel modalForWindow:window modalDelegate:self didEndSelector:nil contextInfo:nil];
}
-- (IBAction)setNextTrack:(id)sender
+- (void)keyEvent:(NSNotification *)note
{
- [self setKeyCombo:nextTrackCombo];
- [self setHotKey:@"NextTrack"];
+ [self setKeyCombo:[[[note userInfo] objectForKey:@"keyCombo"] copy]];
}
-- (IBAction)setPlayPause:(id)sender
+- (void)setKeyCombo:(ITKeyCombo *)newCombo
{
- [self setKeyCombo:playPauseCombo];
- [self setHotKey:@"PlayPause"];
+ NSString *string;
+ [combo release];
+ combo = [newCombo copy];
+
+ string = [combo description];
+ if (string == nil) {
+ string = @"";
+ }
+ [keyComboField setStringValue:string];
}
-- (IBAction)setPreviousTrack:(id)sender
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark PRIVATE METHOD IMPLEMENTATIONS
+/*************************************************************************/
+
+- (void)setupWindow
{
- [self setKeyCombo:prevTrackCombo];
- [self setHotKey:@"PrevTrack"];
+ if (![NSBundle loadNibNamed:@"Preferences" owner:self]) {
+ NSLog(@"MenuTunes: Failed to load Preferences.nib");
+ NSBeep();
+ return;
+ }
}
-- (IBAction)setUpcomingSongs:(id)sender
+- (void)setupCustomizationTables
{
- [self setKeyCombo:upcomingSongsCombo];
- [self setHotKey:@"UpcomingSongs"];
+ NSImageCell *imgCell = [[[NSImageCell alloc] initImageCell:nil] autorelease];
+
+ // Set the table view cells up
+ [imgCell setImageScaling:NSScaleNone];
+ [[menuTableView tableColumnWithIdentifier:@"submenu"] setDataCell:imgCell];
+ [[allTableView tableColumnWithIdentifier:@"submenu"] setDataCell:imgCell];
+
+ // Register for drag and drop
+ [menuTableView registerForDraggedTypes:[NSArray arrayWithObjects:
+ @"MenuTableViewPboardType",
+ @"AllTableViewPboardType",
+ nil]];
+ [allTableView registerForDraggedTypes:[NSArray arrayWithObjects:
+ @"MenuTableViewPboardType",
+ @"AllTableViewPboardType",
+ nil]];
}
-- (void)setHotKey:(NSString *)key
+- (void)setupMenuItems
{
- setHotKey = key;
- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyEvent:) name:@"KeyBroadcasterEvent" object:nil];
- [NSApp beginSheet:keyComboPanel modalForWindow:window modalDelegate:self didEndSelector:nil contextInfo:nil];
+ NSEnumerator *itemEnum;
+ id anItem;
+ // Set the list of items you can have.
+ availableItems = [[NSMutableArray alloc] initWithObjects:
+ @"trackInfo",
+ @"upcomingSongs",
+ @"playlists",
+ @"eqPresets",
+ @"songRating",
+ @"playPause",
+ @"nextTrack",
+ @"prevTrack",
+ @"fastForward",
+ @"rewind",
+ @"showPlayer",
+ @"separator",
+ nil];
+
+ // Get our preferred menu
+ myItems = [[df arrayForKey:@"menu"] mutableCopy];
+
+ // Delete items in the availableItems array that are already part of the menu
+ itemEnum = [myItems objectEnumerator];
+ while ( (anItem = [itemEnum nextObject]) ) {
+ if (![anItem isEqualToString:@"separator"]) {
+ [availableItems removeObject:anItem];
+ }
+ }
+
+ // Items that show should a submenu image
+ submenuItems = [[NSArray alloc] initWithObjects:
+ @"upcomingSongs",
+ @"playlists",
+ @"eqPresets",
+ @"songRating",
+ nil];
}
-- (void)keyEvent:(NSNotification *)note
+- (void)setupUI
{
- NSDictionary *info = [note userInfo];
- short keyCode;
- long modifiers;
- KeyCombo *newCombo;
+ NSMutableDictionary *loginwindow;
+ NSMutableArray *loginarray;
+ NSEnumerator *loginEnum;
+ id anItem;
+
+ // 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 = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PlayPause"]];
+ [hotKeysDictionary setObject:anItem forKey:@"PlayPause"];
+ [playPauseButton setTitle:[anItem description]];
+ } else {
+ [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"PlayPause"];
+ [playPauseButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
+ }
+
+ if ([df objectForKey:@"NextTrack"]) {
+ anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"NextTrack"]];
+ [hotKeysDictionary setObject:anItem forKey:@"NextTrack"];
+ [nextTrackButton setTitle:[anItem description]];
+ } else {
+ [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"NextTrack"];
+ [nextTrackButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
+ }
+
+ if ([df objectForKey:@"PrevTrack"]) {
+ anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"PrevTrack"]];
+ [hotKeysDictionary setObject:anItem forKey:@"PrevTrack"];
+ [previousTrackButton setTitle:[anItem description]];
+ } else {
+ [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"PrevTrack"];
+ [previousTrackButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
+ }
+
+ if ([df objectForKey:@"ShowPlayer"]) {
+ anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ShowPlayer"]];
+ [hotKeysDictionary setObject:anItem forKey:@"ShowPlayer"];
+ [showPlayerButton setTitle:[anItem description]];
+ } else {
+ [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"ShowPlayer"];
+ [showPlayerButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
+ }
- keyCode = [[info objectForKey:@"KeyCode"] shortValue];
- modifiers = [[info objectForKey:@"Modifiers"] longValue];
+ if ([df objectForKey:@"TrackInfo"]) {
+ anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"TrackInfo"]];
+ [hotKeysDictionary setObject:anItem forKey:@"TrackInfo"];
+ [trackInfoButton setTitle:[anItem description]];
+ } else {
+ [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"TrackInfo"];
+ [trackInfoButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
+ }
+
+ if ([df objectForKey:@"UpcomingSongs"]) {
+ anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"UpcomingSongs"]];
+ [hotKeysDictionary setObject:anItem forKey:@"UpcomingSongs"];
+ [upcomingSongsButton setTitle:[anItem description]];
+ } else {
+ [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"UpcomingSongs"];
+ [upcomingSongsButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
+ }
+
+ if ([df objectForKey:@"IncrementVolume"]) {
+ anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"IncrementVolume"]];
+ [hotKeysDictionary setObject:anItem forKey:@"IncrementVolume"];
+ [volumeIncrementButton setTitle:[anItem description]];
+ } else {
+ [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"IncrementVolume"];
+ [volumeIncrementButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
+ }
+
+ if ([df objectForKey:@"DecrementVolume"]) {
+ anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"DecrementVolume"]];
+ [hotKeysDictionary setObject:anItem forKey:@"DecrementVolume"];
+ [volumeDecrementButton setTitle:[anItem description]];
+ } else {
+ [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"DecrementVolume"];
+ [volumeDecrementButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
+ }
+
+ if ([df objectForKey:@"IncrementRating"]) {
+ anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"IncrementRating"]];
+ [hotKeysDictionary setObject:anItem forKey:@"IncrementRating"];
+ [ratingIncrementButton setTitle:[anItem description]];
+ } else {
+ [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"IncrementRating"];
+ [ratingIncrementButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
+ }
- newCombo = [[KeyCombo alloc] initWithKeyCode:keyCode andModifiers:modifiers];
- [self setKeyCombo:newCombo];
+ if ([df objectForKey:@"DecrementRating"]) {
+ anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"DecrementRating"]];
+ [hotKeysDictionary setObject:anItem forKey:@"DecrementRating"];
+ [ratingDecrementButton setTitle:[anItem description]];
+ } else {
+ [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"DecrementRating"];
+ [ratingDecrementButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
+ }
+
+ if ([df objectForKey:@"ToggleLoop"]) {
+ anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleLoop"]];
+ [hotKeysDictionary setObject:anItem forKey:@"ToggleLoop"];
+ [toggleLoopButton setTitle:[anItem description]];
+ } else {
+ [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"ToggleLoop"];
+ [toggleLoopButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
+ }
+
+ if ([df objectForKey:@"ToggleShuffle"]) {
+ anItem = [ITKeyCombo keyComboWithPlistRepresentation:[df objectForKey:@"ToggleShuffle"]];
+ [hotKeysDictionary setObject:anItem forKey:@"ToggleShuffle"];
+ [toggleShuffleButton setTitle:[anItem description]];
+ } else {
+ [hotKeysDictionary setObject:[ITKeyCombo clearKeyCombo] forKey:@"ToggleShuffle"];
+ [toggleShuffleButton setTitle:[[ITKeyCombo clearKeyCombo] description]];
+ }
+
+ // 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"];
+
+ loginEnum = [loginarray objectEnumerator];
+ while ( (anItem = [loginEnum nextObject]) ) {
+ if ([[[anItem objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]]) {
+ [launchAtLoginCheckbox setState:NSOnState];
+ }
+ }
}
-- (void)setKeyCombo:(KeyCombo *)newCombo
+- (IBAction)changeMenus:(id)sender
{
- NSString *string;
- [combo release];
- combo = [newCombo copy];
-
- string = [combo userDisplayRep];
- if (string == nil)
- {
- string = @"";
+ [df setObject:myItems forKey:@"menu"];
+ [df synchronize];
+}
+
+- (void)setLaunchesAtLogin:(BOOL)flag
+{
+ if ( flag ) {
+ NSMutableDictionary *loginwindow;
+ NSMutableArray *loginarray;
+ ComponentInstance temp = OpenDefaultComponent(kOSAComponentType, kAppleScriptSubtype);
+ int i;
+ BOOL skip = NO;
+
+ [df synchronize];
+ loginwindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy];
+ loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
+
+ for (i = 0; i < [loginarray count]; i++) {
+ NSDictionary *tempDict = [loginarray objectAtIndex:i];
+ if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]]) {
+ skip = YES;
+ }
+ }
+
+ if (!skip) {
+ AEDesc scriptDesc, resultDesc;
+ NSString *script = [NSString stringWithFormat:@"tell application \"System Events\"\nmake new login item at end of login items with properties {path:\"%@\", kind:\"APPLICATION\"}\nend tell", [[NSBundle mainBundle] bundlePath]];
+
+ AECreateDesc(typeChar, [script cString], [script cStringLength],
+ &scriptDesc);
+
+ OSADoScript(temp, &scriptDesc, kOSANullScript, typeChar, kOSAModeCanInteract, &resultDesc);
+
+ AEDisposeDesc(&scriptDesc);
+ AEDisposeDesc(&resultDesc);
+ CloseComponent(temp);
+ }
+
+ } else {
+ NSMutableDictionary *loginwindow;
+ NSMutableArray *loginarray;
+ int i;
+
+ [df synchronize];
+ loginwindow = [[df persistentDomainForName:@"loginwindow"] mutableCopy];
+ loginarray = [loginwindow objectForKey:@"AutoLaunchedApplicationDictionary"];
+
+ for (i = 0; i < [loginarray count]; i++) {
+ NSDictionary *tempDict = [loginarray objectAtIndex:i];
+ if ([[[tempDict objectForKey:@"Path"] lastPathComponent] isEqualToString:[[[NSBundle mainBundle] bundlePath] lastPathComponent]]) {
+ [loginarray removeObjectAtIndex:i];
+ [df setPersistentDomain:loginwindow forName:@"loginwindow"];
+ [df synchronize];
+ break;
+ }
+ }
}
- [keyComboField setStringValue:string];
}
-//
-//
-// Text Field Delegate
-//
-//
-- (void)controlTextDidChange:(NSNotification *)note
+/*************************************************************************/
+#pragma mark -
+#pragma mark NSWindow DELEGATE METHODS
+/*************************************************************************/
+
+- (void)windowWillClose:(NSNotification *)note
{
- NSLog(@"%@", [note userInfo]);
+ [(MainController *)controller closePreferences];
}
-//
-//
-// Table View Datasource Methods
-//
-//
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark NSTableView DATASOURCE METHODS
+/*************************************************************************/
- (int)numberOfRowsInTableView:(NSTableView *)aTableView
{
- if (aTableView == menuTableView)
- {
+ if (aTableView == menuTableView) {
return [myItems count];
- }
- else
- {
+ } else {
return [availableItems count];
}
}
- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex
{
- if (aTableView == menuTableView)
- {
- if ([[aTableColumn identifier] isEqualToString:@"name"])
- {
- return [myItems objectAtIndex:rowIndex];
- }
- else
- {
+ if (aTableView == menuTableView) {
+ if ([[aTableColumn identifier] isEqualToString:@"name"]) {
+ NSString *object = [myItems objectAtIndex:rowIndex];
+ if ([object isEqualToString:@"Show Player"]) {
+ return [NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"show", @"Show"), [[controller currentRemote] playerSimpleName]];
+ }
+ return NSLocalizedString(object, @"ERROR");
+ } else {
if ([submenuItems containsObject:[myItems objectAtIndex:rowIndex]])
{
return [NSImage imageNamed:@"submenu"];
- }
- else
- {
+ } else {
return nil;
}
}
- }
- else
- {
- if ([[aTableColumn identifier] isEqualToString:@"name"])
- {
- return [availableItems objectAtIndex:rowIndex];
- }
- else
- {
- if ([submenuItems containsObject:[availableItems objectAtIndex:rowIndex]])
- {
+ } else {
+ if ([[aTableColumn identifier] isEqualToString:@"name"]) {
+ return NSLocalizedString([availableItems objectAtIndex:rowIndex], @"ERROR");
+ } else {
+ if ([submenuItems containsObject:[availableItems objectAtIndex:rowIndex]]) {
return [NSImage imageNamed:@"submenu"];
- }
- else
- {
+ } else {
return nil;
}
}
- (BOOL)tableView:(NSTableView *)tableView writeRows:(NSArray*)rows toPasteboard:(NSPasteboard*)pboard
{
- if (tableView == menuTableView)
- {
+ if (tableView == menuTableView) {
[pboard declareTypes:[NSArray arrayWithObjects:@"MenuTableViewPboardType", nil] owner:self];
[pboard setString:[[rows objectAtIndex:0] stringValue] forType:@"MenuTableViewPboardType"];
return YES;
}
- if (tableView == allTableView)
- {
+ if (tableView == allTableView) {
[pboard declareTypes:[NSArray arrayWithObjects:@"AllTableViewPboardType", nil] owner:self];
[pboard setString:[[rows objectAtIndex:0] stringValue] forType:@"AllTableViewPboardType"];
return YES;
pb = [info draggingPasteboard];
- if ([[pb types] containsObject:@"MenuTableViewPboardType"])
- {
+ if ([[pb types] containsObject:@"MenuTableViewPboardType"]) {
dragData = [pb stringForType:@"MenuTableViewPboardType"];
dragRow = [dragData intValue];
temp = [myItems objectAtIndex:dragRow];
- [myItems removeObjectAtIndex:dragRow];
- if (tableView == menuTableView)
- {
- if (row > dragRow)
- {
- [myItems insertObject:temp atIndex:row - 1];
+ if (tableView == menuTableView) {
+ [myItems insertObject:temp atIndex:row];
+ if (row > dragRow) {
+ [myItems removeObjectAtIndex:dragRow];
+ } else {
+ [myItems removeObjectAtIndex:dragRow + 1];
}
- else
- {
- [myItems insertObject:temp atIndex:row];
- }
- }
- else
- {
- if (![temp isEqualToString:@"<separator>"])
- {
+ } else {
+ if (![temp isEqualToString:@"separator"]) {
[availableItems addObject:temp];
}
+ [myItems removeObjectAtIndex:dragRow];
}
- }
- else if ([[pb types] containsObject:@"AllTableViewPboardType"])
- {
+ } else if ([[pb types] containsObject:@"AllTableViewPboardType"]) {
dragData = [pb stringForType:@"AllTableViewPboardType"];
dragRow = [dragData intValue];
temp = [availableItems objectAtIndex:dragRow];
- if (![temp isEqualToString:@"<separator>"])
- {
+ [myItems insertObject:temp atIndex:row];
+
+ if (![temp isEqualToString:@"separator"]) {
[availableItems removeObjectAtIndex:dragRow];
}
- [myItems insertObject:temp atIndex:row];
}
[menuTableView reloadData];
[allTableView reloadData];
+ [self changeMenus:self];
return YES;
}
- (NSDragOperation)tableView:(NSTableView*)tableView validateDrop:(id <NSDraggingInfo>)info proposedRow:(int)row proposedDropOperation:(NSTableViewDropOperation)operation
{
- if (tableView == allTableView)
- {
- if ([[[info draggingPasteboard] types] containsObject:@"AllTableViewPboardType"])
- {
+ if (tableView == allTableView) {
+ if ([[[info draggingPasteboard] types] containsObject:@"AllTableViewPboardType"]) {
return NSDragOperationNone;
}
- if ([[[info draggingPasteboard] types] containsObject:@"MenuTableViewPboardType"])
- {
+ if ([[[info draggingPasteboard] types] containsObject:@"MenuTableViewPboardType"]) {
NSString *item = [myItems objectAtIndex:[[[info draggingPasteboard] stringForType:@"MenuTableViewPboardType"] intValue]];
- if ([item isEqualToString:@"PreferencesÉ"] || [item isEqualToString:@"Quit"])
- {
+ if ([item isEqualToString:@"Preferences"] || [item isEqualToString:@"Quit"]) {
return NSDragOperationNone;
}
}
return NSDragOperationGeneric;
}
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark DEALLOCATION METHODS
+/*************************************************************************/
+
+- (void)dealloc
+{
+ [self setKeyCombo:nil];
+ [hotKeysDictionary release];
+ [keyComboPanel release];
+ [menuTableView setDataSource:nil];
+ [allTableView setDataSource:nil];
+ [controller release];
+ [availableItems release];
+ [submenuItems release];
+ [myItems release];
+ [df release];
+}
+
+
@end
git.ithinksw.org / MenuTunes.git / blobdiff