Added a Refresh item to the playlists menu that refreshes the submenu.

[MenuTunes.git] / MenuController.m

diff --git a/MenuController.m b/MenuController.m
index 0190406..6f7cb03 100755 (executable)
--- a/MenuController.m
+++ b/MenuController.m
@@ -312,6 +312,9 @@
                 
                 if (!_playingRadio) {
                     NS_DURING
                 
                 if (!_playingRadio) {
                     NS_DURING

+                        if ([defaults boolForKey:@"showPlayCount"]) {
+                            [menu indentItem:[menu addItemWithTitle:[NSString stringWithFormat:@"Play Count: %i", [mtr currentSongPlayCount]] action:nil keyEquivalent:@""]];
+                        }

                         if ([defaults boolForKey:@"showTrackRating"] && ( [mtr currentSongRating] != -1.0 )) {
                             NSString *string = nil;
                             switch ((int)([mtr currentSongRating] * 5)) {
                         if ([defaults boolForKey:@"showTrackRating"] && ( [mtr currentSongRating] != -1.0 )) {
                             NSString *string = nil;
                             switch ((int)([mtr currentSongRating] * 5)) {


@@ -386,6 +389,8 @@
                 [tempItem setState:NSOffState];
             }
             NS_DURING
                 [tempItem setState:NSOffState];
             }
             NS_DURING

+                [[_eqMenu itemAtIndex:0] setState:[mtr equalizerEnabled] ? NSOnState : NSOffState];
+                [[_eqMenu itemAtIndex:([mtr currentEQPresetIndex] + 1)] setState:NSOnState];

                 [[_eqMenu itemAtIndex:([mtr currentEQPresetIndex] - 1)] setState:NSOnState];
             NS_HANDLER
                 [[MainController sharedController] networkError:localException];
                 [[_eqMenu itemAtIndex:([mtr currentEQPresetIndex] - 1)] setState:NSOnState];
             NS_HANDLER
                 [[MainController sharedController] networkError:localException];


@@ -676,6 +681,8 @@
         [[playlistsMenu itemAtIndex:_currentPlaylist - 1] setState:NSOnState];
     }
     [indices release];
         [[playlistsMenu itemAtIndex:_currentPlaylist - 1] setState:NSOnState];
     }
     [indices release];

+    [playlistsMenu addItem:[NSMenuItem separatorItem]];
+    [[playlistsMenu addItemWithTitle:@"Refresh" action:@selector(rebuildSubmenus) keyEquivalent:@""] setTarget:self];

     ITDebugLog(@"Done Building \"Playlists\" menu");
     return playlistsMenu;
 }
     ITDebugLog(@"Done Building \"Playlists\" menu");
     return playlistsMenu;
 }


@@ -695,6 +702,16 @@
     
     ITDebugLog(@"Building \"EQ Presets\" menu.");
     
     
     ITDebugLog(@"Building \"EQ Presets\" menu.");
     

+    tempItem = [eqMenu addItemWithTitle:@"Enabled" action:@selector(performEqualizerMenuAction:) keyEquivalent:@""];
+    [tempItem setTag:-1];
+    [tempItem setTarget:self];
+    NS_DURING
+        [tempItem setState:[[[MainController sharedController] currentRemote] equalizerEnabled] ? NSOnState : NSOffState];
+    NS_HANDLER
+        [[MainController sharedController] networkError:localException];
+    NS_ENDHANDLER
+    [eqMenu addItem:[NSMenuItem separatorItem]];
+    

     for (i = 0; i < [eqPresets count]; i++) {
         NSString *name;
           if ( ( name = [eqPresets objectAtIndex:i] ) ) {
     for (i = 0; i < [eqPresets count]; i++) {
         NSString *name;
           if ( ( name = [eqPresets objectAtIndex:i] ) ) {