banshee r3166 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.ServiceStack src/Core/Banshee.ThickClient/Banshee.Collection.Gui src/Core/Banshee.ThickClient/Banshee.Gui

[gburt svn gnome org]

Author: gburt
Date: Thu Feb  7 19:00:02 2008
New Revision: 3166
URL: http://svn.gnome.org/viewvc/banshee?rev=3166&view=rev

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

	* src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs:
	Comment out super-verbose logging.

	* src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs:
	* src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtistListView.cs:
	* src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs: Sweet little
	patch that disconnects the [shift]ctrl-a keybindings while focused in the
	Artist and Album views.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtistListView.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/DBusServiceManager.cs	Thu Feb  7 19:00:02 2008
@@ -111,9 +111,9 @@
         {
             if(dbus_enabled && Bus.Session != null) {
                 Bus.Session.Register(BusName, new ObjectPath(objectName), o);
-                if (Banshee.Base.ApplicationContext.Debugging) {
+                /*if (Banshee.Base.ApplicationContext.Debugging) {
                     Banshee.Base.Log.DebugFormat ("Registered {0} on {1}", objectName, BusName);
-                }
+                }*/
             }
         }
 

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs	Thu Feb  7 19:00:02 2008
@@ -32,6 +32,8 @@
 using Hyena.Data.Gui;
 
 using Banshee.Collection;
+using Banshee.ServiceStack;
+using Banshee.Gui;
 
 namespace Banshee.Collection.Gui
 {
@@ -48,5 +50,17 @@
             
             RowHeight = ColumnCellAlbum.RowHeight;
         }
+
+        protected override bool OnFocusInEvent(Gdk.EventFocus evnt)
+        {
+            ServiceManager.Get<InterfaceActionService> ().TrackActions.SuppressSelectActions ();
+            return base.OnFocusInEvent(evnt);
+        }
+        
+        protected override bool OnFocusOutEvent(Gdk.EventFocus evnt)
+        {
+            ServiceManager.Get<InterfaceActionService> ().TrackActions.UnsuppressSelectActions ();
+            return base.OnFocusOutEvent(evnt);
+        }
     }
 }

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtistListView.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtistListView.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtistListView.cs	Thu Feb  7 19:00:02 2008
@@ -32,6 +32,8 @@
 using Hyena.Data.Gui;
 
 using Banshee.Collection;
+using Banshee.ServiceStack;
+using Banshee.Gui;
 
 namespace Banshee.Collection.Gui
 {
@@ -46,5 +48,17 @@
             
             ColumnController = column_controller;
         }
+
+        protected override bool OnFocusInEvent(Gdk.EventFocus evnt)
+        {
+            ServiceManager.Get<InterfaceActionService> ().TrackActions.SuppressSelectActions ();
+            return base.OnFocusInEvent(evnt);
+        }
+        
+        protected override bool OnFocusOutEvent(Gdk.EventFocus evnt)
+        {
+            ServiceManager.Get<InterfaceActionService> ().TrackActions.UnsuppressSelectActions ();
+            return base.OnFocusOutEvent(evnt);
+        }
     }
 }

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	Thu Feb  7 19:00:02 2008
@@ -176,6 +176,25 @@
 
 #region Utility Methods
 
+        private bool select_actions_suppressed = false;
+        public void SuppressSelectActions ()
+        {
+            if (!select_actions_suppressed) {
+                this ["SelectAllAction"].DisconnectAccelerator ();
+                this ["SelectNoneAction"].DisconnectAccelerator ();
+                select_actions_suppressed = true;
+            }
+        }
+
+        public void UnsuppressSelectActions ()
+        {
+            if (select_actions_suppressed) {
+                this ["SelectAllAction"].ConnectAccelerator ();
+                this ["SelectNoneAction"].ConnectAccelerator ();
+                select_actions_suppressed = false;
+            }
+        }
+
         private void UpdateActions ()
         {
             Hyena.Collections.Selection selection = TrackSelector.TrackSelectionProxy.Selection;