banshee r4481 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.Sources src/Core/Banshee.ThickClient/Banshee.Gui src/Dap/Banshee.Dap/Banshee.Dap

[gburt svn gnome org]

Author: gburt
Date: Mon Sep  8 01:13:17 2008
New Revision: 4481
URL: http://svn.gnome.org/viewvc/banshee?rev=4481&view=rev

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

	* src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs: Add a
	StorageName property that defaults to 'Drive', and is used for the
	DeleteFromDrive action's label.

	* src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs: When the Name
	property is set, set the StorageName too, so that the DeleteFromDrive
	action's label is still 'Delete From iPod' etc.

	* src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs: Clarify a couple error
	messages.

	* src/Core/Banshee.ThickClient/Banshee.Gui/BansheeActionGroup.cs: Don't
	inherit action Label and IconName overrides from sources' parents since
	that can lead to strange things.  Fixes bug with the UnmapSourceAction's
	IconName being the eject icon for playlists under DapSources (BGO #549183)

	* src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs: Use the
	StorageName property on the PrimarySource to set the DeleteFromDrive
	label.



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/BansheeActionGroup.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs
   trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs
   trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs	Mon Sep  8 01:13:17 2008
@@ -207,6 +207,13 @@
         {
         }
 
+        // Translators: this is a noun, referring to the harddisk
+        private string storage_name = Catalog.GetString ("Drive");
+        public string StorageName {
+            get { return storage_name; }
+            protected set { storage_name = value; }
+        }
+
         public override bool? AutoExpand {
             get { return ExpandedSchema.Get (); }
         }

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/BansheeActionGroup.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/BansheeActionGroup.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/BansheeActionGroup.cs	Mon Sep  8 01:13:17 2008
@@ -165,12 +165,12 @@
 
                 // If this source has a label property for this action, override the current label, otherwise reset it
                 // to the original label
-                string label = source.GetInheritedProperty<string> (String.Format ("{0}Label", action_name)) ?? labels[action_name];
+                string label = source.Properties.Get<string> (String.Format ("{0}Label", action_name)) ?? labels[action_name];
                 action.Label = label;
 
                 // If this source has an icon property for this action, override the current icon, othewise reset it
                 // to the original icon
-                string icon = source.GetInheritedProperty<string> (String.Format ("{0}IconName", action_name)) ?? icons[action_name];
+                string icon = source.Properties.Get<string> (String.Format ("{0}IconName", action_name)) ?? icons[action_name];
                 if (!String.IsNullOrEmpty (icon)) {
                     action.IconName = icon;
                 }

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	Mon Sep  8 01:13:17 2008
@@ -228,6 +228,10 @@
                     UpdateAction ("TrackPropertiesAction", in_database, has_selection, source);
                     UpdateAction ("RateTracksAction", in_database, has_selection, null);
                     UpdateAction ("AddToPlaylistAction", in_database && primary_source != null && primary_source.SupportsPlaylists, has_selection, null);
+
+                    if (primary_source != null) {
+                        this["DeleteTracksFromDriveAction"].Label = String.Format (Catalog.GetString ("_Delete From {0}"), primary_source.StorageName);
+                    }
                 }
             } else {
                 Sensitive = Visible = false;

Modified: trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs	Mon Sep  8 01:13:17 2008
@@ -338,13 +338,13 @@
                 string format = System.IO.Path.GetExtension (track.Uri.LocalPath);
                 format = String.IsNullOrEmpty (format) ? Catalog.GetString ("Unknown") : format.Substring (1);
                 throw new ApplicationException (String.Format (Catalog.GetString (
-                    "The {0} format is not supported by the device, and no converter was found to convert it."), format));
+                    "The {0} format is not supported by the device, and no converter was found to convert it"), format));
             }
 
             TranscoderService transcoder = ServiceManager.Get<TranscoderService> ();
             if (transcoder == null) {
                 throw new ApplicationException (Catalog.GetString (
-                    "File format conversion is not supported for this device."));
+                    "File format conversion support is not available"));
             }
             
             transcoder.Enqueue (track, PreferredConfiguration, OnTrackTranscoded, OnTrackTranscodeCancelled);

Modified: trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs	Mon Sep  8 01:13:17 2008
@@ -67,7 +67,7 @@
             get { return base.Name; }
             set {
                 base.Name = value;
-                Properties.SetString ("DeleteTracksActionLabel", String.Format (Catalog.GetString ("Delete From {0}"), value));
+                StorageName = value;
                 Properties.SetString ("UnmapSourceActionLabel", String.Format (Catalog.GetString ("Eject {0}"), value));
             }
         }