banshee r4306 - in trunk/banshee: . src/Core/Banshee.Services/Banshee.Sources src/Core/Banshee.ThickClient/Banshee.Collection.Gui src/Core/Banshee.ThickClient/Banshee.Gui src/Core/Banshee.ThickClient/Banshee.Sources.Gui src/Libraries/Hyena/Hyena.Data

[gburt svn gnome org]

Author: gburt
Date: Thu Jul 31 01:05:35 2008
New Revision: 4306
URL: http://svn.gnome.org/viewvc/banshee?rev=4306&view=rev

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

	* src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackListView.cs:
	* src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs:
	* src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:
	* src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceIconResolver.cs:
	* src/Core/Banshee.Services/Banshee.Sources/Source.cs:
	* src/Libraries/Hyena/Hyena.Data/PropertyStore.cs: Change GetString calls
	to Get<string> calls, to avoid a lot of strings being marked for
	translation when they shouldn't be.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Services/Banshee.Sources/Source.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackListView.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceIconResolver.cs
   trunk/banshee/src/Libraries/Hyena/Hyena.Data/PropertyStore.cs

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 Jul 31 01:05:35 2008
@@ -469,12 +469,12 @@
         }
 
         public virtual string Name {
-            get { return properties.GetString ("Name"); }
+            get { return properties.Get<string> ("Name"); }
             set { properties.SetString ("Name", value); }
         }
 
         public virtual string GenericName {
-            get { return properties.GetString ("GenericName"); }
+            get { return properties.Get<string> ("GenericName"); }
             set { properties.SetString ("GenericName", value); }
         }
         
@@ -496,7 +496,7 @@
         }
                 
         public virtual string FilterQuery {
-            get { return properties.GetString ("FilterQuery"); }
+            get { return properties.Get<string> ("FilterQuery"); }
             set { properties.SetString ("FilterQuery", value); }
         }
         

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	Thu Jul 31 01:05:35 2008
@@ -80,7 +80,7 @@
                 while (source != null && controller == null) {
                     controller = source.Properties.Get<ColumnController> ("TrackView.ColumnController");
                     if (controller == null) {
-                        string controller_xml = source.Properties.GetString ("TrackView.ColumnControllerXml");
+                        string controller_xml = source.Properties.Get<string> ("TrackView.ColumnControllerXml");
                         if (controller_xml != null) {
                             controller = new XmlColumnController (controller_xml);
                             source.Properties.Remove ("TrackView.ColumnControllerXml");

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/InterfaceActionService.cs	Thu Jul 31 01:05:35 2008
@@ -187,7 +187,7 @@
             }
                 
             Assembly assembly = Assembly.GetAssembly (active_source.GetType ());
-            string ui_file = active_source.Properties.GetString ("ActiveSourceUIResource");
+            string ui_file = active_source.Properties.Get<string> ("ActiveSourceUIResource");
             
             if (ui_file != null) {
                 using (StreamReader reader = new StreamReader (assembly.GetManifestResourceStream (ui_file))) {

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs	Thu Jul 31 01:05:35 2008
@@ -220,7 +220,7 @@
         {
             UpdateActions ();
 
-            string path = ActionSource.Properties.GetString ("GtkActionPath") ?? "/SourceContextMenu";
+            string path = ActionSource.Properties.Get<string> ("GtkActionPath") ?? "/SourceContextMenu";
             Gtk.Menu menu = Actions.UIManager.GetWidget (path) as Menu;
             if (menu == null || menu.Children.Length == 0) {
                 SourceView.ResetHighlight ();

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceIconResolver.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceIconResolver.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceIconResolver.cs	Thu Jul 31 01:05:35 2008
@@ -70,9 +70,9 @@
             Assembly asm = source.Properties.Get<Assembly> ("ResourceAssembly");
             
             if (icon_type == typeof (string)) {
-                icon = IconThemeUtils.LoadIcon (asm, size, source.Properties.GetString (name_property));
+                icon = IconThemeUtils.LoadIcon (asm, size, source.Properties.Get<string> (name_property));
             } else if (icon_type == typeof (string [])) {
-                icon = IconThemeUtils.LoadIcon (asm, size, source.Properties.GetStringList (name_property));
+                icon = IconThemeUtils.LoadIcon (asm, size, source.Properties.Get<string> (name_property));
             }
 
             if (icon == null) {

Modified: trunk/banshee/src/Libraries/Hyena/Hyena.Data/PropertyStore.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena/Hyena.Data/PropertyStore.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena/Hyena.Data/PropertyStore.cs	Thu Jul 31 01:05:35 2008
@@ -169,10 +169,11 @@
             Set<int>(name, value);
         }
         
-        public string GetString(string name)
+        // No longer used, since it causes strings to be marked for translation
+        /*public string GetString(string name)
         {
             return Get<string>(name);
-        }
+        }*/
         
         public void SetString(string name, string value)
         {