banshee r3633 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.Library src/Core/Banshee.Services/Banshee.Playlist src/Core/Banshee.Services/Banshee.Sources src/Core/Banshee.ThickClient/Banshee.Gui src/Extensions/Banshee.AudioCd/Banshee.AudioCd src/Extensions/Banshee.Daap/Banshee.Daap src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying

[gburt svn gnome org]

Author: gburt
Date: Tue Apr  1 01:52:14 2008
New Revision: 3633
URL: http://svn.gnome.org/viewvc/banshee?rev=3633&view=rev

Log:
2008-03-31  Gabriel Burt  <gabriel burt gmail com>

	* src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:
	* src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:
	* src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs:
	* src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:
	* src/Core/Banshee.Services/Banshee.Sources/Source.cs:
	* src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs:
	* src/Extensions/Banshee.Daap/Banshee.Daap/DaapContainerSource.cs:
	* src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs:
	* src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs:
	* src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs:
	* src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:
	Change the default for CanSearch and CanRename to false, and add a virtual
	Count implementation that returns 0.  Less cruft for many subclasses to
	implement.

	* src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs: Don't show
	the menu unless it has > 0 visible items.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/Source.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs
   trunk/banshee/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs
   trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap/DaapContainerSource.cs
   trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs
   trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs
   trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs
   trunk/banshee/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs	Tue Apr  1 01:52:14 2008
@@ -89,9 +89,5 @@
             
             ((IImportSource)source).Import ();
         }
-        
-        public override bool CanRename {
-            get { return false; }
-        }
     }
 }

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs	Tue Apr  1 01:52:14 2008
@@ -134,6 +134,14 @@
             Save ();
         }
 
+        public override bool CanRename {
+            get { return true; }
+        }
+
+        public override bool CanSearch {
+            get { return true; }
+        }
+
         public virtual void Save ()
         {
             if (dbid == null || dbid <= 0)

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/ErrorSource.cs	Tue Apr  1 01:52:14 2008
@@ -128,14 +128,6 @@
             get { return messages.Count; }
         }
         
-        public override bool CanSearch {
-            get { return false; }
-        }
-
-        public override bool CanRename {
-            get { return false; }
-        }
-
         public virtual bool CanUnmap {
             get { return true; }
         }

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs	Tue Apr  1 01:52:14 2008
@@ -147,6 +147,10 @@
             }
         }
 
+        public override bool CanSearch {
+            get { return true; }
+        }
+
         public override void SetParentSource (Source source)
         {
             if (source is PrimarySource) {

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/Source.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/Source.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/Source.cs	Tue Apr  1 01:52:14 2008
@@ -405,7 +405,7 @@
         protected abstract string TypeUniqueId { get; }
 
         public virtual bool CanRename {
-            get { return true; }
+            get { return false; }
         }
 
         public virtual bool HasProperties {
@@ -436,7 +436,7 @@
         }
         
         public virtual bool CanSearch {
-            get { return true; }
+            get { return false; }
         }
                 
         public virtual string FilterQuery {
@@ -466,7 +466,10 @@
             get { return true; }
         }
         
-        public abstract int Count { get; }
+        public virtual int Count {
+            get { return 0; }
+        }
+
         public virtual int FilteredCount { get { return Count; } }
 
         public virtual string GetStatusText ()

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs	Tue Apr  1 01:52:14 2008
@@ -209,7 +209,20 @@
 
             string path = ActionSource.Properties.GetString ("GtkActionPath") ?? "/SourceContextMenu";
             Gtk.Menu menu = action_service.UIManager.GetWidget (path) as Menu;
-            if (menu == null) {
+            if (menu == null || menu.Children.Length == 0) {
+                SourceView.ResetHighlight ();
+                UpdateActions ();
+                return;
+            }
+
+            int visible_children = 0;
+            foreach (Widget child in menu)
+                if (child.Visible)
+                    visible_children++;
+
+            if (visible_children == 0) {
+                SourceView.ResetHighlight ();
+                UpdateActions ();
                 return;
             }
 

Modified: trunk/banshee/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdSource.cs	Tue Apr  1 01:52:14 2008
@@ -136,15 +136,6 @@
 
 #region Source Overrides
 
-        public override void Rename (string newName)
-        {
-            base.Rename (newName);
-        }
-
-        public override bool CanSearch {
-            get { return false; }
-        }
-        
         protected override string TypeUniqueId {
             get { return "audio-cd"; }
         }
@@ -153,10 +144,6 @@
             get { return disc_model.Count; }
         }
         
-        public override bool CanRename {
-            get { return false; }
-        }
-
 #endregion
         
 #region ITrackModelSource Implementation

Modified: trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap/DaapContainerSource.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap/DaapContainerSource.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap/DaapContainerSource.cs	Tue Apr  1 01:52:14 2008
@@ -43,10 +43,6 @@
             Properties.SetString ("Icon.Name", "applications-internet");
         }
         
-        public override bool CanRename {
-            get { return false; }
-        }
-        
         public override bool? AutoExpand {
             get { return true; }
         }
@@ -55,10 +51,6 @@
             get { return false; }
         }
         
-        public override int Count {
-            get { return 0; }
-        }
-        
         /*private int count;
         public override int Count {
             get { return count; }

Modified: trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.Daap/Banshee.Daap/DaapSource.cs	Tue Apr  1 01:52:14 2008
@@ -210,10 +210,6 @@
             Console.WriteLine ("Added: {0}", args.Track);
         }
         
-        public override bool CanRename {
-            get { return false; }
-        }
-        
         public override bool CanRemoveTracks {
             get { return false; }
         }

Modified: trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/LastfmSource.cs	Tue Apr  1 01:52:14 2008
@@ -253,14 +253,6 @@
             }
         }
 
-        public override bool CanSearch {
-            get { return false; }
-        }
-
-        public override int Count {
-             get { return 0; }
-        }
-        
         public override bool? AutoExpand {
             get { return ExpandedSchema.Get (); }
         }

Modified: trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Radio/StationSource.cs	Tue Apr  1 01:52:14 2008
@@ -402,6 +402,11 @@
             );
         }
 
+        public override bool CanRename {
+            get { return true; }
+        }
+
+
 #region ITrackModelSource Implementation
 
         public TrackListModel TrackModel {
@@ -478,14 +483,6 @@
             Save ();
         }
         
-        public override bool CanSearch {
-            get { return false; }
-        }
-
-        public override int Count {
-            get { return 0; }
-        }
-
         public override bool HasProperties {
             get { return true; }
         }

Modified: trunk/banshee/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs	Tue Apr  1 01:52:14 2008
@@ -80,22 +80,5 @@
         public void Dispose ()
         {
         }
-        
-#region Source Overrides
-
-        public override int Count {
-            get { return 0; }
-        }
-
-        public override bool CanRename {
-            get { return false; }
-        }
-
-        public override bool CanSearch {
-            get { return false; }
-        }
-
-#endregion
-
     }
 }