banshee r3338 - in trunk/banshee: . src/Core/Banshee.ThickClient/Banshee.Gui src/Core/Banshee.ThickClient/Resources

[gburt svn gnome org]

Author: gburt
Date: Wed Feb 27 21:07:23 2008
New Revision: 3338
URL: http://svn.gnome.org/viewvc/banshee?rev=3338&view=rev

Log:
2008-02-27  Gabriel Burt  <gabriel burt gmail com>

	* src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs: Add and
	comment out an implementation for 'New Smart Playlist From Search'.  It
	works, but the smart playlist Editor needs to be changed to accept
	conditions with no field (eg implying search-all-default-fields).

	* src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml:
	Comment out 'New Smart Playlist From Search' item.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml

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	Wed Feb 27 21:07:23 2008
@@ -31,16 +31,19 @@
 using Gtk;
 
 using Hyena;
+using Hyena.Query;
 
 using Banshee.Base;
 using Banshee.Collection;
 using Banshee.Configuration;
 using Banshee.ServiceStack;
 using Banshee.Sources;
+using Banshee.Library;
 using Banshee.Playlist;
 using Banshee.Playlist.Gui;
 using Banshee.Playlists.Formats;
 using Banshee.SmartPlaylist;
+using Banshee.Query;
 using Banshee.Gui.Dialogs;
 
 namespace Banshee.Gui
@@ -72,9 +75,9 @@
                     Catalog.GetString ("New _Smart Playlist"), null,
                     Catalog.GetString ("Create a new smart playlist"), OnNewSmartPlaylist),
 
-                new ActionEntry ("NewSmartPlaylistFromSearchAction", null,
+                /*new ActionEntry ("NewSmartPlaylistFromSearchAction", null,
                     Catalog.GetString ("New _Smart Playlist _From Search"), null,
-                    Catalog.GetString ("Create a new smart playlist from the current search"), OnNewSmartPlaylistFromSearch),
+                    Catalog.GetString ("Create a new smart playlist from the current search"), OnNewSmartPlaylistFromSearch),*/
 
                 new ActionEntry ("SourceContextMenuAction", null, 
                     String.Empty, null, null, OnSourceContextMenu),
@@ -154,25 +157,46 @@
             playlist.Save ();
             ServiceManager.SourceManager.DefaultSource.AddChildSource (playlist);
             playlist.NotifyUpdated ();
+            //SourceView.BeginRenameSource (playlist);
         }
 
         private void OnNewSmartPlaylist (object o, EventArgs args)
         {
             Editor ed = new Editor ();
             ed.RunDialog ();
-            //playlist.NotifyUpdated ();
         }
 
-        private void OnNewSmartPlaylistFromSearch (object o, EventArgs args)
+        /*private void OnNewSmartPlaylistFromSearch (object o, EventArgs args)
         {
-            // TODO create playlist and save it
-            
-            //playlist.NotifyUpdated ();
+            Source active_source = ServiceManager.SourceManager.ActiveSource;
+            QueryNode node = UserQueryParser.Parse (active_source.FilterQuery, BansheeQuery.FieldSet);
+
+            if (node == null) {
+                return;
+            }
+
+            // If the active source is a playlist or smart playlist, add that as a condition to the query
+            QueryListNode list_node = null;
+            if (active_source is PlaylistSource) {
+                list_node = new QueryListNode (Keyword.And);
+                list_node.AddChild (QueryTermNode.ParseUserQuery (BansheeQuery.FieldSet, String.Format ("playlistid:{0}", (active_source as PlaylistSource).DbId)));
+                list_node.AddChild (node);
+            } else if (active_source is SmartPlaylistSource) {
+                list_node = new QueryListNode (Keyword.And);
+                list_node.AddChild (QueryTermNode.ParseUserQuery (BansheeQuery.FieldSet, String.Format ("smartplaylistid:{0}", (active_source as SmartPlaylistSource).DbId)));
+                list_node.AddChild (node);
+            }
+
+            SmartPlaylistSource playlist = new SmartPlaylistSource (active_source.FilterQuery);
+            playlist.ConditionTree = list_node ?? node;
+            playlist.Save ();
+            ServiceManager.SourceManager.Library.AddChildSource (playlist);
+            playlist.NotifyUpdated ();
 
             // TODO should begin editing the name after making it, but this changed
             // the ActiveSource to the new playlist and we don't want that.
             //SourceView.BeginRenameSource (playlist);
-        }
+        }*/
 
         private void OnSourceContextMenu (object o, EventArgs args)
         {
@@ -282,6 +306,8 @@
                 UpdateAction ("ExportPlaylistAction", source is AbstractPlaylistSource, true, source);
                 UpdateAction ("SourcePropertiesAction", source.HasProperties, true, source);
                 UpdateAction ("RefreshSmartPlaylistAction", smart_playlist != null && smart_playlist.CanRefresh, true, source);
+                /*UpdateAction ("NewSmartPlaylistFromSearchAction", (source is LibrarySource || source.Parent is LibrarySource),
+                        !String.IsNullOrEmpty (source.FilterQuery), source);*/
                 last_source = source;
             }
             

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Resources/core-ui-actions-layout.xml	Wed Feb 27 21:07:23 2008
@@ -15,7 +15,7 @@
     <menu name="MusicMenu" action="MusicMenuAction">
       <menuitem name="NewPlaylist" action="NewPlaylistAction"/>
       <menuitem name="NewSmartPlaylist" action="NewSmartPlaylistAction"/>
-      <menuitem name="NewSmartPlaylistFromSearch" action="NewSmartPlaylistFromSearchAction"/>
+      <!--<menuitem name="NewSmartPlaylistFromSearch" action="NewSmartPlaylistFromSearchAction"/>-->
       <separator/>
       <menuitem name="ImportMusic" action="ImportMusicAction"/>
       <!--<menuitem name="ImportPlaylist" action="ImportPlaylistAction"/>-->