[Monodevelop-patches-list] r1341 - in trunk/MonoDevelop: build/AddIns po src/Main/Base src/Main/Base/Gui/Dialogs src/Main/Base/Services

commit-watcher at mono-cvs.ximian.com commit-watcher at mono-cvs.ximian.com
Fri Apr 2 04:53:49 EST 2004


Author: tberman
Date: 2004-04-02 04:53:49 -0500 (Fri, 02 Apr 2004)
New Revision: 1341

Modified:
   trunk/MonoDevelop/build/AddIns/ChangeLog
   trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin
   trunk/MonoDevelop/po/
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
   trunk/MonoDevelop/src/Main/Base/Services/GettextCatalog.cs
Log:
fixing metadata, removing service, moved to static methods...
remove abstraction goood.


Modified: trunk/MonoDevelop/build/AddIns/ChangeLog
===================================================================
--- trunk/MonoDevelop/build/AddIns/ChangeLog	2004-04-02 09:37:27 UTC (rev 1340)
+++ trunk/MonoDevelop/build/AddIns/ChangeLog	2004-04-02 09:53:49 UTC (rev 1341)
@@ -1,3 +1,7 @@
 2004-04-02  Todd Berman  <tberman at sevenl.net>
 
+	* SharpDevelopCore.addin: removing, moving to static methods.
+
+2004-04-02  Todd Berman  <tberman at sevenl.net>
+
 	* SharpDevelopCore.addin: adding GettextCatalog as a service.

Modified: trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin
===================================================================
--- trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin	2004-04-02 09:37:27 UTC (rev 1340)
+++ trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin	2004-04-02 09:53:49 UTC (rev 1341)
@@ -30,8 +30,6 @@
 	</Extension>
 	
 	<Extension path = "/Workspace/Services">
-		<Class id    = "GettextCatalog"
-		       class = "MonoDevelop.Services.GettextCatalog"/>
 		<Class id    = "MonodocService"
 		       class = "MonoDevelop.Services.MonodocService"/>
 		<Class id    = "ProjectService"


Property changes on: trunk/MonoDevelop/po
___________________________________________________________________
Name: svn:ignore
   - *.gmo
monodevelop.pot
POTFILES

   + *.gmo
monodevelop.pot
POTFILES
Makefile.in
Makefile


Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-02 09:37:27 UTC (rev 1340)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-04-02 09:53:49 UTC (rev 1341)
@@ -1,5 +1,10 @@
 2004-04-02  Todd Berman  <tberman at sevenl.net>
 
+	* Services/GettextCatalog.cs: changed to use static methods.
+	* Gui/Dialogs/CommonAboutDialog.cs: reflecting above change.
+
+2004-04-02  Todd Berman  <tberman at sevenl.net>
+
 	* Makefile.am: Added GettextCatalog.cs
 	* Services/GettextCatalog.cs: imported from muine, modified a bit.
 	* Gui/Dialogs/CommonAboutDialog.cs: added gettext translatable title

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs	2004-04-02 09:37:27 UTC (rev 1340)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs	2004-04-02 09:53:49 UTC (rev 1341)
@@ -119,14 +119,13 @@
 		ScrollBox aboutPictureScrollBox;
 		
 		static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
-		static GettextCatalog gettext = (GettextCatalog)ServiceManager.Services.GetService (typeof (GettextCatalog));
 		
 		static CommonAboutDialog ()
 		{
 			type = RegisterGType (typeof (CommonAboutDialog));
 		}
 		
-		public CommonAboutDialog() : base (gettext.GetString ("About MonoDevelop"), (Gtk.Window) WorkbenchSingleton.Workbench, DialogFlags.DestroyWithParent)
+		public CommonAboutDialog() : base (GettextCatalog.GetString ("About MonoDevelop"), (Gtk.Window) WorkbenchSingleton.Workbench, DialogFlags.DestroyWithParent)
 		{
 			ResourceService resourceService = (ResourceService) ServiceManager.Services.GetService(typeof (IResourceService));
 			aboutPictureScrollBox = new ScrollBox ();

Modified: trunk/MonoDevelop/src/Main/Base/Services/GettextCatalog.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/GettextCatalog.cs	2004-04-02 09:37:27 UTC (rev 1340)
+++ trunk/MonoDevelop/src/Main/Base/Services/GettextCatalog.cs	2004-04-02 09:53:49 UTC (rev 1341)
@@ -31,25 +31,21 @@
 namespace MonoDevelop.Services
 {
 
-	public class GettextCatalog : AbstractService
+	public class GettextCatalog
 	{
 
-		public GettextCatalog () : this ("monodevelop")
-		{
-		}
-
 		[DllImport ("libmonodevelop")]
 		private static extern void intl_init (string package);
 	
-		public GettextCatalog (string package)
+		static GettextCatalog ()
 		{
-			intl_init (package);
+			intl_init ("monodevelop");
 		}
 	
 		[DllImport ("libmonodevelop")]
 		private static extern string intl_get_string (string str);
 	
-		public string GetString (string str)
+		public static string GetString (string str)
 		{
 			return intl_get_string (str);
 		}
@@ -59,9 +55,9 @@
 								     string plural,
 								     int n);
 	
-		public string GetPluralString (string singular,
-					       string plural,
-					       int n)
+		public static string GetPluralString (string singular,
+			    	 	              string plural,
+					              int n)
 		{
 			return intl_get_plural_string (singular, plural, n);
 		}




More information about the Monodevelop-patches-list mailing list