X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/f9501d79d42bf4392c3b13e0e15e68a8e6280393..7ef17aec99c92c9d0d3f9fc29e257e0035de1aa9:/MenuTunes.m diff --git a/MenuTunes.m b/MenuTunes.m index 74066d7..aa4296c 100755 --- a/MenuTunes.m +++ b/MenuTunes.m @@ -1,24 +1,18 @@ /* Things to do: -¥ Radio mode makes things act oddly ¥ Make preferences window pretty -¥ Hot Keys - - hot keys can't be set when NSBGOnly is on. The window is not key, - so the KeyBroadcaster does not pick up key combos - - going to need a different way of defining key combos ¥ Optimize ¥ Apple Events! Apple Events! Apple Events! -¥ Upcoming songs menu items are disabled after launching iTunes and playing +¥ Manual and webpage +¥ Finish up registration frontend */ #import "MenuTunes.h" -// #import "MenuTunesView.h" #import "PreferencesController.h" #import "HotKeyCenter.h" #import "StatusWindowController.h" @interface MenuTunes(Private) -- (void)registerDefaultsIfNeeded; - (void)updateMenu; - (void)rebuildUpcomingSongsMenu; - (void)rebuildPlaylistMenu; @@ -27,6 +21,8 @@ Things to do: - (NSString *)runScriptAndReturnResult:(NSString *)script; - (void)timerUpdate; - (void)sendAEWithEventClass:(AEEventClass)eventClass andEventID:(AEEventID)eventID; +- (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers + onItem:(NSMenuItem *)item; @end @@ -50,10 +46,10 @@ Things to do: { [self rebuildMenu]; refreshTimer = [NSTimer scheduledTimerWithTimeInterval:3.5 - target:self - selector:@selector(timerUpdate) - userInfo:nil - repeats:YES]; + target:self + selector:@selector(timerUpdate) + userInfo:nil + repeats:YES]; } else { @@ -64,16 +60,15 @@ Things to do: [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(iTunesLaunched:) name:NSWorkspaceDidLaunchApplicationNotification object:nil]; refreshTimer = nil; } + + statusItem = [[ITStatusItem alloc] initWithStatusBar:[NSStatusBar systemStatusBar] + withLength:NSSquareStatusItemLength]; - statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSSquareStatusItemLength]; - [[[statusItem _button] cell] setType:NSNullCellType]; [statusItem setImage:[NSImage imageNamed:@"menu"]]; - [[statusItem _button] setAlternateImage:[NSImage imageNamed:@"selected_image"]]; - [statusItem setHighlightMode:YES]; + [statusItem setAlternateImage:[NSImage imageNamed:@"selected_image"]]; [statusItem setMenu:menu]; - [statusItem retain]; -// view = [[MenuTunesView alloc] initWithFrame:[[statusItem view] frame]]; -// [statusItem setView:view]; + // Below line of code is for creating builds for Beta Testers + // [statusItem setToolTip:@[NSString stringWithFormat:@"This Nontransferable Beta (Built on %s) of iThink Software's MenuTunes is Registered to: Beta Tester (betatester@somedomain.com).",__DATE__]]; } @@ -84,8 +79,14 @@ Things to do: - (void)registerDefaultsIfNeeded { - if (![[NSUserDefaults standardUserDefaults] objectForKey:@"menu"]) { - [[NSUserDefaults standardUserDefaults] setObject: + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; + if (![defaults objectForKey:@"menu"]) { + bool found = NO; + NSMutableDictionary *loginwindow; + NSMutableArray *loginarray; + int i; + + [defaults setObject: [NSArray arrayWithObjects: @"Play/Pause", @"Next Track", @@ -101,6 +102,53 @@ Things to do: @"", @"Current Track Info", nil] forKey:@"menu"]; + + [defaults synchronize]; + loginwindow = [[defaults 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]]) { + found = YES; + } + } + + 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]]; + + AECreateDesc(typeChar, [script cString], [script cStringLength], + &scriptDesc); + + OSADoScript(asComponent, &scriptDesc, kOSANullScript, typeChar, kOSAModeCanInteract, &resultDesc); + + AEDisposeDesc(&scriptDesc); + AEDisposeDesc(&resultDesc); + } + } + } + + if (![defaults integerForKey:@"SongsInAdvance"]) + { + [defaults setInteger:5 forKey:@"SongsInAdvance"]; + } + + if (![defaults objectForKey:@"showName"]) { + [defaults setBool:YES forKey:@"showName"]; + } + + if (![defaults objectForKey:@"showArtist"]) { + [defaults setBool:YES forKey:@"showArtist"]; + } + + if (![defaults objectForKey:@"showAlbum"]) { + [defaults setBool:NO forKey:@"showAlbum"]; + } + + if (![defaults objectForKey:@"showTime"]) { + [defaults setBool:NO forKey:@"showTime"]; } } @@ -112,7 +160,9 @@ Things to do: trackInfoIndex = -1; didHaveAlbumName = ([[self runScriptAndReturnResult:@"return album of current track"] length] > 0); - + didHaveArtistName = ([[self runScriptAndReturnResult:@"return artist of current track"] length] > 0); + + while ([menu numberOfItems] > 0) { [menu removeItemAtIndex:0]; } @@ -129,18 +179,44 @@ Things to do: for (i = 0; i < [myMenu count]; i++) { NSString *item = [myMenu objectAtIndex:i]; if ([item isEqualToString:@"Play/Pause"]) { + KeyCombo *tempCombo = [[NSUserDefaults standardUserDefaults] keyComboForKey:@"PlayPause"]; playPauseMenuItem = [menu addItemWithTitle:@"Play" - action:@selector(playPause:) - keyEquivalent:@""]; + action:@selector(playPause:) + keyEquivalent:@""]; [playPauseMenuItem setTarget:self]; + + if (tempCombo) + { + [self setKeyEquivalentForCode:[tempCombo keyCode] + andModifiers:[tempCombo modifiers] onItem:playPauseMenuItem]; + [tempCombo release]; + } } else if ([item isEqualToString:@"Next Track"]) { - [[menu addItemWithTitle:@"Next Track" - action:@selector(nextSong:) - keyEquivalent:@""] setTarget:self]; + KeyCombo *tempCombo = [[NSUserDefaults standardUserDefaults] keyComboForKey:@"NextTrack"]; + NSMenuItem *nextTrack = [menu addItemWithTitle:@"Next Track" + action:@selector(nextSong:) + keyEquivalent:@""]; + + [nextTrack setTarget:self]; + if (tempCombo) + { + [self setKeyEquivalentForCode:[tempCombo keyCode] + andModifiers:[tempCombo modifiers] onItem:nextTrack]; + [tempCombo release]; + } } else if ([item isEqualToString:@"Previous Track"]) { - [[menu addItemWithTitle:@"Previous Track" - action:@selector(prevSong:) - keyEquivalent:@""] setTarget:self]; + KeyCombo *tempCombo = [[NSUserDefaults standardUserDefaults] keyComboForKey:@"PrevTrack"]; + NSMenuItem *prevTrack = [menu addItemWithTitle:@"Previous Track" + action:@selector(prevSong:) + keyEquivalent:@""]; + + [prevTrack setTarget:self]; + if (tempCombo) + { + [self setKeyEquivalentForCode:[tempCombo keyCode] + andModifiers:[tempCombo modifiers] onItem:prevTrack]; + [tempCombo release]; + } } else if ([item isEqualToString:@"Fast Forward"]) { [[menu addItemWithTitle:@"Fast Forward" action:@selector(fastForward:) @@ -189,8 +265,8 @@ Things to do: //Updates the menu with current player state, song, and upcoming songs - (void)updateMenu { - NSString *curAlbumName = [self runScriptAndReturnResult:@"return album of current track"]; NSMenuItem *menuItem; + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; if ((iTunesPSN.highLongOfPSN == kNoProcess) && (iTunesPSN.lowLongOfPSN == 0)) { return; @@ -199,54 +275,101 @@ Things to do: if (upcomingSongsItem) { [self rebuildUpcomingSongsMenu]; } + if (playlistItem) { [self rebuildPlaylistMenu]; } + if (eqItem) { [self rebuildEQPresetsMenu]; } if (trackInfoIndex > -1) { - NSString *curSongName; + NSString *curSongName, *curAlbumName = @"", *curArtistName = @""; curSongName = [self runScriptAndReturnResult:@"return name of current track"]; + + if ([defaults boolForKey:@"showAlbum"]) { + curAlbumName = [self runScriptAndReturnResult:@"return album of current track"]; + } + + if ([defaults boolForKey:@"showArtist"]) { + curArtistName = [self runScriptAndReturnResult:@"return artist of current track"]; + } + if ([curSongName length] > 0) { int index = [menu indexOfItemWithTitle:@"Now Playing"]; - if (index > -1) { - [menu removeItemAtIndex:index + 1]; - - if (didHaveAlbumName) { + if ([defaults boolForKey:@"showName"]) { + [menu removeItemAtIndex:index + 1]; + } + if (didHaveAlbumName && [defaults boolForKey:@"showAlbum"]) { + [menu removeItemAtIndex:index + 1]; + } + if (didHaveArtistName && [defaults boolForKey:@"showArtist"]) { + [menu removeItemAtIndex:index + 1]; + } + if ([defaults boolForKey:@"showTime"]) { [menu removeItemAtIndex:index + 1]; } } - if ([curAlbumName length] > 0) { - menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", curAlbumName] + if (!isPlayingRadio) { + if ([defaults boolForKey:@"showTime"]) { + menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", [self runScriptAndReturnResult:@"return time of current track"]] + action:nil + keyEquivalent:@""]; + [menu insertItem:menuItem atIndex:trackInfoIndex + 1]; + [menuItem release]; + } + + if ([curArtistName length] > 0) { + menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", curArtistName] + action:nil + keyEquivalent:@""]; + [menu insertItem:menuItem atIndex:trackInfoIndex + 1]; + [menuItem release]; + } + + if ([curAlbumName length] > 0) { + menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", curAlbumName] + action:nil + keyEquivalent:@""]; + [menu insertItem:menuItem atIndex:trackInfoIndex + 1]; + [menuItem release]; + } + } + + if ([defaults boolForKey:@"showName"]) { + menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", curSongName] action:nil keyEquivalent:@""]; [menu insertItem:menuItem atIndex:trackInfoIndex + 1]; [menuItem release]; } - menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", curSongName] - action:nil - keyEquivalent:@""]; - [menu insertItem:menuItem atIndex:trackInfoIndex + 1]; - [menuItem release]; - if (index == -1) { menuItem = [[NSMenuItem alloc] initWithTitle:@"Now Playing" action:nil keyEquivalent:@""]; [menu removeItemAtIndex:[menu indexOfItemWithTitle:@"No Song"]]; [menu insertItem:menuItem atIndex:trackInfoIndex]; [menuItem release]; } - } else if ([menu indexOfItemWithTitle:@"No Song"] == -1) { [menu removeItemAtIndex:trackInfoIndex]; - [menu removeItemAtIndex:trackInfoIndex]; - if (didHaveAlbumName) { + if ([defaults boolForKey:@"showName"] == YES) { + [menu removeItemAtIndex:trackInfoIndex]; + } + + if ([defaults boolForKey:@"showTime"] == YES) { + [menu removeItemAtIndex:trackInfoIndex]; + } + + if (didHaveArtistName && [defaults boolForKey:@"showArtist"]) { + [menu removeItemAtIndex:trackInfoIndex]; + } + + if (didHaveAlbumName && [defaults boolForKey:@"showAlbum"]) { [menu removeItemAtIndex:trackInfoIndex]; } @@ -254,8 +377,15 @@ Things to do: [menu insertItem:menuItem atIndex:trackInfoIndex]; [menuItem release]; } + + if ([defaults boolForKey:@"showArtist"]) { + didHaveArtistName = (([curArtistName length] > 0) ? YES : NO); + } + + if ([defaults boolForKey:@"showAlbum"]) { + didHaveAlbumName = (([curAlbumName length] > 0) ? YES : NO); + } } - didHaveAlbumName = (([curAlbumName length] > 0) ? YES : NO); } //Rebuild the upcoming songs submenu. Can be improved a lot. @@ -263,30 +393,33 @@ Things to do: { int numSongs = [[self runScriptAndReturnResult:@"return number of tracks in current playlist"] intValue]; int numSongsInAdvance = [[NSUserDefaults standardUserDefaults] integerForKey:@"SongsInAdvance"]; - - if (numSongs > 0) { - int curTrack = [[self runScriptAndReturnResult:@"return index of current track"] intValue]; - int i; - - [upcomingSongsMenu release]; - upcomingSongsMenu = [[NSMenu alloc] initWithTitle:@""]; - - for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) { - if (i <= numSongs) { - NSString *curSong = [self runScriptAndReturnResult:[NSString stringWithFormat:@"return name of track %i of current playlist", i]]; - NSMenuItem *songItem; - songItem = [[NSMenuItem alloc] initWithTitle:curSong action:@selector(playTrack:) keyEquivalent:@""]; - [songItem setTarget:self]; - [songItem setRepresentedObject:[NSNumber numberWithInt:i]]; - [upcomingSongsMenu addItem:songItem]; - [songItem release]; - } else { - [upcomingSongsMenu addItemWithTitle:@"End of playlist." action:nil keyEquivalent:@""]; - break; + if (!isPlayingRadio) { + if (numSongs > 0) { + int curTrack = [[self runScriptAndReturnResult:@"return index of current track"] intValue]; + int i; + + [upcomingSongsMenu release]; + upcomingSongsMenu = [[NSMenu alloc] initWithTitle:@""]; + [upcomingSongsItem setSubmenu:upcomingSongsMenu]; + [upcomingSongsItem setEnabled:YES]; + + for (i = curTrack + 1; i <= curTrack + numSongsInAdvance; i++) { + if (i <= numSongs) { + NSString *curSong = [self runScriptAndReturnResult:[NSString stringWithFormat:@"return name of track %i of current playlist", i]]; + NSMenuItem *songItem; + songItem = [[NSMenuItem alloc] initWithTitle:curSong action:@selector(playTrack:) keyEquivalent:@""]; + [songItem setTarget:self]; + [songItem setRepresentedObject:[NSNumber numberWithInt:i]]; + [upcomingSongsMenu addItem:songItem]; + [songItem release]; + } else { + break; + } } } - [upcomingSongsItem setSubmenu:upcomingSongsMenu]; - [upcomingSongsItem setEnabled:YES]; + } else { + [upcomingSongsItem setSubmenu:nil]; + [upcomingSongsItem setEnabled:NO]; } } @@ -295,6 +428,11 @@ Things to do: int numPlaylists = [[self runScriptAndReturnResult:@"return number of playlists"] intValue]; int i, curPlaylist = [[self runScriptAndReturnResult:@"return index of current playlist"] intValue]; + if (isPlayingRadio) + { + curPlaylist = 0; + } + if (playlistMenu && (numPlaylists == [playlistMenu numberOfItems])) return; @@ -423,15 +561,50 @@ Things to do: - (void)timerUpdate { int pid; - if (GetProcessPID(&iTunesPSN, &pid) == noErr) { int trackPlayingIndex = [[self runScriptAndReturnResult:@"return index of current track"] intValue]; if (trackPlayingIndex != curTrackIndex) { + bool wasPlayingRadio = isPlayingRadio; + isPlayingRadio = [[self runScriptAndReturnResult:@"return class of current playlist"] isEqualToString:@"radio tuner playlist"]; + if (isPlayingRadio && !wasPlayingRadio) { + int i; + for (i = 0; i < [playlistMenu numberOfItems]; i++) + { + [[playlistMenu itemAtIndex:i] setState:NSOffState]; + } + } + if (wasPlayingRadio) { + NSMenuItem *temp = [[NSMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:@""]; + [menu insertItem:temp atIndex:trackInfoIndex + 1]; + [temp release]; + } [self updateMenu]; curTrackIndex = trackPlayingIndex; } - + else + { + int playlist = [[self runScriptAndReturnResult:@"return index of current playlist"] intValue]; + if (playlist != curPlaylistIndex) { + bool wasPlayingRadio = isPlayingRadio; + isPlayingRadio = [[self runScriptAndReturnResult:@"return class of current playlist"] isEqualToString:@"radio tuner playlist"]; + if (isPlayingRadio && !wasPlayingRadio) { + int i; + for (i = 0; i < [playlistMenu numberOfItems]; i++) + { + [[playlistMenu itemAtIndex:i] setState:NSOffState]; + } + } + if (wasPlayingRadio) { + NSMenuItem *temp = [[NSMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:@""]; + [menu insertItem:temp atIndex:trackInfoIndex + 1]; + [temp release]; + } + [self updateMenu]; + curTrackIndex = trackPlayingIndex; + curPlaylistIndex = playlist; + } + } //Update Play/Pause menu item if (playPauseMenuItem){ if ([[self runScriptAndReturnResult:@"return player state"] isEqualToString:@"playing"]) { @@ -483,7 +656,7 @@ Things to do: if ([(NSString *)procName isEqualToString:@"iTunes"]) { return procNum; } - [(NSString *)procName release]; + CFRelease(procName); } } return procNum; @@ -516,11 +689,12 @@ andEventID:(AEEventID)eventID - (void)selectPlaylist:(id)sender { int playlist = [[sender representedObject] intValue]; - int curPlaylist = [[self runScriptAndReturnResult:@"return index of current playlist"] intValue]; - [[playlistMenu itemAtIndex:curPlaylist - 1] setState:NSOffState]; + if (!isPlayingRadio) { + int curPlaylist = [[self runScriptAndReturnResult:@"return index of current playlist"] intValue]; + [[playlistMenu itemAtIndex:curPlaylist - 1] setState:NSOffState]; + } [self runScriptAndReturnResult:[NSString stringWithFormat:@"play playlist %i", playlist]]; [[playlistMenu itemAtIndex:playlist - 1] setState:NSOnState]; - [self updateMenu]; } - (void)selectEQPreset:(id)sender @@ -609,7 +783,6 @@ isEqualToString:@"rewinding"]) { if (!statusController && [trackName length]) { NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSString *stringToShow = @""; - int lines = 1; if ([defaults boolForKey:@"showName"]) { if ([defaults boolForKey:@"showArtist"]) { @@ -618,10 +791,6 @@ isEqualToString:@"rewinding"]) { } stringToShow = [stringToShow stringByAppendingString:trackName]; stringToShow = [stringToShow stringByAppendingString:@"\n"]; - if ([trackName length] > 38) { - lines++; - } - lines++; } if ([defaults boolForKey:@"showAlbum"]) { @@ -629,7 +798,6 @@ isEqualToString:@"rewinding"]) { if ([trackAlbum length]) { stringToShow = [stringToShow stringByAppendingString:trackAlbum]; stringToShow = [stringToShow stringByAppendingString:@"\n"]; - lines++; } } @@ -637,7 +805,6 @@ isEqualToString:@"rewinding"]) { NSString *trackTime = [self runScriptAndReturnResult:@"return time of current track"]; if ([trackTime length]) { stringToShow = [NSString stringWithFormat:@"%@Total Time: %@\n", stringToShow, trackTime]; - lines++; } } @@ -654,12 +821,12 @@ isEqualToString:@"rewinding"]) { } statusController = [[StatusWindowController alloc] init]; - [statusController setTrackInfo:stringToShow lines:lines]; + [statusController setTrackInfo:stringToShow]; [NSTimer scheduledTimerWithTimeInterval:3.0 - target:self - selector:@selector(fadeAndCloseStatusWindow) - userInfo:nil - repeats:NO]; + target:self + selector:@selector(fadeAndCloseStatusWindow) + userInfo:nil + repeats:NO]; } } @@ -683,12 +850,12 @@ isEqualToString:@"rewinding"]) { songs = [songs stringByAppendingString:@"\n"]; } } - [statusController setUpcomingSongs:songs numSongs:numSongsInAdvance]; + [statusController setUpcomingSongs:songs]; [NSTimer scheduledTimerWithTimeInterval:3.0 - target:self - selector:@selector(fadeAndCloseStatusWindow) - userInfo:nil - repeats:NO]; + target:self + selector:@selector(fadeAndCloseStatusWindow) + userInfo:nil + repeats:NO]; } } } @@ -700,6 +867,168 @@ isEqualToString:@"rewinding"]) { statusController = nil; } +- (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers + onItem:(NSMenuItem *)item +{ + unichar charcode = 'a'; + int i; + long cocoaModifiers = 0; + static long carbonToCocoa[6][2] = + { + { cmdKey, NSCommandKeyMask }, + { optionKey, NSAlternateKeyMask }, + { controlKey, NSControlKeyMask }, + { shiftKey, NSShiftKeyMask }, + }; + + for (i = 0; i < 6; i++) + { + if (modifiers & carbonToCocoa[i][0]) + { + cocoaModifiers += carbonToCocoa[i][1]; + } + } + [item setKeyEquivalentModifierMask:cocoaModifiers]; + + //Missing key combos for some keys. Must find them later. + switch (code) + { + case 36: + break; + + case 48: + break; + + case 49: + break; + + case 51: + charcode = NSDeleteFunctionKey; + break; + case 53: + break; + + case 71: + break; + + case 76: + break; + + case 96: + charcode = NSF5FunctionKey; + break; + + case 97: + charcode = NSF6FunctionKey; + break; + + case 98: + charcode = NSF7FunctionKey; + break; + + case 99: + charcode = NSF3FunctionKey; + break; + + case 100: + charcode = NSF8FunctionKey; + break; + + case 101: + charcode = NSF9FunctionKey; + break; + + case 103: + charcode = NSF11FunctionKey; + break; + + case 105: + charcode = NSF3FunctionKey; + break; + + case 107: + charcode = NSF14FunctionKey; + break; + + case 109: + charcode = NSF10FunctionKey; + break; + + case 111: + charcode = NSF12FunctionKey; + break; + + case 113: + charcode = NSF13FunctionKey; + break; + + case 114: + charcode = NSInsertFunctionKey; + break; + + case 115: + break; + + case 116: + charcode = NSPageUpFunctionKey; + break; + + case 117: + charcode = NSDeleteFunctionKey; + break; + + case 118: + charcode = NSF4FunctionKey; + break; + + case 119: + charcode = NSEndFunctionKey; + break; + + case 120: + charcode = NSF2FunctionKey; + break; + + case 121: + charcode = NSPageDownFunctionKey; + break; + + case 122: + charcode = NSF1FunctionKey; + break; + + case 123: + charcode = NSLeftArrowFunctionKey; + break; + + case 124: + charcode = NSRightArrowFunctionKey; + break; + + case 125: + charcode = NSDownArrowFunctionKey; + break; + + case 126: + charcode = NSUpArrowFunctionKey; + break; + } + + if (charcode == 'a') { + unsigned long state; + long keyTrans; + char charCode; + Ptr kchr; + state = 0; + kchr = (Ptr) GetScriptVariable(smCurrentScript, smKCHRCache); + keyTrans = KeyTranslate(kchr, code, &state); + charCode = keyTrans; + [item setKeyEquivalent:[NSString stringWithCString:&charCode length:1]]; + } else { + [item setKeyEquivalent:[NSString stringWithCharacters:&charcode length:1]]; + } +} + /*************************************************************************/ #pragma mark - #pragma mark NSApplication DELEGATE METHODS @@ -730,5 +1059,4 @@ isEqualToString:@"rewinding"]) { [super dealloc]; } - -@end +@end \ No newline at end of file