X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/9e81b116e66a0bff8ef8fe6b242f7f589f8f02ca..3b16f08f4e3b0f3b3105f79b12d2f0e0c7564a6e:/MenuController.m diff --git a/MenuController.m b/MenuController.m index 2ac4826..cfd2909 100755 --- a/MenuController.m +++ b/MenuController.m @@ -7,9 +7,11 @@ // #import "MenuController.h" -#import "NewMainController.h" -#import "HotKeyCenter.h" -#import "KeyCombo.h" +#import "MainController.h" +#import +#import +#import +#import @interface MenuController (SubmenuMethods) - (NSMenu *)ratingMenu; @@ -39,7 +41,8 @@ NSString *nextObject; NSMenuItem *tempItem; NSEnumerator *itemEnum; - KeyCombo *keyCombo; + ITHotKey *hotKey; + NSArray *hotKeys = [[ITHotKeyCenter sharedCenter] allHotKeys]; //Get the information _currentPlaylist = [currentRemote currentPlaylistIndex]; @@ -72,10 +75,14 @@ [tempItem setTag:MTMenuPlayPauseItem]; [tempItem setTarget:self]; - if ( (keyCombo = [[HotKeyCenter sharedCenter] keyComboForName:@"PlayPause"]) ) { - [self setKeyEquivalentForCode:[keyCombo keyCode] - andModifiers:[keyCombo modifiers] - onItem:tempItem]; + itemEnum = [hotKeys objectEnumerator]; + while ( (hotKey = [itemEnum nextObject]) ) { + if ([[hotKey name] isEqualToString:@"PlayPause"]) { + ITKeyCombo *combo = [hotKey keyCombo]; + [self setKeyEquivalentForCode:[combo keyCode] + andModifiers:[combo modifiers] + onItem:tempItem]; + } } switch ([currentRemote playerPlayingState]) { @@ -94,10 +101,14 @@ action:@selector(performMainMenuAction:) keyEquivalent:@""]; - if ( (keyCombo = [[HotKeyCenter sharedCenter] keyComboForName:@"NextTrack"]) ) { - [self setKeyEquivalentForCode:[keyCombo keyCode] - andModifiers:[keyCombo modifiers] - onItem:tempItem]; + itemEnum = [hotKeys objectEnumerator]; + while ( (hotKey = [itemEnum nextObject]) ) { + if ([[hotKey name] isEqualToString:@"NextTrack"]) { + ITKeyCombo *combo = [hotKey keyCombo]; + [self setKeyEquivalentForCode:[combo keyCode] + andModifiers:[combo modifiers] + onItem:tempItem]; + } } if (_currentPlaylist) { @@ -109,10 +120,14 @@ action:@selector(performMainMenuAction:) keyEquivalent:@""]; - if ( (keyCombo = [[HotKeyCenter sharedCenter] keyComboForName:@"PrevTrack"]) ) { - [self setKeyEquivalentForCode:[keyCombo keyCode] - andModifiers:[keyCombo modifiers] - onItem:tempItem]; + itemEnum = [hotKeys objectEnumerator]; + while ( (hotKey = [itemEnum nextObject]) ) { + if ([[hotKey name] isEqualToString:@"PrevTrack"]) { + ITKeyCombo *combo = [hotKey keyCombo]; + [self setKeyEquivalentForCode:[combo keyCode] + andModifiers:[combo modifiers] + onItem:tempItem]; + } } if (_currentPlaylist) { @@ -142,10 +157,14 @@ action:@selector(performMainMenuAction:) keyEquivalent:@""]; - if ( (keyCombo = [[HotKeyCenter sharedCenter] keyComboForName:@"ShowPlayer"]) ) { - [self setKeyEquivalentForCode:[keyCombo keyCode] - andModifiers:[keyCombo modifiers] - onItem:tempItem]; + itemEnum = [hotKeys objectEnumerator]; + while ( (hotKey = [itemEnum nextObject]) ) { + if ([[hotKey name] isEqualToString:@"ShowPlayer"]) { + ITKeyCombo *combo = [hotKey keyCombo]; + [self setKeyEquivalentForCode:[combo keyCode] + andModifiers:[combo modifiers] + onItem:tempItem]; + } } [tempItem setTarget:self]; @@ -209,6 +228,34 @@ action:nil keyEquivalent:@""]; } + + if ([defaults boolForKey:@"showTrackRating"]) { + NSString *string; + switch ((int)([currentRemote currentSongRating] * 5)) { + case 0: + string = [NSString stringWithUTF8String:"☆☆☆☆☆"]; + break; + case 1: + string = [NSString stringWithUTF8String:"★☆☆☆☆"]; + break; + case 2: + string = [NSString stringWithUTF8String:"★★☆☆☆"]; + break; + case 3: + string = [NSString stringWithUTF8String:"★★★☆☆"]; + break; + case 4: + string = [NSString stringWithUTF8String:"★★★★☆"]; + break; + case 5: + string = [NSString stringWithUTF8String:"★★★★★"]; + break; + } + [menu addItemWithTitle: + [@" " stringByAppendingString:string] + action:nil + keyEquivalent:@""]; + } } else { [menu addItemWithTitle:NSLocalizedString(@"noSong", @"No Song") action:NULL keyEquivalent:@""]; } @@ -392,39 +439,39 @@ switch ( [sender tag] ) { case MTMenuPlayPauseItem: - NSLog(@"MenuController: Play/Pause"); + ITDebugLog(@"MenuController: Play/Pause"); [[MainController sharedController] playPause]; break; case MTMenuFastForwardItem: - NSLog(@"MenuController: Fast Forward"); + ITDebugLog(@"MenuController: Fast Forward"); [[MainController sharedController] fastForward]; break; case MTMenuRewindItem: - NSLog(@"MenuController: Rewind"); + ITDebugLog(@"MenuController: Rewind"); [[MainController sharedController] rewind]; break; case MTMenuPreviousTrackItem: - NSLog(@"MenuController: Previous Track"); + ITDebugLog(@"MenuController: Previous Track"); [[MainController sharedController] prevSong]; break; case MTMenuNextTrackItem: - NSLog(@"MenuController: Next Track"); + ITDebugLog(@"MenuController: Next Track"); [[MainController sharedController] nextSong]; break; case MTMenuShowPlayerItem: - NSLog(@"MainController: Show Main Interface"); + ITDebugLog(@"MainController: Show Main Interface"); [[MainController sharedController] showPlayer]; break; case MTMenuPreferencesItem: - NSLog(@"MenuController: Preferences..."); + ITDebugLog(@"MenuController: Preferences..."); [[MainController sharedController] showPreferences]; break; case MTMenuQuitItem: - NSLog(@"MenuController: Quit"); + ITDebugLog(@"MenuController: Quit"); [[MainController sharedController] quitMenuTunes]; break; default: - NSLog(@"MenuController: Unimplemented Menu Item OR Child-bearing Menu Item"); + ITDebugLog(@"MenuController: Unimplemented Menu Item OR Child-bearing Menu Item"); break; } } @@ -520,7 +567,7 @@ [[NSString stringWithString:@"Space"] getCharacters:&buffer]; charcode = buffer; /*MenuRef menuRef = _NSGetCarbonMenu([item menu]); - NSLog(@"%@", menuRef); + ITDebugLog(@"%@", menuRef); SetMenuItemCommandKey(menuRef, 0, NO, 49); SetMenuItemModifiers(menuRef, 0, kMenuNoCommandModifier); SetMenuItemKeyGlyph(menuRef, 0, kMenuBlankGlyph);