banshee r3269 - in trunk/banshee: . src/Core/Banshee.ThickClient/Banshee.Gui src/Extensions/Banshee.Lastfm/Resources src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue

[abock svn gnome org]

Author: abock
Date: Tue Feb 19 00:45:56 2008
New Revision: 3269
URL: http://svn.gnome.org/viewvc/banshee?rev=3269&view=rev

Log:
2008-02-18  Aaron Bockover  <abock gnome org>

    * src/Extensions/Banshee.Lastfm/Resources/GlobalUI.xml: Hide the love/ban
    from the menu since it doesn't make sense yet

    * src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:
    * src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:
    Hide menu items that don't apply when the source is not library-based



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
   trunk/banshee/src/Extensions/Banshee.Lastfm/Resources/GlobalUI.xml
   trunk/banshee/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs	Tue Feb 19 00:45:56 2008
@@ -199,6 +199,7 @@
         {
             Hyena.Collections.Selection selection = TrackSelector.TrackSelectionProxy.Selection;
             Source source = ServiceManager.SourceManager.ActiveSource;
+            bool in_library = (source != null && source.Parent is LibrarySource) || source is LibrarySource;
 
             if (selection != null) {
                 bool has_selection = selection.Count > 0;
@@ -226,6 +227,10 @@
                     );
 
                     UpdateAction ("RemoveTracksFromLibraryAction", source.Parent is LibrarySource, has_selection, null);
+                    
+                    UpdateAction ("TrackPropertiesAction", in_library, has_selection, null);
+                    UpdateAction ("RateTracksAction", in_library, has_selection, null);
+                    UpdateAction ("AddToPlaylistAction", in_library, has_selection, null);
                 }
             }
         }

Modified: trunk/banshee/src/Extensions/Banshee.Lastfm/Resources/GlobalUI.xml
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Lastfm/Resources/GlobalUI.xml	(original)
+++ trunk/banshee/src/Extensions/Banshee.Lastfm/Resources/GlobalUI.xml	Tue Feb 19 00:45:56 2008
@@ -18,12 +18,12 @@
         <menuitem name="SourceProperties" action="SourcePropertiesAction" />
     </popup>
 
-    <popup name="TrackContextMenu" action="TrackContextMenuAction">
+    <!--<popup name="TrackContextMenu" action="TrackContextMenuAction">
         <placeholder name="BelowAddToPlaylist">
             <menuitem name="LastfmLove" action="LastfmLoveAction"/>
             <menuitem name="LastfmHate" action="LastfmHateAction"/>
         </placeholder>
-    </popup>
+    </popup>-->
     
     <toolbar name="HeaderToolbar">
         <placeholder name="SourceActions">

Modified: trunk/banshee/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs	Tue Feb 19 00:45:56 2008
@@ -36,13 +36,14 @@
 using Banshee.ServiceStack;
 using Banshee.Sources;
 using Banshee.Playlist;
+using Banshee.Library;
 using Banshee.Database;
 using Banshee.Collection;
 using Banshee.Collection.Database;
 using Banshee.PlaybackController;
 using Banshee.MediaEngine;
 using Banshee.Configuration;
-
+using Banshee.Library;
 using Banshee.Gui;
 
 namespace Banshee.PlayQueue
@@ -180,9 +181,11 @@
                 return;
             }
             
+            Source source = ServiceManager.SourceManager.ActiveSource;
+            bool in_library = (source != null && source.Parent is LibrarySource) || source is LibrarySource;
+            
             uia_service.GlobalActions.UpdateAction ("ClearPlayQueueAction", true, Count > 0);
-            uia_service.TrackActions.UpdateAction ("AddToPlayQueueAction", 
-                ServiceManager.SourceManager.ActiveSource != this, true);
+            uia_service.TrackActions.UpdateAction ("AddToPlayQueueAction", in_library, true);
         }
         
         void IBasicPlaybackController.First ()