X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/6b9ab466464daf5ae2427e67d20c368583bb0568..bad9de5ef29bebf5a0d07e8960b2a70a983bf86b:/MenuController.m

diff --git a/MenuController.m b/MenuController.m
index 2212b16..8077d29 100755
--- a/MenuController.m
+++ b/MenuController.m
@@ -7,23 +7,64 @@
 //
 
 #import "MenuController.h"
-
+#import "NewMainController.h"
+#import "ITMTRemote.h"
 
 @implementation MenuController
 
 - (id)init
 {
     if ( (self = [super init]) ) {
-        _menuLayout = [[NSMutableArray alloc] initWithCapacity:
+        _menuLayout = [[NSMutableArray alloc] initWithCapacity:0];
     }
     return self;
 }
 
 - (NSMenu *)menu
 {
+    NSMenu *menu = [[NSMenu alloc] initWithTitle:@""];
+    NSArray *menuArray = [[NSUserDefaults standardUserDefaults] arrayForKey:@"menu"];
+    NSEnumerator *enumerator = [menuArray objectEnumerator];
+    NSString *nextObject;
+    ITMTRemote *currentRemote = [[MainController sharedController] currentRemote];
+    NSMenuItem *tempItem;
+    
+    //Get the current playlist, track index, etc.
+    int playlistIndex = [currentRemote currentPlaylistIndex];
+    int trackIndex = [currentRemote currentSongIndex];
+    
     // dynamically create menu from supplied data and layout information.
-    // ...
-    // right before returning the menu, set the created menu to instance variable _currentMenu.
+    while ( (nextObject = [enumerator nextObject]) ) {
+        if ([nextObject isEqualToString:@"Play/Pause"]) {
+            if ([currentRemote playerPlayingState] == ITMTRemotePlayerPlaying) {
+                tempItem = [menu addItemWithTitle:@"Pause"
+                        action:@selector(performMainMenuAction:)
+                        keyEquivalent:@""];
+                [tempItem setTag:MTMenuPlayPauseItem];
+                [tempItem setTarget:self];
+            } else {
+                tempItem = [menu addItemWithTitle:@"Play"
+                        action:@selector(performMainMenuAction:)
+                        keyEquivalent:@""];
+                [tempItem setTag:MTMenuPlayPauseItem];
+                [tempItem setTarget:self];
+            }
+        }
+        
+        if ([nextObject isEqualToString:@"Current Track Info"]) {
+            NSString *title = [currentRemote currentSongTitle];
+            [menu addItemWithTitle:@"Now Playing" action:NULL keyEquivalent:@""];
+            
+            if ([title length] > 0) {
+                [menu addItemWithTitle:[NSString stringWithFormat:@"	 %@", title] action:nil keyEquivalent:@""];
+            }
+        }
+        //Do cool stuff here woo hehe gack yay! 0_o
+    }
+    
+    [_currentMenu release];
+    _currentMenu = menu;
+    return _currentMenu;
 }
 
 - (void)performMainMenuAction:(id)sender
@@ -32,24 +73,34 @@
     {
         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");
+            [[MainController sharedController] prevSong];
             break;
         case MTMenuNextTrackItem:
             NSLog(@"MenuController: Next Track");
+            [[MainController sharedController] nextSong];
             break;
         case MTMenuPreferencesItem:
             NSLog(@"MenuController: Preferences...");
+            [[MainController sharedController] showPreferences];
             break;
         case MTMenuQuitItem:
             NSLog(@"MenuController: Quit");
+            [[MainController sharedController] quitMenuTunes];
             break;
         default:
             NSLog(@"MenuController: Unimplemented Menu Item OR Child-bearing Menu Item");
@@ -57,20 +108,24 @@
     }
 }
 
-- (void)performRatingMenuAction
+- (void)performRatingMenuAction:(id)sender
 {
+    [[MainController sharedController] selectSongRating:[sender tag]];
 }
 
-- (void)performPlaylistMenuAction
+- (void)performPlaylistMenuAction:(id)sender
 {
+    [[MainController sharedController] selectPlaylistAtIndex:[sender tag]];
 }
 
-- (void)performEqualizerMenuAction
+- (void)performEqualizerMenuAction:(id)sender
 {
+    [[MainController sharedController] selectEQPresetAtIndex:[sender tag]];
 }
 
-- (void)performUpcomingSongsMenuAction
+- (void)performUpcomingSongsMenuAction:(id)sender
 {
+    [[MainController sharedController] selectSongAtIndex:[sender tag]];
 }
 
 - (void)updateMenu
@@ -81,6 +136,7 @@
 
 - (BOOL)validateMenuItem:(id <NSMenuItem>)menuItem
 {
+    return YES;
 }
 
 - (NSString *)systemUIColor
@@ -89,7 +145,7 @@
     NSNumber *tmpNumber;
     if ( (tmpDict = [NSDictionary dictionaryWithContentsOfFile:[@"~/Library/Preferences/.GlobalPreferences.plist" stringByExpandingTildeInPath]]) ) {
         if ( (tmpNumber = [tmpDict objectForKey:@"AppleAquaColorVariant"]) ) {
-            if ( ([tmpNumber intValue == 1) ) {
+            if ( ([tmpNumber intValue] == 1) ) {
                 return @"Aqua";
             } else {
                 return @"Graphite";