Fixed removing queued songs, hooked File Tree icon up to correct method toggleWindow.

Playlist/PlaylistController.m

@@ -668,17 +668,21 @@
 
 - (IBAction)removeFromQueue:(id)sender
 {
+		
 	for (PlaylistEntry *queueItem in [self selectedObjects])
 	{
-		// temporary hack until Remove from Queue menu item gets validation.
-		if (queueItem.queuePosition < 0)
-			break;
-		
 		queueItem.status = kCogEntryNormal;
 		[queueItem setStatusMessage:nil];
-		[queueList removeObjectAtIndex:queueItem.queuePosition - 1];
+		[queueItem setQueuePosition:-1];
+		[queueList removeObject:queueItem];
+	}
+
+	int i = 1;
+	for (PlaylistEntry *cur in queueList)
+	{
+		[cur setQueuePosition:i++];
+		[cur setStatusMessage:[NSString stringWithFormat:@"Queued: %i", cur.queuePosition]];
 	}
-	
 }
 
 

Playlist/PlaylistView.m

@@ -195,6 +195,7 @@
             [artistMenuItem release];
             addedItems++;
         }
+
 		NSMenuItem *queueMenuItem = [NSMenuItem alloc];
 		NSString *title = [NSString
 						   stringWithFormat:@"Add to Queue (%d queued)", [[playlistController queueList] count]];
@@ -206,17 +207,19 @@
 		[queueMenuItem release];
 		addedItems++;
 		
-		NSMenuItem *queueRemoveMenuItem = [NSMenuItem alloc];
-		NSString *retitle = [NSString
-						   stringWithFormat:@"Remove from Queue"];
-		[queueRemoveMenuItem initWithTitle:retitle
-							  action:@selector(removeFromQueue:)
-					   keyEquivalent:@""];
-		queueRemoveMenuItem.target = playlistController;
-		[tableViewMenu insertItem:queueRemoveMenuItem atIndex:1];
-		[queueRemoveMenuItem release];
-		addedItems++;
-		
+		if (song.queuePosition > 0)
+		{
+			NSMenuItem *queueRemoveMenuItem = [NSMenuItem alloc];
+			NSString *retitle = [NSString
+								 stringWithFormat:@"Remove from Queue"];
+			[queueRemoveMenuItem initWithTitle:retitle
+										action:@selector(removeFromQueue:)
+								 keyEquivalent:@""];
+			queueRemoveMenuItem.target = playlistController;
+			[tableViewMenu insertItem:queueRemoveMenuItem atIndex:1];
+			[queueRemoveMenuItem release];
+			addedItems++;
+		}
 		
         if(addedItems)
         {