Author: lluis
Date: 2007-11-19 18:43:49 -0500 (Mon, 19 Nov 2007)
New Revision: 89950

Modified:
   trunk/monodevelop/Extras/JavaBinding/ChangeLog
   trunk/monodevelop/Extras/JavaBinding/Gui/GlobalOptionsPanel.cs
   trunk/monodevelop/Extras/JavaBinding/Gui/ProjectConfigurationPropertyPanel.cs
   trunk/monodevelop/Extras/JavaBinding/JavaBinding.mdp
   trunk/monodevelop/Extras/JavaBinding/Makefile.am
Log:
* Gui/GlobalOptionsPanel.cs, Gui/ProjectConfigurationPropertyPanel.cs,
  JavaBinding.mdp, Makefile.am: Migrated to Stetic.

Modified: trunk/monodevelop/Extras/JavaBinding/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/JavaBinding/ChangeLog      2007-11-19 23:43:10 UTC 
(rev 89949)
+++ trunk/monodevelop/Extras/JavaBinding/ChangeLog      2007-11-19 23:43:49 UTC 
(rev 89950)
@@ -1,3 +1,8 @@
+2007-11-20  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
+
+       * Gui/GlobalOptionsPanel.cs, Gui/ProjectConfigurationPropertyPanel.cs,
+         JavaBinding.mdp, Makefile.am: Migrated to Stetic.
+
 2007-11-15  Mike Krüger <[EMAIL PROTECTED]> 
 
        * JavaBindingCompilerServices.cs, JavaLanguageBinding.cs,

Modified: trunk/monodevelop/Extras/JavaBinding/Gui/GlobalOptionsPanel.cs
===================================================================
--- trunk/monodevelop/Extras/JavaBinding/Gui/GlobalOptionsPanel.cs      
2007-11-19 23:43:10 UTC (rev 89949)
+++ trunk/monodevelop/Extras/JavaBinding/Gui/GlobalOptionsPanel.cs      
2007-11-19 23:43:49 UTC (rev 89950)
@@ -11,45 +11,6 @@
 {
        public class GlobalOptionsPanelPanel : AbstractOptionPanel
        {
-               class GlobalOptionsPanelWidget : GladeWidgetExtract 
-               {
-                       //
-                       // Gtk Controls 
-                       //
-                       [Glade.Widget] Gnome.FileEntry ikvmPathEntry;
-                       [Glade.Widget] Entry compilerPathEntry;
-                       [Glade.Widget] Entry classpathEntry;
-                       [Glade.Widget] ComboBox compilerCombo;
-                       
-                       // compiler chooser
-                       
-                       public GlobalOptionsPanelWidget () : base 
("Java.glade", "GlobalOptionsPanel")
-                       {
-                               ListStore store = new ListStore (typeof 
(string));
-                               store.AppendValues (GettextCatalog.GetString 
("Javac"));
-                               store.AppendValues (GettextCatalog.GetString 
("Gcj"));
-                               compilerCombo.Model = store;
-                               CellRendererText cr = new CellRendererText ();
-                               compilerCombo.PackStart (cr, true);
-                               compilerCombo.AddAttribute (cr, "text", 0);
-                               compilerCombo.Active = (int) 
JavaLanguageBinding.Properties.CompilerType;
-                               
-                               ikvmPathEntry.Filename = 
JavaLanguageBinding.Properties.IkvmPath;
-                               compilerPathEntry.Text = 
JavaLanguageBinding.Properties.CompilerCommand;
-                               classpathEntry.Text = 
JavaLanguageBinding.Properties.Classpath;
-                       }
-                       
-                       public bool Store ()
-                       {
-                               JavaLanguageBinding.Properties.IkvmPath = 
ikvmPathEntry.Filename;
-                               JavaLanguageBinding.Properties.CompilerCommand 
= compilerPathEntry.Text;
-                               JavaLanguageBinding.Properties.Classpath = 
classpathEntry.Text;
-                               
-                               JavaLanguageBinding.Properties.CompilerType = 
(JavaCompiler) compilerCombo.Active;
-                               return true;
-                       }
-               }
-
                GlobalOptionsPanelWidget widget;
                
                public override void LoadPanelContents()
@@ -64,4 +25,35 @@
                        return result;
                }
        }
+
+       partial class GlobalOptionsPanelWidget : Gtk.Bin 
+       {
+               public GlobalOptionsPanelWidget ()
+               {
+                       Build ();
+                       
+                       ListStore store = new ListStore (typeof (string));
+                       store.AppendValues (GettextCatalog.GetString ("Javac"));
+                       store.AppendValues (GettextCatalog.GetString ("Gcj"));
+                       compilerCombo.Model = store;
+                       CellRendererText cr = new CellRendererText ();
+                       compilerCombo.PackStart (cr, true);
+                       compilerCombo.AddAttribute (cr, "text", 0);
+                       compilerCombo.Active = (int) 
JavaLanguageBinding.Properties.CompilerType;
+                       
+                       ikvmPathEntry.Path = 
JavaLanguageBinding.Properties.IkvmPath;
+                       compilerPathEntry.Text = 
JavaLanguageBinding.Properties.CompilerCommand;
+                       classpathEntry.Text = 
JavaLanguageBinding.Properties.Classpath;
+               }
+               
+               public bool Store ()
+               {
+                       JavaLanguageBinding.Properties.IkvmPath = 
ikvmPathEntry.Path;
+                       JavaLanguageBinding.Properties.CompilerCommand = 
compilerPathEntry.Text;
+                       JavaLanguageBinding.Properties.Classpath = 
classpathEntry.Text;
+                       
+                       JavaLanguageBinding.Properties.CompilerType = 
(JavaCompiler) compilerCombo.Active;
+                       return true;
+               }
+       }
 }

Modified: 
trunk/monodevelop/Extras/JavaBinding/Gui/ProjectConfigurationPropertyPanel.cs
===================================================================
--- 
trunk/monodevelop/Extras/JavaBinding/Gui/ProjectConfigurationPropertyPanel.cs   
    2007-11-19 23:43:10 UTC (rev 89949)
+++ 
trunk/monodevelop/Extras/JavaBinding/Gui/ProjectConfigurationPropertyPanel.cs   
    2007-11-19 23:43:49 UTC (rev 89950)
@@ -30,96 +30,6 @@
 {
        public class ProjectConfigurationPropertyPanel : AbstractOptionPanel
        {
-               class CodeGenerationPanelWidget : GladeWidgetExtract 
-               {
-                       //
-                       // Gtk Controls 
-                       //
-                       [Glade.Widget] Entry symbolsEntry;
-                       [Glade.Widget] Entry mainClassEntry;
-                       [Glade.Widget] Entry compilerEntry;
-                       [Glade.Widget] Entry classPathEntry;
-                       [Glade.Widget] ComboBox compileTargetCombo;
-                       [Glade.Widget] CheckButton generateWarningsCheckButton;
-                       [Glade.Widget] CheckButton deprecationCheckButton;
-                       [Glade.Widget] CheckButton 
enableOptimizationCheckButton;
-                       [Glade.Widget] CheckButton warningsAsErrorsCheckButton;
-                       [Glade.Widget] CheckButton 
generateDebugInformationCheckButton;
-                       [Glade.Widget] RadioButton compilerGcjButton;
-                       [Glade.Widget] RadioButton compilerJavacButton;
-                       
-                       // compiler chooser
-                       
-                       JavaCompilerParameters compilerParameters = null;
-                       DotNetProjectConfiguration configuration;
-                       
-                       public CodeGenerationPanelWidget (Properties 
CustomizationObject) : base ("Java.glade", "CodeGenerationPanel")
-                       {       
-                               configuration = 
((Properties)CustomizationObject).Get<DotNetProjectConfiguration> ("Config");
-                               compilerParameters = (JavaCompilerParameters) 
configuration.CompilationParameters;
-                               
-                               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;
-
-                               if (compilerParameters.Compiler == 
JavaCompiler.Javac)
-                                       compilerJavacButton.Active = true;
-                               else
-                                       compilerGcjButton.Active = true;
-                                       
-                               compilerJavacButton.Toggled += new EventHandler 
(OnCompilerToggled);
-                               compilerGcjButton.Toggled += new EventHandler 
(OnCompilerToggled);
-       
-                               enableOptimizationCheckButton.Active = 
compilerParameters.Optimize;
-                               generateDebugInformationCheckButton.Active = 
configuration.DebugMode;
-                               deprecationCheckButton.Active = 
compilerParameters.Deprecation;
-                               generateWarningsCheckButton.Active = 
compilerParameters.GenWarnings;
-                               warningsAsErrorsCheckButton.Active = 
!configuration.RunWithWarnings;
-                               
-                               compilerEntry.Text = 
compilerParameters.CompilerPath;
-                               classPathEntry.Text = 
compilerParameters.ClassPath;                             
-                               mainClassEntry.Text = 
compilerParameters.MainClass;                             
-                               symbolsEntry.Text = 
compilerParameters.DefineSymbols;                           
-                       }
-                       
-                       void OnCompilerToggled (object o, EventArgs args)
-                       {
-                               if (compilerJavacButton.Active)
-                                       compilerEntry.Text = "javac";
-                               else
-                                       compilerEntry.Text = "gcj";
-                       }
-                       
-                       public bool Store ()
-                       {
-                               if (compilerParameters == null)
-                                       return true;
-
-                               if (compilerJavacButton.Active)
-                                       compilerParameters.Compiler = 
JavaCompiler.Javac;
-                               else
-                                       compilerParameters.Compiler = 
JavaCompiler.Gcj;
-
-                               configuration.CompileTarget = (CompileTarget) 
compileTargetCombo.Active;
-                               compilerParameters.GenWarnings = 
generateWarningsCheckButton.Active;                    
-                               compilerParameters.Deprecation = 
deprecationCheckButton.Active;                 
-                               configuration.DebugMode = 
generateDebugInformationCheckButton.Active;                   
-                               compilerParameters.Optimize = 
enableOptimizationCheckButton.Active;
-                               configuration.RunWithWarnings = 
!warningsAsErrorsCheckButton.Active;
-                               
-                               compilerParameters.CompilerPath = 
compilerEntry.Text;
-                               compilerParameters.ClassPath = 
classPathEntry.Text;
-                               compilerParameters.MainClass = 
mainClassEntry.Text;
-                               compilerParameters.DefineSymbols = 
symbolsEntry.Text;
-                               return true;
-                       }
-               }
-
                CodeGenerationPanelWidget widget;
                
                public override void LoadPanelContents()
@@ -134,4 +44,80 @@
                        return result;
                }
        }
+
+       partial class CodeGenerationPanelWidget : Gtk.Bin 
+       {
+               JavaCompilerParameters compilerParameters = null;
+               DotNetProjectConfiguration configuration;
+               
+               public CodeGenerationPanelWidget (Properties 
CustomizationObject)
+               {       
+                       Build ();
+                       
+                       configuration = 
((Properties)CustomizationObject).Get<DotNetProjectConfiguration> ("Config");
+                       compilerParameters = (JavaCompilerParameters) 
configuration.CompilationParameters;
+                       
+                       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;
+
+                       if (compilerParameters.Compiler == JavaCompiler.Javac)
+                               compilerJavacButton.Active = true;
+                       else
+                               compilerGcjButton.Active = true;
+                               
+                       compilerJavacButton.Toggled += new EventHandler 
(OnCompilerToggled);
+                       compilerGcjButton.Toggled += new EventHandler 
(OnCompilerToggled);
+
+                       enableOptimizationCheckButton.Active = 
compilerParameters.Optimize;
+                       generateDebugInformationCheckButton.Active = 
configuration.DebugMode;
+                       deprecationCheckButton.Active = 
compilerParameters.Deprecation;
+                       generateWarningsCheckButton.Active = 
compilerParameters.GenWarnings;
+                       warningsAsErrorsCheckButton.Active = 
!configuration.RunWithWarnings;
+                       
+                       compilerEntry.Text = compilerParameters.CompilerPath;
+                       classPathEntry.Text = compilerParameters.ClassPath;     
                        
+                       mainClassEntry.Text = compilerParameters.MainClass;     
                        
+                       symbolsEntry.Text = compilerParameters.DefineSymbols;   
+                       OnCompilerToggled (null, null);
+               }
+               
+               void OnCompilerToggled (object o, EventArgs args)
+               {
+                       if (compilerJavacButton.Active)
+                               compilerEntry.Text = "javac";
+                       else
+                               compilerEntry.Text = "gcj";
+               }
+               
+               public bool Store ()
+               {
+                       if (compilerParameters == null)
+                               return true;
+
+                       if (compilerJavacButton.Active)
+                               compilerParameters.Compiler = 
JavaCompiler.Javac;
+                       else
+                               compilerParameters.Compiler = JavaCompiler.Gcj;
+
+                       configuration.CompileTarget = (CompileTarget) 
compileTargetCombo.Active;
+                       compilerParameters.GenWarnings = 
generateWarningsCheckButton.Active;                    
+                       compilerParameters.Deprecation = 
deprecationCheckButton.Active;                 
+                       configuration.DebugMode = 
generateDebugInformationCheckButton.Active;                   
+                       compilerParameters.Optimize = 
enableOptimizationCheckButton.Active;
+                       configuration.RunWithWarnings = 
!warningsAsErrorsCheckButton.Active;
+                       
+                       compilerParameters.CompilerPath = compilerEntry.Text;
+                       compilerParameters.ClassPath = classPathEntry.Text;
+                       compilerParameters.MainClass = mainClassEntry.Text;
+                       compilerParameters.DefineSymbols = symbolsEntry.Text;
+                       return true;
+               }
+       }
+
 }

Modified: trunk/monodevelop/Extras/JavaBinding/JavaBinding.mdp
===================================================================
--- trunk/monodevelop/Extras/JavaBinding/JavaBinding.mdp        2007-11-19 
23:43:10 UTC (rev 89949)
+++ trunk/monodevelop/Extras/JavaBinding/JavaBinding.mdp        2007-11-19 
23:43:49 UTC (rev 89950)
@@ -39,10 +39,12 @@
     <File name="JavaBinding.addin.xml" subtype="Code" 
buildaction="EmbedAsResource" />
     <File name="icons/java-icon-32.png" subtype="Code" 
buildaction="EmbedAsResource" />
     <File name="IKVMCompilerManager.cs" subtype="Code" buildaction="Compile" />
+    <File name="gtk-gui/gui.stetic" subtype="Code" 
buildaction="EmbedAsResource" />
+    <File name="gtk-gui/generated.cs" subtype="Code" buildaction="Compile" />
+    <File name="gtk-gui/JavaBinding.GlobalOptionsPanelWidget.cs" 
subtype="Code" buildaction="Compile" />
+    <File name="gtk-gui/JavaBinding.CodeGenerationPanelWidget.cs" 
subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
-    <ProjectReference type="Gac" localcopy="False" refto="gnome-sharp, 
Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="False" refto="glade-sharp, 
Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Project" localcopy="False" 
refto="MonoDevelop.Core" />
     <ProjectReference type="Project" localcopy="False" 
refto="MonoDevelop.Components" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Ide" 
/>
@@ -55,7 +57,11 @@
     <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Gac" localcopy="True" refto="System.Drawing, 
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    <ProjectReference type="Gac" localcopy="True" refto="gnome-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="glade-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, 
Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
   </References>
+  <GtkDesignInfo gtkVersion="2.8.3" />
   <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" 
RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" 
SyncReferences="True" IsAutotoolsProject="True" 
RelativeConfigureInPath="../../">
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar />

Modified: trunk/monodevelop/Extras/JavaBinding/Makefile.am
===================================================================
--- trunk/monodevelop/Extras/JavaBinding/Makefile.am    2007-11-19 23:43:10 UTC 
(rev 89949)
+++ trunk/monodevelop/Extras/JavaBinding/Makefile.am    2007-11-19 23:43:49 UTC 
(rev 89950)
@@ -10,11 +10,15 @@
        -r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
        -r:$(top_builddir)/build/bin/MonoDevelop.Ide.dll \
        -r:$(top_builddir)/build/bin/MonoDevelop.Projects.dll \
+       -r:Mono.Posix \
        -r:System \
        -r:System.Drawing \
        -r:System.Xml
 
 FILES =  \
+       gtk-gui/generated.cs \
+       gtk-gui/JavaBinding.CodeGenerationPanelWidget.cs \
+       gtk-gui/JavaBinding.GlobalOptionsPanelWidget.cs \
        Gui/GlobalOptionsPanel.cs \
        Gui/ProjectConfigurationPropertyPanel.cs \
        IKVMCompilerManager.cs \
@@ -23,6 +27,7 @@
        Project/JavaCompilerParameters.cs
 
 RES =  \
+       gtk-gui/gui.stetic \
        icons/Java.FileIcon \
        icons/java-icon-32.png \
        Java.glade \

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to