From: Kent Sutherland <ksuther@ithinksw.com>
Date: Tue, 18 Nov 2003 00:55:18 +0000 (+0000)
Subject: Added the "No upcoming songs." if it's the end of the playlist or if
X-Git-Tag: v1.2~35
X-Git-Url: http://git.ithinksw.org/MenuTunes.git/commitdiff_plain/a1367a46347952261b0e04a09dc061695a6511d0

Added the "No upcoming songs." if it's the end of the playlist or if
there are none left to the submenu and to the upcoming songs status window.
---

diff --git a/MainController.m b/MainController.m
index 5637bae..1c7905b 100755
--- a/MainController.m
+++ b/MainController.m
@@ -741,7 +741,6 @@ static MainController *sharedController;
 - (void)showUpcomingSongs
 {
     int numSongs;
-    
     NS_DURING
         numSongs = [[self currentRemote] numberOfSongsInPlaylistAtIndex:[[self currentRemote] currentPlaylistIndex]];
     NS_HANDLER
@@ -751,8 +750,8 @@ static MainController *sharedController;
     ITDebugLog(@"Showing upcoming songs status window.");
     NS_DURING
         if (numSongs > 0) {
-            NSMutableArray *songList = [NSMutableArray arrayWithCapacity:5];
             int numSongsInAdvance = [df integerForKey:@"SongsInAdvance"];
+            NSMutableArray *songList = [NSMutableArray arrayWithCapacity:numSongsInAdvance];
             int curTrack = [[self currentRemote] currentSongIndex];
             int i;
     
@@ -762,6 +761,10 @@ static MainController *sharedController;
                 }
             }
             
+            if ([songList count] == 0) {
+                [songList addObject:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.")];
+            }
+            
             [statusWindowController showUpcomingSongsWindowWithTitles:songList];
         } else {
             [statusWindowController showUpcomingSongsWindowWithTitles:[NSArray arrayWithObject:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.")]];
diff --git a/MenuController.m b/MenuController.m
index 4898c09..088d337 100755
--- a/MenuController.m
+++ b/MenuController.m
@@ -518,6 +518,10 @@
                 }
             }
         }
+        
+        if ([upcomingSongsMenu numberOfItems] == 0) {
+            [upcomingSongsMenu addItemWithTitle:NSLocalizedString(@"noUpcomingSongs", @"No upcoming songs.") action:NULL keyEquivalent:@""];
+        }
     }
     ITDebugLog(@"Done Building \"Upcoming Songs\" menu.");
     return upcomingSongsMenu;