X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/29aac23ec9900f8a512e899c3bb5542e17f59300..35f6b7135a40f5d95777b74f84bc90db2a33ad2b:/MenuController.m

diff --git a/MenuController.m b/MenuController.m
index c86e10e..0d6cdb5 100755
--- a/MenuController.m
+++ b/MenuController.m
@@ -8,12 +8,16 @@
 
 #import "MenuController.h"
 #import "NewMainController.h"
+#import "HotKeyCenter.h"
+#import "KeyCombo.h"
 
 @interface MenuController (SubmenuMethods)
 - (NSMenu *)ratingMenu;
 - (NSMenu *)upcomingSongsMenu;
 - (NSMenu *)playlistsMenu;
 - (NSMenu *)eqMenu;
+- (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers
+        onItem:(NSMenuItem *)item;
 @end
 
 @implementation MenuController
@@ -29,17 +33,35 @@
 - (NSMenu *)menu
 {
     NSMenu *menu = [[NSMenu alloc] initWithTitle:@""];
-    NSArray *menuArray = [[NSUserDefaults standardUserDefaults] arrayForKey:@"menu"];
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    NSArray *menuArray = [defaults arrayForKey:@"menu"];
     NSEnumerator *enumerator = [menuArray objectEnumerator];
     NSString *nextObject;
     NSMenuItem *tempItem;
+    NSEnumerator *itemEnum;
+    KeyCombo *keyCombo;
     
-    //Get the current playlist, track index, etc.
-    currentRemote = [[MainController sharedController] currentRemote];
+    //Get the information
     _currentPlaylist = [currentRemote currentPlaylistIndex];
-    _currentTrack = [currentRemote currentSongIndex];
     _playingRadio = ([currentRemote currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist);
     
+    //Kill the old submenu items
+    if ( (tempItem = [_currentMenu itemWithTag:1]) ) {
+        [tempItem setSubmenu:nil];
+    }
+    
+    if ( (tempItem = [_currentMenu itemWithTag:2]) ) {
+        [tempItem setSubmenu:nil];
+    }
+    
+    if ( (tempItem = [_currentMenu itemWithTag:3]) ) {
+        [tempItem setSubmenu:nil];
+    }
+    
+    if ( (tempItem = [_currentMenu itemWithTag:4]) ) {
+        [tempItem setSubmenu:nil];
+    }
+    
     //create our menu
     while ( (nextObject = [enumerator nextObject]) ) {
         //Main menu items
@@ -50,6 +72,12 @@
             [tempItem setTag:MTMenuPlayPauseItem];
             [tempItem setTarget:self];
             
+            if ( (keyCombo = [[HotKeyCenter sharedCenter] keyComboForName:@"PlayPause"]) ) {
+                [self setKeyEquivalentForCode:[keyCombo keyCode]
+                        andModifiers:[keyCombo modifiers]
+                        onItem:tempItem];
+            }
+            
             switch ([currentRemote playerPlayingState]) {
                 case ITMTRemotePlayerPlaying:
                     [tempItem setTitle:@"Pause"];
@@ -65,6 +93,13 @@
             tempItem = [menu addItemWithTitle:@"Next Track"
                     action:@selector(performMainMenuAction:)
                     keyEquivalent:@""];
+            
+            if ( (keyCombo = [[HotKeyCenter sharedCenter] keyComboForName:@"NextTrack"]) ) {
+                [self setKeyEquivalentForCode:[keyCombo keyCode]
+                        andModifiers:[keyCombo modifiers]
+                        onItem:tempItem];
+            }
+            
             if (_currentPlaylist) {
                 [tempItem setTag:MTMenuNextTrackItem];
                 [tempItem setTarget:self];
@@ -73,6 +108,13 @@
             tempItem = [menu addItemWithTitle:@"Previous Track"
                     action:@selector(performMainMenuAction:)
                     keyEquivalent:@""];
+            
+            if ( (keyCombo = [[HotKeyCenter sharedCenter] keyComboForName:@"PrevTrack"]) ) {
+                [self setKeyEquivalentForCode:[keyCombo keyCode]
+                        andModifiers:[keyCombo modifiers]
+                        onItem:tempItem];
+            }
+            
             if (_currentPlaylist) {
                 [tempItem setTag:MTMenuPreviousTrackItem];
                 [tempItem setTarget:self];
@@ -113,9 +155,36 @@
                 [menu addItemWithTitle:@"Now Playing" action:NULL keyEquivalent:@""];
                 
                 if ([title length] > 0) {
-                    [menu addItemWithTitle:[NSString stringWithFormat:@"	 %@", title] action:nil keyEquivalent:@""];
+                    [menu addItemWithTitle:[NSString stringWithFormat:@"	 %@", title]
+                            action:nil
+                            keyEquivalent:@""];
+                }
+                
+                if ([defaults boolForKey:@"showAlbum"]) {
+                    [menu addItemWithTitle:[NSString stringWithFormat:@"	 %@", [currentRemote currentSongAlbum]]
+                            action:nil
+                            keyEquivalent:@""];
+                }
+                
+                if ([defaults boolForKey:@"showArtist"]) {
+                    [menu addItemWithTitle:[NSString stringWithFormat:@"	 %@", [currentRemote currentSongArtist]]
+                            action:nil
+                            keyEquivalent:@""];
+                }
+                
+                if ([defaults boolForKey:@"showTrackNumber"]) {
+                    [menu addItemWithTitle:[NSString stringWithFormat:@"	 Track %i", [currentRemote currentSongTrack]]
+                            action:nil
+                            keyEquivalent:@""];
+                }
+                
+                if ([defaults boolForKey:@"showTime"]) {
+                    int left = [[currentRemote currentSongRemaining] intValue];
+                    NSString *remaining = [NSString stringWithFormat:@"%i:%02i", left / 60, left % 60];
+                    [menu addItemWithTitle:[NSString stringWithFormat:@"	 %@/%@", remaining, [currentRemote currentSongLength]]
+                            action:nil
+                            keyEquivalent:@""];
                 }
-                //Gotta add artist, album, track, time, etc, blah, blah, blah...
             } else {
                 [menu addItemWithTitle:@"No Song" action:NULL keyEquivalent:@""];
             }
@@ -126,7 +195,15 @@
             tempItem = [menu addItemWithTitle:@"Song Rating"
                     action:nil
                     keyEquivalent:@""];
-            [tempItem setSubmenu:[self ratingMenu]];
+            [tempItem setSubmenu:_ratingMenu];
+            [tempItem setTag:1];
+            
+            itemEnum = [[_ratingMenu itemArray] objectEnumerator];
+            while ( (tempItem = [itemEnum nextObject]) ) {
+                [tempItem setState:NSOffState];
+            }
+            
+            [[_ratingMenu itemAtIndex:([currentRemote currentSongRating] * 5)] setState:NSOnState];
             if (_playingRadio || !_currentPlaylist) {
                 [tempItem setEnabled:NO];
             }
@@ -134,7 +211,8 @@
             tempItem = [menu addItemWithTitle:@"Upcoming Songs"
                     action:nil
                     keyEquivalent:@""];
-            [tempItem setSubmenu:[self upcomingSongsMenu]];
+            [tempItem setSubmenu:_upcomingSongsMenu];
+            [tempItem setTag:2];
             if (_playingRadio || !_currentPlaylist) {
                 [tempItem setEnabled:NO];
             }
@@ -142,15 +220,22 @@
             tempItem = [menu addItemWithTitle:@"Playlists"
                     action:nil
                     keyEquivalent:@""];
-            [tempItem setSubmenu:[self playlistsMenu]];
+            [tempItem setSubmenu:_playlistsMenu];
+            [tempItem setTag:3];
         } else if ([nextObject isEqualToString:@"EQ Presets"]) {
             tempItem = [menu addItemWithTitle:@"EQ Presets"
                     action:nil
                     keyEquivalent:@""];
-            [tempItem setSubmenu:[self eqMenu]];
+            [tempItem setSubmenu:_eqMenu];
+            [tempItem setTag:4];
+            
+            itemEnum = [[_eqMenu itemArray] objectEnumerator];
+            while ( (tempItem = [itemEnum nextObject]) ) {
+                [tempItem setState:NSOffState];
+            }
+            [[_eqMenu itemAtIndex:([currentRemote currentEQPresetIndex] - 1)] setState:NSOnState];
         }
     }
-    
     [_currentMenu release];
     _currentMenu = menu;
     return _currentMenu;
@@ -173,10 +258,26 @@
     return [menu autorelease];
 }
 
+- (void)rebuildSubmenus
+{
+    currentRemote = [[MainController sharedController] currentRemote];
+    _currentPlaylist = [currentRemote currentPlaylistIndex];
+    _currentTrack = [currentRemote currentSongIndex];
+    _playingRadio = ([currentRemote currentPlaylistClass] == ITMTRemotePlayerRadioPlaylist);
+    
+    [_ratingMenu release];
+    [_upcomingSongsMenu release];
+    [_playlistsMenu release];
+    [_eqMenu release];
+    _ratingMenu = [self ratingMenu];
+    _upcomingSongsMenu = [self upcomingSongsMenu];
+    _playlistsMenu = [self playlistsMenu];
+    _eqMenu = [self eqMenu];
+}
+
 - (NSMenu *)ratingMenu
 {
     NSMenu *ratingMenu = [[NSMenu alloc] initWithTitle:@""];
-    
     if (_currentPlaylist && !_playingRadio) {
         NSEnumerator *itemEnum;
         id  anItem;
@@ -190,8 +291,6 @@
         [ratingMenu addItemWithTitle:[NSString stringWithUTF8String:"★★★★☆"] action:nil keyEquivalent:@""];
         [ratingMenu addItemWithTitle:[NSString stringWithUTF8String:"★★★★★"] action:nil keyEquivalent:@""];
         
-        [[ratingMenu itemAtIndex:([currentRemote currentSongRating] * 5)] setState:NSOnState];
-        
         itemEnum = [[ratingMenu itemArray] objectEnumerator];
         while ( (anItem = [itemEnum nextObject]) ) {
             [anItem setAction:itemSelector];
@@ -200,8 +299,7 @@
             itemTag += 20;
         }
     }
-    
-    return [ratingMenu autorelease];
+    return ratingMenu;
 }
 
 - (NSMenu *)upcomingSongsMenu
@@ -227,7 +325,7 @@
             }
         }
     }
-    return [upcomingSongsMenu autorelease];
+    return upcomingSongsMenu;
 }
 
 - (NSMenu *)playlistsMenu
@@ -246,7 +344,7 @@
     if (!_playingRadio && _currentPlaylist) {
         [[playlistsMenu itemAtIndex:_currentPlaylist - 1] setState:NSOnState];
     }
-    return [playlistsMenu autorelease];
+    return playlistsMenu;
 }
 
 - (NSMenu *)eqMenu
@@ -264,8 +362,7 @@
             [tempItem setTarget:self];
 	}
     }
-    [[eqMenu itemAtIndex:([currentRemote currentEQPresetIndex] - 1)] setState:NSOnState];
-    return [eqMenu autorelease];
+    return eqMenu;
 }
 
 - (void)performMainMenuAction:(id)sender
@@ -275,17 +372,14 @@
         case MTMenuPlayPauseItem:
             NSLog(@"MenuController: Play/Pause");
             [[MainController sharedController] playPause];
-            //We're gonna have to change the Play menu item to Pause here too.
             break;
         case MTMenuFastForwardItem:
             NSLog(@"MenuController: Fast Forward");
             [[MainController sharedController] fastForward];
-            //make sure play/pause item says sane through this
             break;
         case MTMenuRewindItem:
             NSLog(@"MenuController: Rewind");
             [[MainController sharedController] rewind];
-            //make sure play/pause item says sane through this
             break;
         case MTMenuPreviousTrackItem:
             NSLog(@"MenuController: Previous Track");
@@ -545,4 +639,4 @@
     }
 }
 
-@end
+@end
\ No newline at end of file