¥ Optimize
¥ Apple Events! Apple Events! Apple Events!
¥ Manual and webpage
+¥ Finish up registration frontend
*/
#import "MenuTunes.h"
- (NSString *)runScriptAndReturnResult:(NSString *)script;
- (void)timerUpdate;
- (void)sendAEWithEventClass:(AEEventClass)eventClass andEventID:(AEEventID)eventID;
+- (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers
+ onItem:(NSMenuItem *)item;
@end
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:)
if ([defaults boolForKey:@"showName"]) {
[menu removeItemAtIndex:index + 1];
}
- if (didHaveAlbumName) {
+ if (didHaveAlbumName && [defaults boolForKey:@"showAlbum"]) {
[menu removeItemAtIndex:index + 1];
}
- if (didHaveArtistName) {
+ if (didHaveArtistName && [defaults boolForKey:@"showArtist"]) {
[menu removeItemAtIndex:index + 1];
}
if ([defaults boolForKey:@"showTime"]) {
[menu removeItemAtIndex:index + 1];
}
}
+
if (!isPlayingRadio) {
if ([defaults boolForKey:@"showTime"]) {
menuItem = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@" %@", [self runScriptAndReturnResult:@"return time of current track"]]
}
if ([defaults boolForKey:@"showArtist"]) {
- didHaveAlbumName = (([curArtistName length] > 0) ? YES : NO);
+ didHaveArtistName = (([curArtistName length] > 0) ? YES : NO);
}
if ([defaults boolForKey:@"showAlbum"]) {
- didHaveArtistName = (([curAlbumName length] > 0) ? YES : NO);
+ didHaveAlbumName = (([curAlbumName length] > 0) ? YES : NO);
}
}
}
if ([(NSString *)procName isEqualToString:@"iTunes"]) {
return procNum;
}
- CFRelease(release);
+ CFRelease(procName);
}
}
return procNum;
if (!statusController && [trackName length]) {
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
NSString *stringToShow = @"";
- int lines = 1;
if ([defaults boolForKey:@"showName"]) {
if ([defaults boolForKey:@"showArtist"]) {
}
stringToShow = [stringToShow stringByAppendingString:trackName];
stringToShow = [stringToShow stringByAppendingString:@"\n"];
- if ([trackName length] > 38) {
- lines++;
- }
- lines++;
}
if ([defaults boolForKey:@"showAlbum"]) {
if ([trackAlbum length]) {
stringToShow = [stringToShow stringByAppendingString:trackAlbum];
stringToShow = [stringToShow stringByAppendingString:@"\n"];
- lines++;
}
}
NSString *trackTime = [self runScriptAndReturnResult:@"return time of current track"];
if ([trackTime length]) {
stringToShow = [NSString stringWithFormat:@"%@Total Time: %@\n", stringToShow, trackTime];
- lines++;
}
}
}
statusController = [[StatusWindowController alloc] init];
- [statusController setTrackInfo:stringToShow lines:lines];
+ [statusController setTrackInfo:stringToShow];
[NSTimer scheduledTimerWithTimeInterval:3.0
target:self
selector:@selector(fadeAndCloseStatusWindow)
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];
}
}
}
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
[super dealloc];
}
-
-@end
+@end
\ No newline at end of file
git.ithinksw.org / MenuTunes.git / blobdiff