banshee r4326 - in trunk/banshee: . src/Core/Banshee.Core/Resources src/Core/Banshee.ThickClient/Banshee.Collection.Gui src/Core/Banshee.ThickClient/Banshee.Sources.Gui

[gburt svn gnome org]

Author: gburt
Date: Tue Aug  5 18:45:28 2008
New Revision: 4326
URL: http://svn.gnome.org/viewvc/banshee?rev=4326&view=rev

Log:
2008-08-05  Gabriel Burt  <gabriel burt gmail com>

	* src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackFilterListView.cs:
	Enable dragging filter items (artists/albums/etc) the same as you would
	drag tracks - onto the play queue, etc (BGO #524418).

	* src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:
	Check where the drag came from, and if it wasn't directly from the track
	view, assume it was from a filter view, and add everything in the track
	model to the drop destination instead of just the user-selected items.

	* src/Core/Banshee.Core/Resources/translators.xml: Updated


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Core/Resources/translators.xml
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackFilterListView.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs

Modified: trunk/banshee/src/Core/Banshee.Core/Resources/translators.xml
==============================================================================
--- trunk/banshee/src/Core/Banshee.Core/Resources/translators.xml	(original)
+++ trunk/banshee/src/Core/Banshee.Core/Resources/translators.xml	Tue Aug  5 18:45:28 2008
@@ -2,10 +2,10 @@
 <!-- AUTOGENERATED - DO NOT EDIT -->
 <translators>
   <language code="ar" name="Arabic">
-    <person>Ahmad Farghal</person>
     <person>Khaled Hosny</person>
+    <person>Ahmad Farghal</person>
   </language>
-  <language code="be latin" name="i18n mova org">
+  <language code="be latin" name="Belarusian">
     <person>Ihar Hrachyshka</person>
   </language>
   <language code="bg" name="Bulgarian">
@@ -16,17 +16,17 @@
     <person>Jordi Mas i HernÃndez</person>
   </language>
   <language code="cs" name="Czech">
-    <person>LukÃÅ NovotnÃ</person>
     <person>Jakub Friedl</person>
+    <person>LukÃÅ NovotnÃ</person>
   </language>
   <language code="da" name="Danish">
     <person>Lasse Bang Mikkelsen</person>
   </language>
   <language code="de" name="German">
+    <person>Andre Klapper</person>
     <person>Philipp Kerling</person>
     <person>Jochen Skulj</person>
     <person>Daniel Schindler</person>
-    <person>Andre Klapper</person>
   </language>
   <language code="dz" name="Dzongkha">
     <person>yumkee lhamo</person>
@@ -35,44 +35,44 @@
     <person>Adam Weinberger</person>
   </language>
   <language code="en_GB" name="English/GB">
-    <person>David Lodge</person>
     <person>Christopher Orr</person>
+    <person>David Lodge</person>
   </language>
   <language code="es" name="Spanish">
     <person>Maria Majadas</person>
-    <person>BenjamÃn Valero Espinosa</person>
     <person>AndrÃs Herrera</person>
+    <person>BenjamÃn Valero Espinosa</person>
     <person>Jorge GonzÃlez</person>
     <person>Francisco Javier F. Serrador</person>
   </language>
   <language code="fi" name="Finnish">
-    <person>Joonas Niilola</person>
     <person>Ilkka Tuohela</person>
+    <person>Joonas Niilola</person>
   </language>
   <language code="fr" name="French">
-    <person>Jonathan Ernst</person>
-    <person>StÃphane Raimbault</person>
     <person>Claude Paroz</person>
-    <person>Florent Le Coz</person>
+    <person>Jonathan Ernst</person>
     <person>Robert-Andrà Mauchin</person>
+    <person>Florent Le Coz</person>
+    <person>StÃphane Raimbault</person>
   </language>
   <language code="gl" name="Galego">
     <person>Ignacio Casal Quinteiro</person>
   </language>
-  <language code="he" name="hebrew">
+  <language code="he" name="Hebrew">
     <person>Mark Krapivner</person>
   </language>
   <language code="hu" name="Hungarian">
-    <person>Gabor Kelemen</person>
     <person>KÃmÃnczy KÃlmÃn</person>
+    <person>Gabor Kelemen</person>
   </language>
   <language code="it" name="Italian">
-    <person>Gianvito Cavasoli</person>
     <person>Alessandro Gervaso</person>
+    <person>Gianvito Cavasoli</person>
   </language>
   <language code="ja" name="Japanese">
-    <person>Takeshi AIHANA</person>
     <person>Koike Kazuhiko</person>
+    <person>Takeshi AIHANA</person>
   </language>
   <language code="lt" name="Lithuanian">
     <person>Gintautas Miliauskas</person>
@@ -85,13 +85,13 @@
     <person>Jovan Naumovski</person>
   </language>
   <language code="nb" name="Norwegian">
-    <person>Ãivind Hoel</person>
     <person>Kjartan Maraas</person>
+    <person>Ãivind Hoel</person>
   </language>
   <language code="nl" name="Dutch">
-    <person>Wouter Bolsterlee</person>
     <person>Pepijn van de Geer</person>
     <person>Stijn Verslycken</person>
+    <person>Wouter Bolsterlee</person>
   </language>
   <language code="oc" name="Occitan">
     <person>Yannig Marchegay (Kokoyaya)</person>
@@ -106,12 +106,14 @@
     <person>Filipe Gomes</person>
   </language>
   <language code="pt_BR" name="Brazilian Portuguese">
+    <person>FabrÃcio Godoy</person>
+    <person>Michel Recondo</person>
     <person>Rodrigo Flores</person>
-    <person>Marco Carvalho</person>
+    <person>Daniel Abreu</person>
     <person>Og Maciel</person>
-    <person>Evandro Fernandes Giovanini</person>
     <person>Vladimir Melo</person>
-    <person>Daniel Abreu</person>
+    <person>Evandro Fernandes Giovanini</person>
+    <person>Marco Carvalho</person>
   </language>
   <language code="ru" name="Russian">
     <person>Daniel Abramov</person>

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackFilterListView.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackFilterListView.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackFilterListView.cs	Tue Aug  5 18:45:28 2008
@@ -27,6 +27,7 @@
 //
 
 using System;
+using Gtk;
 
 using Hyena.Data;
 using Hyena.Data.Gui;
@@ -44,6 +45,8 @@
         public TrackFilterListView () : base ()
         {
             column_controller = new ColumnController ();
+
+            ForceDragSourceSet = true;
             
             RowActivated += delegate {
                 ServiceManager.PlaybackController.NextSource = (ServiceManager.SourceManager.ActiveSource as Banshee.Sources.ITrackModelSource);
@@ -71,5 +74,16 @@
             ServiceManager.Get<InterfaceActionService> ().TrackActions.UnsuppressSelectActions ();
             return base.OnFocusOutEvent(evnt);
         }
+
+#region Drag and Drop
+
+        protected override void OnDragSourceSet ()
+        {
+            base.OnDragSourceSet ();
+            Drag.SourceSetIconName (this, "audio-x-generic");
+        }
+
+#endregion
+
     }
 }

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs	Tue Aug  5 18:45:28 2008
@@ -228,8 +228,14 @@
                         ServiceManager.Get<Banshee.Library.LibraryImportManager> ().Enqueue (uri);
                     }
                 } else if (data.Target.Name == Hyena.Data.Gui.ListViewDragDropTarget.ModelSelection.Target) {
-                    drop_source.MergeSourceInput (ServiceManager.SourceManager.ActiveSource, 
-                        SourceMergeType.ModelSelection);
+                    // If the drag source is not the track list, it's a filter list, and instead of
+                    // only merging the track model's selected tracks, we should merge all the tracks
+                    // currently matching the active filters.
+                    bool from_filter = !(Gtk.Drag.GetSourceWidget (context) is Banshee.Collection.Gui.TrackListView);
+                    drop_source.MergeSourceInput (
+                        ServiceManager.SourceManager.ActiveSource,
+                        from_filter ? SourceMergeType.Source : SourceMergeType.ModelSelection
+                    );
                 } else {
                     Hyena.Log.DebugFormat ("SourceView got unknown drag target type: {0}", data.Target.Name);
                 }