Reverting ITMTRemote to 1.24, which is prior to the API change :)

[MenuTunes.git] / MenuController.m

diff --git a/MenuController.m b/MenuController.m
index b1ed0db..f0a6e85 100755 (executable)
--- a/MenuController.m
+++ b/MenuController.m
@@ -7,13 +7,17 @@
 //
 
 #import "MenuController.h"
 //
 
 #import "MenuController.h"

-#import "NewMainController.h"
+#import "MainController.h"
+#import "HotKeyCenter.h"
+#import "KeyCombo.h"

 
 @interface MenuController (SubmenuMethods)
 - (NSMenu *)ratingMenu;
 - (NSMenu *)upcomingSongsMenu;
 - (NSMenu *)playlistsMenu;
 - (NSMenu *)eqMenu;
 
 @interface MenuController (SubmenuMethods)
 - (NSMenu *)ratingMenu;
 - (NSMenu *)upcomingSongsMenu;
 - (NSMenu *)playlistsMenu;
 - (NSMenu *)eqMenu;

+- (void)setKeyEquivalentForCode:(short)code andModifiers:(long)modifiers
+        onItem:(NSMenuItem *)item;

 @end
 
 @implementation MenuController
 @end
 
 @implementation MenuController


@@ -29,10 +33,13 @@
 - (NSMenu *)menu
 {
     NSMenu *menu = [[NSMenu alloc] initWithTitle:@""];
 - (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 *enumerator = [menuArray objectEnumerator];
     NSString *nextObject;
     NSMenuItem *tempItem;

+    NSEnumerator *itemEnum;
+    KeyCombo *keyCombo;

     
     //Get the information
     _currentPlaylist = [currentRemote currentPlaylistIndex];
     
     //Get the information
     _currentPlaylist = [currentRemote currentPlaylistIndex];


@@ -58,87 +65,158 @@
     //create our menu
     while ( (nextObject = [enumerator nextObject]) ) {
         //Main menu items
     //create our menu
     while ( (nextObject = [enumerator nextObject]) ) {
         //Main menu items

-        if ([nextObject isEqualToString:@"Play/Pause"]) {
-            tempItem = [menu addItemWithTitle:@"Play"
+        if ([nextObject isEqualToString:@"playPause"]) {
+            tempItem = [menu addItemWithTitle:NSLocalizedString(@"play", @"Play")

                     action:@selector(performMainMenuAction:)
                     keyEquivalent:@""];
             [tempItem setTag:MTMenuPlayPauseItem];
             [tempItem setTarget:self];
             
                     action:@selector(performMainMenuAction:)
                     keyEquivalent:@""];
             [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:
             switch ([currentRemote playerPlayingState]) {
                 case ITMTRemotePlayerPlaying:

-                    [tempItem setTitle:@"Pause"];
+                    [tempItem setTitle:NSLocalizedString(@"pause", @"Pause")];

                 break;
                 case ITMTRemotePlayerRewinding:
                 case ITMTRemotePlayerForwarding:
                 break;
                 case ITMTRemotePlayerRewinding:
                 case ITMTRemotePlayerForwarding:

-                    [tempItem setTitle:@"Resume"];
+                    [tempItem setTitle:NSLocalizedString(@"resume", @"Resume")];

                 break;
                 default:
                 break;
             }
                 break;
                 default:
                 break;
             }

-        } else if ([nextObject isEqualToString:@"Next Track"]) {
-            tempItem = [menu addItemWithTitle:@"Next Track"
+        } else if ([nextObject isEqualToString:@"nextTrack"]) {
+            tempItem = [menu addItemWithTitle:NSLocalizedString(@"nextTrack", @"Next Track")

                     action:@selector(performMainMenuAction:)
                     keyEquivalent:@""];
                     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];
             }
             if (_currentPlaylist) {
                 [tempItem setTag:MTMenuNextTrackItem];
                 [tempItem setTarget:self];
             }

-        } else if ([nextObject isEqualToString:@"Previous Track"]) {
-            tempItem = [menu addItemWithTitle:@"Previous Track"
+        } else if ([nextObject isEqualToString:@"prevTrack"]) {
+            tempItem = [menu addItemWithTitle:NSLocalizedString(@"prevTrack", @"Previous Track")

                     action:@selector(performMainMenuAction:)
                     keyEquivalent:@""];
                     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];
             }
             if (_currentPlaylist) {
                 [tempItem setTag:MTMenuPreviousTrackItem];
                 [tempItem setTarget:self];
             }

-        } else if ([nextObject isEqualToString:@"Fast Forward"]) {
-            tempItem = [menu addItemWithTitle:@"Fast Forward"
+        } else if ([nextObject isEqualToString:@"fastForward"]) {
+            tempItem = [menu addItemWithTitle:NSLocalizedString(@"fastForward", @"Fast Forward")

                     action:@selector(performMainMenuAction:)
                     keyEquivalent:@""];
             if (_currentPlaylist) {
                 [tempItem setTag:MTMenuFastForwardItem];
                 [tempItem setTarget:self];
             }
                     action:@selector(performMainMenuAction:)
                     keyEquivalent:@""];
             if (_currentPlaylist) {
                 [tempItem setTag:MTMenuFastForwardItem];
                 [tempItem setTarget:self];
             }

-        } else if ([nextObject isEqualToString:@"Rewind"]) {
-            tempItem = [menu addItemWithTitle:@"Rewind"
+        } else if ([nextObject isEqualToString:@"rewind"]) {
+            tempItem = [menu addItemWithTitle:NSLocalizedString(@"rewind", @"Rewind")

                     action:@selector(performMainMenuAction:)
                     keyEquivalent:@""];
             if (_currentPlaylist) {
                 [tempItem setTag:MTMenuRewindItem];
                 [tempItem setTarget:self];
             }
                     action:@selector(performMainMenuAction:)
                     keyEquivalent:@""];
             if (_currentPlaylist) {
                 [tempItem setTag:MTMenuRewindItem];
                 [tempItem setTarget:self];
             }

-        } else if ([nextObject isEqualToString:@"Preferences"]) {
-            tempItem = [menu addItemWithTitle:@"Preferences..."
+        } else if ([nextObject isEqualToString:@"showPlayer"]) {
+            tempItem = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@",
+                            NSLocalizedString(@"show", @"Show"),
+                            [[[MainController sharedController] currentRemote] playerSimpleName]]
+                    action:@selector(performMainMenuAction:)
+                    keyEquivalent:@""];
+            
+            if ( (keyCombo = [[HotKeyCenter sharedCenter] keyComboForName:@"ShowPlayer"]) ) {
+                [self setKeyEquivalentForCode:[keyCombo keyCode]
+                        andModifiers:[keyCombo modifiers]
+                        onItem:tempItem];
+            }
+            
+            [tempItem setTarget:self];
+            [tempItem setTag:MTMenuShowPlayerItem];
+        } else if ([nextObject isEqualToString:@"preferences"]) {
+            tempItem = [menu addItemWithTitle:NSLocalizedString(@"preferences", @"Preferences...")

                     action:@selector(performMainMenuAction:)
                     keyEquivalent:@""];
             [tempItem setTag:MTMenuPreferencesItem];
             [tempItem setTarget:self];
                     action:@selector(performMainMenuAction:)
                     keyEquivalent:@""];
             [tempItem setTag:MTMenuPreferencesItem];
             [tempItem setTarget:self];

-        } else if ([nextObject isEqualToString:@"Quit"]) {
-            tempItem = [menu addItemWithTitle:@"Quit"
+        } else if ([nextObject isEqualToString:@"quit"]) {
+            tempItem = [menu addItemWithTitle:NSLocalizedString(@"quit", @"Quit")

                     action:@selector(performMainMenuAction:)
                     keyEquivalent:@""];
             [tempItem setTag:MTMenuQuitItem];
             [tempItem setTarget:self];
                     action:@selector(performMainMenuAction:)
                     keyEquivalent:@""];
             [tempItem setTag:MTMenuQuitItem];
             [tempItem setTarget:self];

-        } else if ([nextObject isEqualToString:@"Current Track Info"]) {
+        } else if ([nextObject isEqualToString:@"trackInfo"]) {

             //Handle playing radio too
             if (_currentPlaylist) {
                 NSString *title = [currentRemote currentSongTitle];
                 
             //Handle playing radio too
             if (_currentPlaylist) {
                 NSString *title = [currentRemote currentSongTitle];
                 

-                [menu addItemWithTitle:@"Now Playing" action:NULL keyEquivalent:@""];
+                [menu addItemWithTitle:NSLocalizedString(@"nowPlaying", @"Now Playing") action:NULL keyEquivalent:@""];

                 
                 if ([title length] > 0) {
                 
                 if ([title length] > 0) {

-                    [menu addItemWithTitle:[NSString stringWithFormat:@"        %@", title] action:nil keyEquivalent:@""];
+                    [menu addItemWithTitle:[NSString stringWithFormat:@"        %@", title]
+                            action:nil
+                            keyEquivalent:@""];
+                }
+                
+                if ([defaults boolForKey:@"showAlbum"]) {
+                    NSString *curAlbum = [currentRemote currentSongAlbum];
+                    if ([curAlbum length]) {
+                        [menu addItemWithTitle:[NSString stringWithFormat:@"    %@", curAlbum]
+                                action:nil
+                                keyEquivalent:@""];
+                    }
+                }
+                
+                if ([defaults boolForKey:@"showArtist"]) {
+                    NSString *curArtist = [currentRemote currentSongArtist];
+                    if ([curArtist length]) {
+                        [menu addItemWithTitle:[NSString stringWithFormat:@"    %@", curArtist]
+                                action:nil
+                                keyEquivalent:@""];
+                    }
+                }
+                
+                if ([defaults boolForKey:@"showTrackNumber"]) {
+                    int track = [currentRemote currentSongTrack];
+                    if (track) {
+                        [menu addItemWithTitle:[NSString stringWithFormat:@"    %@ %i", NSLocalizedString(@"track", @"Track"), track]
+                            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 {
             } else {

-                [menu addItemWithTitle:@"No Song" action:NULL keyEquivalent:@""];
+                [menu addItemWithTitle:NSLocalizedString(@"noSong", @"No Song") action:NULL keyEquivalent:@""];

             }
             }

-        } else if ([nextObject isEqualToString:@"<separator>"]) {
+        } else if ([nextObject isEqualToString:@"separator"]) {

             [menu addItem:[NSMenuItem separatorItem]];
         //Submenu items
             [menu addItem:[NSMenuItem separatorItem]];
         //Submenu items

-        } else if ([nextObject isEqualToString:@"Song Rating"]) {
-            tempItem = [menu addItemWithTitle:@"Song Rating"
+        } else if ([nextObject isEqualToString:@"songRating"]) {
+            tempItem = [menu addItemWithTitle:NSLocalizedString(@"songRating", @"Song Rating")

                     action:nil
                     keyEquivalent:@""];
             [tempItem setSubmenu:_ratingMenu];
                     action:nil
                     keyEquivalent:@""];
             [tempItem setSubmenu:_ratingMenu];


@@ -146,8 +224,15 @@
             if (_playingRadio || !_currentPlaylist) {
                 [tempItem setEnabled:NO];
             }
             if (_playingRadio || !_currentPlaylist) {
                 [tempItem setEnabled:NO];
             }

-        } else if ([nextObject isEqualToString:@"Upcoming Songs"]) {
-            tempItem = [menu addItemWithTitle:@"Upcoming Songs"
+            
+            itemEnum = [[_ratingMenu itemArray] objectEnumerator];
+            while ( (tempItem = [itemEnum nextObject]) ) {
+                [tempItem setState:NSOffState];
+            }
+            
+            [[_ratingMenu itemAtIndex:([currentRemote currentSongRating] * 5)] setState:NSOnState];
+        } else if ([nextObject isEqualToString:@"upcomingSongs"]) {
+            tempItem = [menu addItemWithTitle:NSLocalizedString(@"upcomingSongs", @"Upcoming Songs")

                     action:nil
                     keyEquivalent:@""];
             [tempItem setSubmenu:_upcomingSongsMenu];
                     action:nil
                     keyEquivalent:@""];
             [tempItem setSubmenu:_upcomingSongsMenu];


@@ -155,18 +240,24 @@
             if (_playingRadio || !_currentPlaylist) {
                 [tempItem setEnabled:NO];
             }
             if (_playingRadio || !_currentPlaylist) {
                 [tempItem setEnabled:NO];
             }

-        } else if ([nextObject isEqualToString:@"Playlists"]) {
-            tempItem = [menu addItemWithTitle:@"Playlists"
+        } else if ([nextObject isEqualToString:@"playlists"]) {
+            tempItem = [menu addItemWithTitle:NSLocalizedString(@"playlists", @"Playlists")

                     action:nil
                     keyEquivalent:@""];
             [tempItem setSubmenu:_playlistsMenu];
             [tempItem setTag:3];
                     action:nil
                     keyEquivalent:@""];
             [tempItem setSubmenu:_playlistsMenu];
             [tempItem setTag:3];

-        } else if ([nextObject isEqualToString:@"EQ Presets"]) {
-            tempItem = [menu addItemWithTitle:@"EQ Presets"
+        } else if ([nextObject isEqualToString:@"eqPresets"]) {
+            tempItem = [menu addItemWithTitle:NSLocalizedString(@"eqPresets", @"EQ Presets")

                     action:nil
                     keyEquivalent:@""];
             [tempItem setSubmenu:_eqMenu];
             [tempItem setTag:4];
                     action:nil
                     keyEquivalent:@""];
             [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 release];


@@ -178,14 +269,14 @@
 {
     NSMenu *menu = [[NSMenu alloc] initWithTitle:@""];
     NSMenuItem *tempItem;
 {
     NSMenu *menu = [[NSMenu alloc] initWithTitle:@""];
     NSMenuItem *tempItem;

-    tempItem = [menu addItemWithTitle:[NSString stringWithFormat:@"Open %@", [[[MainController sharedController] currentRemote] playerSimpleName]] action:@selector(performMainMenuAction:) keyEquivalent:@""];
+    tempItem = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"open", @"Open"), [[[MainController sharedController] currentRemote] playerSimpleName]] action:@selector(performMainMenuAction:) keyEquivalent:@""];

     [tempItem setTag:MTMenuShowPlayerItem];
     [tempItem setTarget:self];
     [menu addItem:[NSMenuItem separatorItem]];
     [tempItem setTag:MTMenuShowPlayerItem];
     [tempItem setTarget:self];
     [menu addItem:[NSMenuItem separatorItem]];

-    tempItem = [menu addItemWithTitle:@"Preferences" action:@selector(performMainMenuAction:) keyEquivalent:@""];
+    tempItem = [menu addItemWithTitle:NSLocalizedString(@"preferences", @"Preferences...") action:@selector(performMainMenuAction:) keyEquivalent:@""];

     [tempItem setTag:MTMenuPreferencesItem];
     [tempItem setTarget:self];
     [tempItem setTag:MTMenuPreferencesItem];
     [tempItem setTarget:self];

-    tempItem = [menu addItemWithTitle:@"Quit" action:@selector(performMainMenuAction:) keyEquivalent:@""];
+    tempItem = [menu addItemWithTitle:NSLocalizedString(@"quit", @"Quit") action:@selector(performMainMenuAction:) keyEquivalent:@""];

     [tempItem setTag:MTMenuQuitItem];
     [tempItem setTarget:self];
     return [menu autorelease];
     [tempItem setTag:MTMenuQuitItem];
     [tempItem setTarget:self];
     return [menu autorelease];


@@ -211,28 +302,24 @@
 - (NSMenu *)ratingMenu
 {
     NSMenu *ratingMenu = [[NSMenu alloc] initWithTitle:@""];
 - (NSMenu *)ratingMenu
 {
     NSMenu *ratingMenu = [[NSMenu alloc] initWithTitle:@""];

-    if (_currentPlaylist && !_playingRadio) {
-        NSEnumerator *itemEnum;
-        id  anItem;
-        int itemTag = 0;
-        SEL itemSelector = @selector(performRatingMenuAction:);
-        
-        [ratingMenu addItemWithTitle:[NSString stringWithUTF8String:"☆☆☆☆☆"] action:nil keyEquivalent:@""];
-        [ratingMenu addItemWithTitle:[NSString stringWithUTF8String:"★☆☆☆☆"] action:nil keyEquivalent:@""];
-        [ratingMenu addItemWithTitle:[NSString stringWithUTF8String:"★★☆☆☆"] action:nil keyEquivalent:@""];
-        [ratingMenu addItemWithTitle:[NSString stringWithUTF8String:"★★★☆☆"] action:nil keyEquivalent:@""];
-        [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];
-            [anItem setTarget:self];
-            [anItem setTag:itemTag];
-            itemTag += 20;
-        }
+    NSEnumerator *itemEnum;
+    id  anItem;
+    int itemTag = 0;
+    SEL itemSelector = @selector(performRatingMenuAction:);
+    
+    [ratingMenu addItemWithTitle:[NSString stringWithUTF8String:"☆☆☆☆☆"] action:nil keyEquivalent:@""];
+    [ratingMenu addItemWithTitle:[NSString stringWithUTF8String:"★☆☆☆☆"] action:nil keyEquivalent:@""];
+    [ratingMenu addItemWithTitle:[NSString stringWithUTF8String:"★★☆☆☆"] action:nil keyEquivalent:@""];
+    [ratingMenu addItemWithTitle:[NSString stringWithUTF8String:"★★★☆☆"] action:nil keyEquivalent:@""];
+    [ratingMenu addItemWithTitle:[NSString stringWithUTF8String:"★★★★☆"] action:nil keyEquivalent:@""];
+    [ratingMenu addItemWithTitle:[NSString stringWithUTF8String:"★★★★★"] action:nil keyEquivalent:@""];
+    
+    itemEnum = [[ratingMenu itemArray] objectEnumerator];
+    while ( (anItem = [itemEnum nextObject]) ) {
+        [anItem setAction:itemSelector];
+        [anItem setTarget:self];
+        [anItem setTag:itemTag];
+        itemTag += 20;

     }
     return ratingMenu;
 }
     }
     return ratingMenu;
 }


@@ -297,7 +384,6 @@
             [tempItem setTarget:self];
        }
     }
             [tempItem setTarget:self];
        }
     }

-    [[eqMenu itemAtIndex:([currentRemote currentEQPresetIndex] - 1)] setState:NSOnState];

     return eqMenu;
 }
 
     return eqMenu;
 }
 


@@ -308,17 +394,14 @@
         case MTMenuPlayPauseItem:
             NSLog(@"MenuController: Play/Pause");
             [[MainController sharedController] playPause];
         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];
             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];
             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");
             break;
         case MTMenuPreviousTrackItem:
             NSLog(@"MenuController: Previous Track");