banshee r4325 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.Library src/Core/Banshee.ThickClient/Banshee.Collection.Gui src/Core/Banshee.ThickClient/Banshee.Gui src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView

[gburt svn gnome org]

Author: gburt
Date: Tue Aug  5 17:48:54 2008
New Revision: 4325
URL: http://svn.gnome.org/viewvc/banshee?rev=4325&view=rev

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

	* src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Interaction.cs:
	Factor out activate-selection code into protected method.

	* src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackListView.cs:
	Handle 'o' the same as enter - activate the row(s), which starts playing
	them.

	* src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs: Update links to
	the website.

	* src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs: Update
	copyright.

	* src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:
	Make sure errors are reported on the main thread, avoid hanging when
	importing from Amarok.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackListView.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Interaction.cs

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs	Tue Aug  5 17:48:54 2008
@@ -87,10 +87,12 @@
 
         protected void LogError (string path, string msg)
         {
-            ErrorSource error_source = ServiceManager.SourceManager.MusicLibrary.ErrorSource;
-            error_source.AddMessage (Path.GetFileName (path), msg);
-            
-            Log.Error (path, msg, false);
+            Banshee.Base.ThreadAssist.ProxyToMain (delegate {
+                ErrorSource error_source = ServiceManager.SourceManager.MusicLibrary.ErrorSource;
+                error_source.AddMessage (Path.GetFileName (path), msg);
+    
+                Log.Error (path, msg, false);
+            });
         }
         
         protected bool CheckForCanceled ()

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackListView.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackListView.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackListView.cs	Tue Aug  5 17:48:54 2008
@@ -68,6 +68,15 @@
             };
         }
         
+        protected override bool OnKeyPressEvent (Gdk.EventKey press)
+        {
+            // Have o act the same as enter - activate the selection
+            if (press.Key == Gdk.Key.o && ActivateSelection ()) {
+                return true;
+            }
+            return base.OnKeyPressEvent (press);
+        }
+        
         public override void SetModel (IListModel<TrackInfo> value, double vpos)
         {
             //Console.WriteLine ("TrackListView.SetModel for {0} with vpos {1}", value, vpos);

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs	Tue Aug  5 17:48:54 2008
@@ -91,13 +91,13 @@
                 new ActionEntry ("WikiGuideAction", Stock.Help,
                     Catalog.GetString ("Banshee _User Guide (Wiki)"), null,
                     Catalog.GetString ("Learn about how to use Banshee"), delegate {
-                        Banshee.Web.Browser.Open ("http://banshee-project.org/Guide";);
+                        Banshee.Web.Browser.Open ("http://banshee-project.org/support/guide/";);
                     }),
                     
                 new ActionEntry ("WikiSearchHelpAction", null,
                     Catalog.GetString ("Advanced Collection Searching"), null,
                     Catalog.GetString ("Learn advanced ways to search your media collection"), delegate {
-                        Banshee.Web.Browser.Open ("http://banshee-project.org/OnePointEx/Search";);
+                        Banshee.Web.Browser.Open ("http://banshee-project.org/support/guide/searching/";);
                     }),
                     
                 new ActionEntry ("WikiAction", null,
@@ -109,7 +109,7 @@
                 new ActionEntry ("WikiDeveloperAction", null,
                     Catalog.GetString ("_Get Involved"), null,
                     Catalog.GetString ("Become a contributor to Banshee"), delegate {
-                        Banshee.Web.Browser.Open ("http://banshee-project.org/Developers";);
+                        Banshee.Web.Browser.Open ("http://banshee-project.org/contribute/";);
                     }),
                  
                 new ActionEntry ("VersionInformationAction", null,

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 Aug  5 17:48:54 2008
@@ -4,7 +4,7 @@
 // Author:
 //   Gabriel Burt <gburt novell com>
 //
-// Copyright (C) 2007 Novell, Inc.
+// Copyright (C) 2007-2008 Novell, Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the

Modified: trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Interaction.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Interaction.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Interaction.cs	Tue Aug  5 17:48:54 2008
@@ -186,12 +186,7 @@
 
                 case Gdk.Key.Return:
                 case Gdk.Key.KP_Enter:
-                    if (Selection != null && Selection.FocusedIndex != -1) {
-                        Selection.Clear (false);
-                        Selection.Select (Selection.FocusedIndex);
-                        OnRowActivated ();
-                        handled = true;
-                    }
+                    handled = ActivateSelection ();
                     break;
                 
                 case Gdk.Key.space:
@@ -209,6 +204,17 @@
             return base.OnKeyPressEvent (press);
         }
         
+        protected bool ActivateSelection ()
+        {
+            if (Selection != null && Selection.FocusedIndex != -1) {
+                Selection.Clear (false);
+                Selection.Select (Selection.FocusedIndex);
+                OnRowActivated ();
+                return true;
+            }
+            return false;
+        }
+        
 #region Cell Event Proxy        
         
         private IInteractiveCell last_icell;