git.ithinksw.org / MenuTunes.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 801e5ed..f0a6e85 100755 (executable)
--- a/MenuController.m
+++ b/MenuController.m
@@ -7,7 +7,7 @@
 //
 
 #import "MenuController.h"
 //
 
 #import "MenuController.h"
-#import "NewMainController.h"
+#import "MainController.h"
 #import "HotKeyCenter.h"
 #import "KeyCombo.h"
 
 #import "HotKeyCenter.h"
 #import "KeyCombo.h"
 
@@ -65,8 +65,8 @@
     //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];
                     action:@selector(performMainMenuAction:)
                     keyEquivalent:@""];
             [tempItem setTag:MTMenuPlayPauseItem];
@@ -80,17 +80,17 @@
             
             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:@""];
             
@@ -104,8 +104,8 @@
                 [tempItem setTag:MTMenuNextTrackItem];
                 [tempItem setTarget:self];
             }
                 [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:@""];
             
@@ -119,24 +119,28 @@
                 [tempItem setTag:MTMenuPreviousTrackItem];
                 [tempItem setTarget:self];
             }
                 [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:@"Show Player"]) {
-            tempItem = [menu addItemWithTitle:[NSString stringWithFormat:@"Show %@", [[[MainController sharedController] currentRemote] playerSimpleName]] action:@selector(performMainMenuAction:) keyEquivalent:@""];
+        } 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]
             
             if ( (keyCombo = [[HotKeyCenter sharedCenter] keyComboForName:@"ShowPlayer"]) ) {
                 [self setKeyEquivalentForCode:[keyCombo keyCode]
@@ -146,24 +150,24 @@
             
             [tempItem setTarget:self];
             [tempItem setTag:MTMenuShowPlayerItem];
             
             [tempItem setTarget:self];
             [tempItem setTag:MTMenuShowPlayerItem];
-        } else if ([nextObject isEqualToString:@"Preferences"]) {
-            tempItem = [menu addItemWithTitle:@"Preferences..."
+        } 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) {
                     [menu addItemWithTitle:[NSString stringWithFormat:@"        %@", title]
                 
                 if ([title length] > 0) {
                     [menu addItemWithTitle:[NSString stringWithFormat:@"        %@", title]
@@ -172,21 +176,27 @@
                 }
                 
                 if ([defaults boolForKey:@"showAlbum"]) {
                 }
                 
                 if ([defaults boolForKey:@"showAlbum"]) {
-                    [menu addItemWithTitle:[NSString stringWithFormat:@"        %@", [currentRemote currentSongAlbum]]
-                            action:nil
-                            keyEquivalent:@""];
+                    NSString *curAlbum = [currentRemote currentSongAlbum];
+                    if ([curAlbum length]) {
+                        [menu addItemWithTitle:[NSString stringWithFormat:@"    %@", curAlbum]
+                                action:nil
+                                keyEquivalent:@""];
+                    }
                 }
                 
                 if ([defaults boolForKey:@"showArtist"]) {
                 }
                 
                 if ([defaults boolForKey:@"showArtist"]) {
-                    [menu addItemWithTitle:[NSString stringWithFormat:@"        %@", [currentRemote currentSongArtist]]
-                            action:nil
-                            keyEquivalent:@""];
+                    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) {
                 }
                 
                 if ([defaults boolForKey:@"showTrackNumber"]) {
                     int track = [currentRemote currentSongTrack];
                     if (track) {
-                        [menu addItemWithTitle:[NSString stringWithFormat:@"    Track %i", track]
+                        [menu addItemWithTitle:[NSString stringWithFormat:@"    %@ %i", NSLocalizedString(@"track", @"Track"), track]
                             action:nil
                             keyEquivalent:@""];
                     }
                             action:nil
                             keyEquivalent:@""];
                     }
@@ -200,13 +210,13 @@
                             keyEquivalent:@""];
                 }
             } else {
                             keyEquivalent:@""];
                 }
             } 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];
@@ -221,8 +231,8 @@
             }
             
             [[_ratingMenu itemAtIndex:([currentRemote currentSongRating] * 5)] setState:NSOnState];
             }
             
             [[_ratingMenu itemAtIndex:([currentRemote currentSongRating] * 5)] setState:NSOnState];
-        } else if ([nextObject isEqualToString:@"Upcoming Songs"]) {
-            tempItem = [menu addItemWithTitle:@"Upcoming Songs"
+        } else if ([nextObject isEqualToString:@"upcomingSongs"]) {
+            tempItem = [menu addItemWithTitle:NSLocalizedString(@"upcomingSongs", @"Upcoming Songs")
                     action:nil
                     keyEquivalent:@""];
             [tempItem setSubmenu:_upcomingSongsMenu];
                     action:nil
                     keyEquivalent:@""];
             [tempItem setSubmenu:_upcomingSongsMenu];
@@ -230,14 +240,14 @@
             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];
                     action:nil
                     keyEquivalent:@""];
             [tempItem setSubmenu:_eqMenu];
@@ -259,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];
Menu-based iTunes controller.