banshee r3492 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.Collection src/Core/Banshee.Services/Banshee.Sources src/Core/Banshee.ThickClient/Banshee.Gui.Widgets

[ahixon svn gnome org]

Author: ahixon
Date: Thu Mar 20 11:04:04 2008
New Revision: 3492
URL: http://svn.gnome.org/viewvc/banshee?rev=3492&view=rev

Log:
2008-03-20  Alexander Hixon  <hixon alexander mediati org>

	* src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTileHost.cs:
	Added left padding, so it doesn't look so bad on fullscreen. Also made
	addition to code comment from previous commit, and some evil whitespace.

	* src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs:
	Patch to fix small bug introduced in r3487 where the missing pixbuf icon
	would be displayed as an album cover type when it shouldn't be (ie the
	black box around the icon).

	* src/Core/Banshee.Services/Banshee.Sources/Source.cs: Slightly more
	awesome status bar text, shamelessly ported from stable.

	* src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs: Removed
	more mentions of 'songs' and replaced with 'media'.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/Source.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTileHost.cs

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs	Thu Mar 20 11:04:04 2008
@@ -73,7 +73,7 @@
                     return;
                 }
                 
-                user_job = new UserJob (Title, Title, Catalog.GetString ("Scanning for songs"));
+                user_job = new UserJob (Title, Title, Catalog.GetString ("Scanning for media"));
                 user_job.IconNames = new string [] { "system-search", "gtk-find" };
                 user_job.CancelMessage = CancelMessage;
                 user_job.CanCancel = true;
@@ -274,7 +274,7 @@
             }
         }
         
-        private string title = Catalog.GetString ("Importing Songs");
+        private string title = Catalog.GetString ("Importing Media");
         public string Title {
             get { return title; }
             set { title = value; }

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	Thu Mar 20 11:04:04 2008
@@ -430,22 +430,28 @@
             builder.AppendFormat (Catalog.GetPluralString ("{0} item", "{0} items", count), count);
             
             if (this is IDurationAggregator) {
-                builder.Append (", ");
-
-                TimeSpan span = (this as IDurationAggregator).Duration; 
+                TimeSpan span = (this as IDurationAggregator).Duration;
+                
                 if (span.Days > 0) {
-                    double days = span.Days + (span.Hours / 24.0);
-                    builder.AppendFormat (Catalog.GetPluralString ("{0} day", "{0:0.0} days", 
-                        (int)Math.Ceiling (days)), days);
-                } else if (span.Hours > 0) {
-                    double hours = span.Hours + (span.Minutes / 60.0);
-                    builder.AppendFormat (Catalog.GetPluralString ("{0} hour", "{0:0.0} hours", 
-                        (int)Math.Ceiling (hours)), hours);
-                } else {
-                    double minutes = span.Minutes + (span.Seconds / 60.0);
-                    builder.AppendFormat (Catalog.GetPluralString ("{0} minute", "{0:0.0} minutes", 
-                        (int)Math.Ceiling (minutes)), minutes);
+                    builder.Append (", ");
+                    builder.AppendFormat (Catalog.GetPluralString ("{0} day", "{0} days", 
+                        (int) span.Days), span.Days);
                 }
+                
+                if (span.Hours > 0) {
+                    builder.Append (", ");
+                    builder.AppendFormat (Catalog.GetPluralString ("{0} hour", "{0} hours", 
+                        (int) span.Hours), span.Hours);
+                }
+                
+                builder.Append (", ");
+                
+                builder.AppendFormat (Catalog.GetPluralString ("{0} minute", "{0} minutes", 
+                    (int) span.Minutes), span.Minutes);
+                
+                builder.Append (", ");
+                builder.AppendFormat (Catalog.GetPluralString ("{0} second", "{0} seconds",
+                    (int) span.Seconds), span.Seconds);
             }
 
             if (this is IFileSizeAggregator) {

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/TrackInfoDisplay.cs	Thu Mar 20 11:04:04 2008
@@ -350,7 +350,7 @@
         private void RenderCoverArt (Cairo.Context cr, Gdk.Pixbuf pixbuf)
         {
             ArtworkRenderer.RenderThumbnail (cr, pixbuf, false, 0, 0, Allocation.Height, Allocation.Height, 
-                IsMissingPixbuf (pixbuf), 0, IsMissingPixbuf (pixbuf), background_color);
+                !IsMissingPixbuf (pixbuf), 0, IsMissingPixbuf (pixbuf), background_color);
         }
 
         private bool IsMissingPixbuf (Gdk.Pixbuf pb)

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTileHost.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTileHost.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTileHost.cs	Thu Mar 20 11:04:04 2008
@@ -44,6 +44,8 @@
         
         public UserJobTileHost () : base (0.0f, 0.0f, 1.0f, 1.0f)
         {
+            LeftPadding = 4;
+            
             box = new AnimatedVBox ();
             box.Spacing = 8;
             box.Show ();
@@ -114,7 +116,7 @@
             ThreadAssist.ProxyToMain (delegate {
                 lock (this) {
                     if (job_tiles.ContainsKey (args.Job)) {
-                        UserJobTile tile = job_tiles[args.Job];                        
+                        UserJobTile tile = job_tiles[args.Job];
                         box.Remove (tile);
                         job_tiles.Remove (args.Job);
                     }
@@ -122,6 +124,9 @@
                     if (job_tiles.Count <= 0) {
                         // Don't actually hide the widget, since that screws
                         // with the last widget's ease-out animation.
+                        
+                        // All subwidgets end up hiding themselves anyway,
+                        // so all we need to do is make sure we have no padding.
                         TopPadding = 0;
                     }
                 }