[Monodevelop-patches-list] r2176 - in trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding: . Gui

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

Author: jluke
Date: 2005-01-26 23:38:02 -0500 (Wed, 26 Jan 2005)
New Revision: 2176

Modified:
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharp.glade
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Gui/CodeGenerationPanel.cs
Log:
use ComboBox instead of OptionMenu


Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharp.glade
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharp.glade	2005-01-27 04:02:50 UTC (rev 2175)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharp.glade	2005-01-27 04:38:02 UTC (rev 2176)
@@ -100,7 +100,6 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
-		      <property name="mnemonic_widget">CompileTargetOptionMenu</property>
 		    </widget>
 		    <packing>
 		      <property name="left_attach">0</property>
@@ -205,10 +204,8 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkOptionMenu" id="CompileTargetOptionMenu">
+		    <widget class="GtkComboBox" id="compileTargetCombo">
 		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="history">-1</property>
 		    </widget>
 		    <packing>
 		      <property name="left_attach">1</property>
@@ -216,7 +213,7 @@
 		      <property name="top_attach">0</property>
 		      <property name="bottom_attach">1</property>
 		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
+		      <property name="y_options">fill</property>
 		    </packing>
 		  </child>
 		</widget>

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog	2005-01-27 04:02:50 UTC (rev 2175)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog	2005-01-27 04:38:02 UTC (rev 2176)
@@ -1,6 +1,8 @@
 2005-01-27  John Luke  <john.luke at gmail.com>
 
 	* CSharp.glade: update to new glade format
+	* Gui/CodeGenerationPanel.cs:
+	* CSharp.glade: use ComboBox instead of OptionMenu
 
 2005-01-26  John Luke  <john.luke at gmail.com>
 

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Gui/CodeGenerationPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Gui/CodeGenerationPanel.cs	2005-01-27 04:02:50 UTC (rev 2175)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Gui/CodeGenerationPanel.cs	2005-01-27 04:38:02 UTC (rev 2176)
@@ -22,9 +22,7 @@
 
 namespace CSharpBinding
 {
-
 	//FIXME: i8n 
-
 	public class CodeGenerationPanel : AbstractOptionPanel
 	{
 
@@ -35,7 +33,7 @@
 			//
  			[Glade.Widget] Entry symbolsEntry;
  			[Glade.Widget] Entry mainClassEntry;
-			[Glade.Widget] OptionMenu CompileTargetOptionMenu;
+			[Glade.Widget] ComboBox compileTargetCombo;
  			[Glade.Widget] CheckButton generateOverflowChecksCheckButton;
 			[Glade.Widget] CheckButton allowUnsafeCodeCheckButton;
  			[Glade.Widget] CheckButton enableOptimizationCheckButton;
@@ -56,25 +54,20 @@
  			public  CodeGenerationPanelWidget(IProperties CustomizationObject) : base ("CSharp.glade", "CodeGenerationPanel")
  			{	
 				configuration = (DotNetProjectConfiguration)((IProperties)CustomizationObject).GetProperty("Config");
-				
 				compilerParameters = (CSharpCompilerParameters) configuration.CompilationParameters;
 				
 				// FIXME: Enable when mcs has this feature
 				generateXmlOutputCheckButton.Sensitive = false;
 
-				Menu CompileTargetMenu = new Menu ();
-				CompileTargetMenu.Append(new MenuItem(GettextCatalog.GetString ("Executable")));
+				ListStore store = new ListStore (typeof (string));
+				store.AppendValues (GettextCatalog.GetString ("Executable"));
+				store.AppendValues (GettextCatalog.GetString ("Library"));
+				compileTargetCombo.Model = store;
+				CellRendererText cr = new CellRendererText ();
+				compileTargetCombo.PackStart (cr, true);
+				compileTargetCombo.AddAttribute (cr, "text", 0);
+				compileTargetCombo.Active = (int) configuration.CompileTarget;
 
-				CompileTargetMenu.Append(new MenuItem(GettextCatalog.GetString ("Library")));
-				// FIXME commented until the Module capability is ported
-// 				CompileTargetMenu.Append(new MenuItem(
-// 								 StringParserService.Parse(
-// 									 "${res:Dialog.Options.PrjOptions.Configuration.CompileTarget.Module}")));
-
-				CompileTargetOptionMenu.Menu = CompileTargetMenu;
-				CompileTargetOptionMenu.SetHistory ( (uint) configuration.CompileTarget);
-
-
 				symbolsEntry.Text = compilerParameters.DefineSymbols;
 				mainClassEntry.Text = compilerParameters.MainClass;
 
@@ -92,7 +85,7 @@
 				if (compilerParameters == null) {
 					return true;
 				}
-				configuration.CompileTarget =  (CompileTarget)  CompileTargetOptionMenu.History;
+				configuration.CompileTarget =  (CompileTarget) compileTargetCombo.Active;
 				compilerParameters.DefineSymbols =  symbolsEntry.Text;
 				compilerParameters.MainClass     =  mainClassEntry.Text;