[Monodevelop-patches-list] r1067 - in trunk/MonoDevelop: data/resources/glade src/Main/Base/Gui/Dialogs/CombineConfiguration

[commit-watcher at mono-cvs.ximian.com]

Author: dkor
Date: 2004-02-29 14:46:44 -0500 (Sun, 29 Feb 2004)
New Revision: 1067

Modified:
   trunk/MonoDevelop/data/resources/glade/Base.glade
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs
Log:
Internationalized, Added spacing in UI, & erased a useless one liner that raised a Gtk-WARNING

Modified: trunk/MonoDevelop/data/resources/glade/Base.glade
===================================================================
--- trunk/MonoDevelop/data/resources/glade/Base.glade	2004-02-29 19:42:06 UTC (rev 1066)
+++ trunk/MonoDevelop/data/resources/glade/Base.glade	2004-02-29 19:46:44 UTC (rev 1067)
@@ -3915,7 +3915,7 @@
 	    <widget class="GtkRadioButton" id="singleRadioButton">
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">_Single Startup Project</property>
+	      <property name="label" translatable="yes">_Single Startup Project-</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="active">False</property>
@@ -3993,7 +3993,7 @@
 	    <widget class="GtkRadioButton" id="multipleRadioButton">
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">_Multiple Startup Project</property>
+	      <property name="label" translatable="yes">_Multiple Startup Project-</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="active">False</property>
@@ -4151,12 +4151,12 @@
 		    <widget class="GtkHBox" id="hbox40">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
+		      <property name="spacing">6</property>
 
 		      <child>
 			<widget class="GtkLabel" id="ActionLabel">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Action</property>
+			  <property name="label" translatable="yes">Action-</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs	2004-02-29 19:42:06 UTC (rev 1066)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs	2004-02-29 19:46:44 UTC (rev 1067)
@@ -21,14 +21,12 @@
 {
 	public class CombineStartupPanel : AbstractOptionPanel
 	{
-		// FIXME 
-		// - internationalize 
-		// propertyService.DataDirectory + @"\resources\panels\CombineStartupPanel.xfrm")
 		CombineStartupPanelWidget widget;
 		
 		class CombineStartupPanelWidget : GladeWidgetExtract 
 		{
 			// Gtk Controls
+			[Glade.Widget] Label ActionLabel;
  			[Glade.Widget] RadioButton singleRadioButton;
  			[Glade.Widget] RadioButton multipleRadioButton;
  			[Glade.Widget] OptionMenu singleOptionMenu;
@@ -40,6 +38,8 @@
  			public ListStore store;
 
 			// Services
+			StringParserService StringParserService = (StringParserService)ServiceManager.Services.GetService (
+										typeof (StringParserService));
 			static ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(
 										typeof(IResourceService));
 			static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(
@@ -51,9 +51,18 @@
 			{
 				this.combine = (Combine)((IProperties)CustomizationObject).GetProperty("Combine");
 
+
+				ActionLabel.Text = StringParserService.Parse(
+					"${res:Dialog.Options.CombineOptions.Startup.ActionLabel}");
+
 				// Setting up RadioButtons
+
+				singleRadioButton.Label = StringParserService.Parse(
+					"${res:Dialog.Options.CombineOptions.Startup.SingleStartupRadioButton}");
 				singleRadioButton.Active = combine.SingleStartupProject;
 				singleRadioButton.Clicked += new EventHandler(OnSingleRadioButtonClicked);
+				multipleRadioButton.Label =  StringParserService.Parse(
+					"${res:Dialog.Options.CombineOptions.Startup.MultipleStartupRadioButton}");
 				multipleRadioButton.Active = !combine.SingleStartupProject;
 				singleRadioButton.Clicked += new EventHandler(OptionsChanged);
 
@@ -83,8 +92,12 @@
 				entryTreeView.Model = store;
 				
 				TreeIter iter = new TreeIter ();
-				entryTreeView.AppendColumn ("Entry", new CellRendererText (), "text", 0);
-				entryTreeView.AppendColumn ("Action", new CellRendererText (), "text", 1);
+ 				string entryHeader = StringParserService.Parse(
+ 					"${res:Dialog.Options.CombineOptions.Startup.EntryColumnHeader}");	
+ 				entryTreeView.AppendColumn (entryHeader, new CellRendererText (), "text", 0);
+ 				string actionHeader = StringParserService.Parse(
+ 					"${res:Dialog.Options.CombineOptions.Startup.ActionColumnHeader}");
+ 				entryTreeView.AppendColumn (actionHeader, new CellRendererText (), "text", 1);
 				
 				// sanity check to ensure we had a proper execture definitions save last time rounf
 				if(combine.CombineExecuteDefinitions.Count == combine.Entries.Count) {
@@ -109,7 +122,8 @@
 					// tell the user we encountered and worked around an issue 
 					IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
 					// FIXME: il8n this
-					messageService.ShowError("The Combine Execute Definitions for this Combine were invalid. A new empty set of Execute Definitions has been created.");
+					messageService.ShowError(
+						"The Combine Execute Definitions for this Combine were invalid. A new empty set of Execute Definitions has been created.");
 				}
 					
  				entryTreeView.Selection.Changed += new EventHandler(SelectedEntryChanged);
@@ -178,7 +192,6 @@
 				TreeModel ls;				
 				((ListStore)entryTreeView.Model).GetIter(
 					out selectedItem, (TreePath) entryTreeView.Selection.GetSelectedRows(out ls)[0]);
-				store.SetValue(selectedItem, 1, actionOptionMenu.History);
 				
 				int index = GetSelectedIndex(entryTreeView);
 				CombineExecuteDefinition edef = (CombineExecuteDefinition) store.GetValue(selectedItem, 2);
@@ -242,8 +255,6 @@
 
 			public bool Store()
 			{
-				//Menu singleMenu = (Menu) singleOptionMenu.Menu;
-				//MenuItem singleMenuItem = (MenuItem) singleMenu.Active;
 				combine.SingleStartProjectName = ((CombineEntry)combine.Entries[singleOptionMenu.History]).Name;
 				combine.SingleStartupProject   = singleRadioButton.Active;