banshee r4105 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.Sources src/Core/Banshee.ThickClient/Banshee.Gui.Widgets src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea

[abock svn gnome org]

Author: abock
Date: Wed Jun  4 04:11:46 2008
New Revision: 4105
URL: http://svn.gnome.org/viewvc/banshee?rev=4105&view=rev

Log:
2008-06-04  Aaron Bockover  <abock gnome org>

    * src/Core/Banshee.Services/Banshee.Sources/ISource.cs:
    * src/Core/Banshee.Services/Banshee.Sources/Source.cs:
    * src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs:
    Disabled exporting of the source manager and its children over DBus
    since there are issues that need to be worked out in NDesk DBus itself
    before this can be useful and working (BGO #536526)

    * src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ConnectedSeekSlider.cs:
    Expose the StreamPositionLabel

    * src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/TrackInfoPopup.cs:
    Set FormatString on the slider's label to small, not bold; fix padding
    and spacing after dropping unnecessary alignment



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/ISource.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/Source.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ConnectedSeekSlider.cs
   trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/TrackInfoPopup.cs

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/ISource.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/ISource.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/ISource.cs	Wed Jun  4 04:11:46 2008
@@ -34,8 +34,8 @@
 
 namespace Banshee.Sources
 {
-    [Interface("org.bansheeproject.Banshee.Sources.Source")]
-    public interface ISource : IDBusExportable
+    //[Interface("org.bansheeproject.Banshee.Sources.Source")]
+    public interface ISource /* : IDBusExportable */
     {
         void Activate();
         void Deactivate();
@@ -50,5 +50,7 @@
         
         // DBus Hack
         string TrackModelPath { get; }
+
+        ISource Parent { get; }
     }
 }

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	Wed Jun  4 04:11:46 2008
@@ -102,7 +102,7 @@
         
         protected void OnSetupComplete ()
         {
-            ITrackModelSource tm_source = this as ITrackModelSource;
+            /*ITrackModelSource tm_source = this as ITrackModelSource;
             if (tm_source != null) {
                 tm_source.TrackModel.Parent = this;
                 ServiceManager.DBusServiceManager.RegisterObject (tm_source.TrackModel);
@@ -115,7 +115,7 @@
                         ServiceManager.DBusServiceManager.RegisterObject (exportable);
                     }
                 }
-            }
+            }*/
         }
 
         protected void Remove ()
@@ -588,16 +588,17 @@
             return Name;
         }
         
-        string IService.ServiceName {
+        /*string IService.ServiceName {
             get { return String.Format ("{0}{1}", DBusServiceManager.MakeDBusSafeString (Name), "Source"); }
-        }
+        }*/
         
-        IDBusExportable IDBusExportable.Parent {
+        // FIXME: Replace ISource with IDBusExportable when it's enabled again
+        ISource ISource.Parent {
             get {
                 if (Parent != null) {
                     return ((Source)this).Parent;
                 } else {
-                    return ServiceManager.SourceManager;
+                    return null /*ServiceManager.SourceManager*/;
                 }
             }
         }

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs	Wed Jun  4 04:11:46 2008
@@ -49,7 +49,7 @@
         public int Position;
     }
     
-    public class SourceManager : ISourceManager, IInitializeService, IRequiredService, IDisposable
+    public class SourceManager : /*ISourceManager,*/ IInitializeService, IRequiredService, IDisposable
     {
         private List<Source> sources = new List<Source>();
         private Dictionary<string, Source> extension_sources = new Dictionary<string, Source> ();
@@ -165,7 +165,7 @@
                 video_library = source as VideoLibrarySource;
             }
 
-            ServiceManager.DBusServiceManager.RegisterObject(source);
+            // ServiceManager.DBusServiceManager.RegisterObject(source);
             
             foreach(Source child_source in source.Children) {
                 AddSource(child_source, false);
@@ -296,14 +296,14 @@
             get { return active_source; }
         }
         
-        ISource ISourceManager.DefaultSource {
+        /*ISource ISourceManager.DefaultSource {
             get { return DefaultSource; }
         }
         
         ISource ISourceManager.ActiveSource {
             get { return ActiveSource; }
             set { value.Activate (); }
-        }
+        }*/
         
         public void SetActiveSource(Source source)
         {
@@ -341,13 +341,13 @@
             get { return sources; }
         }
         
-        string [] ISourceManager.Sources {
+        /*string [] ISourceManager.Sources {
             get { return DBusServiceManager.MakeObjectPathArray<Source>(sources); }
         }
         
         IDBusExportable IDBusExportable.Parent {
             get { return null; }
-        }
+        }*/
         
         string Banshee.ServiceStack.IService.ServiceName {
             get { return "SourceManager"; }

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ConnectedSeekSlider.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ConnectedSeekSlider.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/ConnectedSeekSlider.cs	Wed Jun  4 04:11:46 2008
@@ -44,7 +44,10 @@
     {
         private SeekSlider seek_slider;
         private StreamPositionLabel stream_position_label;
-    
+        public StreamPositionLabel Label {
+            get { return stream_position_label; }
+        }
+
         public ConnectedSeekSlider () : this (SeekSliderLayout.Vertical)
         {
         }

Modified: trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/TrackInfoPopup.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/TrackInfoPopup.cs	(original)
+++ trunk/banshee/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/TrackInfoPopup.cs	Wed Jun  4 04:11:46 2008
@@ -44,22 +44,23 @@
     
         public TrackInfoPopup () : base (Gtk.WindowType.Popup)
         {
-            BorderWidth = 4;
+            BorderWidth = 8;
             AppPaintable = true;
             Resizable = false;
             TypeHint = Gdk.WindowTypeHint.Notification;
             
             VBox box = new VBox ();
-            
+            box.Spacing = 4;
+
             header = new TrackInfoDisplay ();
             header.SetSizeRequest (320, 64);
             
-            Alignment alignment = new Alignment (1.0f, 1.0f, 0.0f, 0.0f);
-            alignment.SetPadding (6, 3, 6, 3);
-            alignment.Add (header);
-            box.PackStart (alignment, true, true, 0);
-            
             seek_slider = new ConnectedSeekSlider (SeekSliderLayout.Horizontal);
+            seek_slider.Label.FormatString = "<small>{0}</small>";
+            seek_slider.LeftPadding = 0;
+            seek_slider.RightPadding = 0;
+
+            box.PackStart (header, true, true, 0);
             box.PackStart (seek_slider, false, false, 0);
             
             Add (box);