Created
September 28, 2008 22:35
-
-
Save chergert/13514 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: Gui/CodeGenerationPanel.cs | |
=================================================================== | |
--- Gui/CodeGenerationPanel.cs (revision 25) | |
+++ Gui/CodeGenerationPanel.cs (working copy) | |
@@ -29,7 +29,7 @@ | |
using MonoDevelop.Projects.Gui.Dialogs; | |
using MonoDevelop.Core; | |
using Mono.Addins; | |
-using MonoDevelop.Projects.Parser; | |
+using MonoDevelop.Projects.Dom.Parser; | |
using MonoDevelop.Ide.Gui; | |
using Gtk; | |
Index: Gui/CompilerOptionsPanelWidget.cs | |
=================================================================== | |
--- Gui/CompilerOptionsPanelWidget.cs (revision 25) | |
+++ Gui/CompilerOptionsPanelWidget.cs (working copy) | |
@@ -27,7 +27,7 @@ | |
using MonoDevelop.Core; | |
using MonoDevelop.Core.Gui; | |
using MonoDevelop.Projects; | |
-using MonoDevelop.Projects.Parser; | |
+using MonoDevelop.Projects.Dom.Parser; | |
using MonoDevelop.Projects.Text; | |
using MonoDevelop.Projects.Gui.Dialogs; | |
Index: FSharpLanguageBinding.cs | |
=================================================================== | |
--- FSharpLanguageBinding.cs (revision 25) | |
+++ FSharpLanguageBinding.cs (working copy) | |
@@ -31,7 +31,7 @@ | |
using System.Threading; | |
using MonoDevelop.Projects; | |
-using MonoDevelop.Projects.Parser; | |
+using MonoDevelop.Projects.Dom.Parser; | |
using MonoDevelop.Projects.CodeGeneration; | |
using MonoDevelop.Core; | |
Index: gtk-gui/FSharpBinding.GlobalOptionsPanelWidget.cs | |
=================================================================== | |
--- gtk-gui/FSharpBinding.GlobalOptionsPanelWidget.cs (revision 25) | |
+++ gtk-gui/FSharpBinding.GlobalOptionsPanelWidget.cs (working copy) | |
@@ -1,7 +1,7 @@ | |
// ------------------------------------------------------------------------------ | |
// <autogenerated> | |
// This code was generated by a tool. | |
-// Mono Runtime Version: 2.0.50727.42 | |
+// Mono Runtime Version: 2.0.50727.1433 | |
// | |
// Changes to this file may cause incorrect behavior and will be lost if | |
// the code is regenerated. | |
@@ -70,14 +70,13 @@ | |
this.label100 = new Gtk.Label(); | |
this.label100.WidthRequest = 18; | |
this.label100.Name = "label100"; | |
- this.label100.LabelProp = ""; | |
this.hbox63.Add(this.label100); | |
Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.hbox63[this.label100])); | |
w2.Position = 0; | |
w2.Expand = false; | |
w2.Fill = false; | |
// Container child hbox63.Gtk.Box+BoxChild | |
- this.table9 = new Gtk.Table(((uint)(1)), ((uint)(2)), false); | |
+ this.table9 = new Gtk.Table(((uint)(3)), ((uint)(2)), false); | |
this.table9.Name = "table9"; | |
this.table9.RowSpacing = ((uint)(6)); | |
this.table9.ColumnSpacing = ((uint)(6)); | |
@@ -113,7 +112,6 @@ | |
// Container child hbox3.Gtk.Box+BoxChild | |
this.label2 = new Gtk.Label(); | |
this.label2.Name = "label2"; | |
- this.label2.LabelProp = ""; | |
this.hbox3.Add(this.label2); | |
Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.hbox3[this.label2])); | |
w7.Position = 0; | |
Index: gtk-gui/generated.cs | |
=================================================================== | |
--- gtk-gui/generated.cs (revision 25) | |
+++ gtk-gui/generated.cs (working copy) | |
@@ -1,7 +1,7 @@ | |
// ------------------------------------------------------------------------------ | |
// <autogenerated> | |
// This code was generated by a tool. | |
-// Mono Runtime Version: 2.0.50727.42 | |
+// Mono Runtime Version: 2.0.50727.1433 | |
// | |
// Changes to this file may cause incorrect behavior and will be lost if | |
// the code is regenerated. | |
Index: gtk-gui/FSharpBinding.CodeGenerationPanelWidget.cs | |
=================================================================== | |
--- gtk-gui/FSharpBinding.CodeGenerationPanelWidget.cs (revision 25) | |
+++ gtk-gui/FSharpBinding.CodeGenerationPanelWidget.cs (working copy) | |
@@ -1,7 +1,7 @@ | |
// ------------------------------------------------------------------------------ | |
// <autogenerated> | |
// This code was generated by a tool. | |
-// Mono Runtime Version: 2.0.50727.42 | |
+// Mono Runtime Version: 2.0.50727.1433 | |
// | |
// Changes to this file may cause incorrect behavior and will be lost if | |
// the code is regenerated. | |
@@ -93,7 +93,6 @@ | |
this.label81 = new Gtk.Label(); | |
this.label81.WidthRequest = 18; | |
this.label81.Name = "label81"; | |
- this.label81.LabelProp = ""; | |
this.hbox56.Add(this.label81); | |
Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.hbox56[this.label81])); | |
w2.Position = 0; | |
@@ -196,7 +195,6 @@ | |
this.label73 = new Gtk.Label(); | |
this.label73.WidthRequest = 18; | |
this.label73.Name = "label73"; | |
- this.label73.LabelProp = ""; | |
this.hbox48.Add(this.label73); | |
Gtk.Box.BoxChild w12 = ((Gtk.Box.BoxChild)(this.hbox48[this.label73])); | |
w12.Position = 0; | |
@@ -287,7 +285,6 @@ | |
this.label74 = new Gtk.Label(); | |
this.label74.WidthRequest = 18; | |
this.label74.Name = "label74"; | |
- this.label74.LabelProp = ""; | |
this.hbox5.Add(this.label74); | |
Gtk.Box.BoxChild w21 = ((Gtk.Box.BoxChild)(this.hbox5[this.label74])); | |
w21.Position = 0; | |
Index: gtk-gui/FSharpBinding.CompilerOptionsPanelWidget.cs | |
=================================================================== | |
--- gtk-gui/FSharpBinding.CompilerOptionsPanelWidget.cs (revision 25) | |
+++ gtk-gui/FSharpBinding.CompilerOptionsPanelWidget.cs (working copy) | |
@@ -1,7 +1,7 @@ | |
// ------------------------------------------------------------------------------ | |
// <autogenerated> | |
// This code was generated by a tool. | |
-// Mono Runtime Version: 2.0.50727.42 | |
+// Mono Runtime Version: 2.0.50727.1433 | |
// | |
// Changes to this file may cause incorrect behavior and will be lost if | |
// the code is regenerated. | |
@@ -71,7 +71,6 @@ | |
this.label76 = new Gtk.Label(); | |
this.label76.WidthRequest = 18; | |
this.label76.Name = "label76"; | |
- this.label76.LabelProp = ""; | |
this.hbox5.Add(this.label76); | |
Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.hbox5[this.label76])); | |
w2.Position = 0; | |
@@ -158,7 +157,6 @@ | |
this.label75 = new Gtk.Label(); | |
this.label75.WidthRequest = 18; | |
this.label75.Name = "label75"; | |
- this.label75.LabelProp = ""; | |
this.vbox1.Add(this.label75); | |
Gtk.Box.BoxChild w12 = ((Gtk.Box.BoxChild)(this.vbox1[this.label75])); | |
w12.PackType = ((Gtk.PackType)(1)); | |
@@ -171,7 +169,6 @@ | |
this.label74 = new Gtk.Label(); | |
this.label74.WidthRequest = 18; | |
this.label74.Name = "label74"; | |
- this.label74.LabelProp = ""; | |
this.hbox7.Add(this.label74); | |
Gtk.Box.BoxChild w13 = ((Gtk.Box.BoxChild)(this.hbox7[this.label74])); | |
w13.Position = 0; | |
Index: gtk-gui/gui.stetic | |
=================================================================== | |
--- gtk-gui/gui.stetic (revision 25) | |
+++ gtk-gui/gui.stetic (working copy) | |
@@ -2,13 +2,16 @@ | |
<stetic-interface> | |
<configuration> | |
<images-root-path>..</images-root-path> | |
- <target-gtk-version>2.12.0</target-gtk-version> | |
+ <target-gtk-version>2.12.2</target-gtk-version> | |
</configuration> | |
<import> | |
- <widget-library name="../../monodevelop/main/build/bin/MonoDevelop.Components.dll" /> | |
- <widget-library name="../../monodevelop/main/build/bin/MonoDevelop.Ide.dll" /> | |
- <widget-library name="../../monodevelop/main/build/bin/MonoDevelop.Projects.Gui.dll" /> | |
- <widget-library name="../build/MonoDevelop.FSharpBinding.dll" internal="true" /> | |
+ <widget-library name="MonoDevelop.Components, Version=1.9.0.0, Culture=neutral" /> | |
+ <widget-library name="MonoDevelop.Core.Gui, Version=1.9.0.0, Culture=neutral" /> | |
+ <widget-library name="MonoDevelop.Gettext, Version=1.0.0.0, Culture=neutral" /> | |
+ <widget-library name="MonoDevelop.GtkCore, Version=0.0.0.0, Culture=neutral" /> | |
+ <widget-library name="MonoDevelop.Ide, Version=1.9.0.0, Culture=neutral" /> | |
+ <widget-library name="MonoDevelop.Projects.Gui, Version=1.9.0.0, Culture=neutral" /> | |
+ <widget-library name="../../MonoDevelop/main/build/AddIns/BackendBindings/MonoDevelop.FSharpBinding.dll" internal="true" /> | |
</import> | |
<widget class="Gtk.Bin" id="FSharpBinding.CodeGenerationPanelWidget" design-size="365 448"> | |
<property name="MemberName" /> | |
@@ -39,7 +42,6 @@ | |
<widget class="Gtk.Label" id="label81"> | |
<property name="MemberName" /> | |
<property name="WidthRequest">18</property> | |
- <property name="LabelProp" translatable="yes" /> | |
</widget> | |
<packing> | |
<property name="Position">0</property> | |
@@ -176,7 +178,6 @@ | |
<widget class="Gtk.Label" id="label73"> | |
<property name="MemberName" /> | |
<property name="WidthRequest">18</property> | |
- <property name="LabelProp" translatable="yes" /> | |
</widget> | |
<packing> | |
<property name="Position">0</property> | |
@@ -297,7 +298,6 @@ | |
<widget class="Gtk.Label" id="label74"> | |
<property name="MemberName" /> | |
<property name="WidthRequest">18</property> | |
- <property name="LabelProp" translatable="yes" /> | |
</widget> | |
<packing> | |
<property name="Position">0</property> | |
@@ -381,7 +381,6 @@ | |
<widget class="Gtk.Label" id="label76"> | |
<property name="MemberName" /> | |
<property name="WidthRequest">18</property> | |
- <property name="LabelProp" translatable="yes" /> | |
</widget> | |
<packing> | |
<property name="Position">0</property> | |
@@ -528,7 +527,6 @@ | |
<widget class="Gtk.Label" id="label75"> | |
<property name="MemberName" /> | |
<property name="WidthRequest">18</property> | |
- <property name="LabelProp" translatable="yes" /> | |
</widget> | |
<packing> | |
<property name="PackType">End</property> | |
@@ -544,7 +542,6 @@ | |
<widget class="Gtk.Label" id="label74"> | |
<property name="MemberName" /> | |
<property name="WidthRequest">18</property> | |
- <property name="LabelProp" translatable="yes" /> | |
</widget> | |
<packing> | |
<property name="Position">0</property> | |
@@ -593,7 +590,6 @@ | |
<widget class="Gtk.Label" id="label100"> | |
<property name="MemberName" /> | |
<property name="WidthRequest">18</property> | |
- <property name="LabelProp" translatable="yes" /> | |
</widget> | |
<packing> | |
<property name="Position">0</property> | |
@@ -605,11 +601,23 @@ | |
<child> | |
<widget class="Gtk.Table" id="table9"> | |
<property name="MemberName" /> | |
- <property name="NRows">1</property> | |
+ <property name="NRows">3</property> | |
<property name="NColumns">2</property> | |
<property name="RowSpacing">6</property> | |
<property name="ColumnSpacing">6</property> | |
<child> | |
+ <placeholder /> | |
+ </child> | |
+ <child> | |
+ <placeholder /> | |
+ </child> | |
+ <child> | |
+ <placeholder /> | |
+ </child> | |
+ <child> | |
+ <placeholder /> | |
+ </child> | |
+ <child> | |
<widget class="MonoDevelop.Components.FolderEntry" id="fscPathEntry"> | |
<property name="MemberName" /> | |
</widget> | |
@@ -665,7 +673,6 @@ | |
<child> | |
<widget class="Gtk.Label" id="label2"> | |
<property name="MemberName" /> | |
- <property name="LabelProp" translatable="yes" /> | |
</widget> | |
<packing> | |
<property name="Position">0</property> | |
Index: FSharpBinding.mdp | |
=================================================================== | |
--- FSharpBinding.mdp (revision 25) | |
+++ FSharpBinding.mdp (working copy) | |
@@ -44,19 +44,22 @@ | |
<ProjectReference type="Gac" localcopy="False" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> | |
<ProjectReference type="Gac" localcopy="False" refto="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> | |
<ProjectReference type="Gac" localcopy="False" refto="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> | |
- <ProjectReference type="Assembly" localcopy="False" refto="../../../../Library/Frameworks/Mono.framework/Versions/Current/lib/mono/mono-addins/Mono.Addins.dll" /> | |
- <ProjectReference type="Assembly" localcopy="False" refto="../../../../Library/Frameworks/Mono.framework/Versions/Current/lib/mono/gtk-sharp-2.0/gtk-sharp.dll" /> | |
- <ProjectReference type="Assembly" localcopy="False" refto="../../../../Library/Frameworks/Mono.framework/Versions/Current/lib/mono/gtk-sharp-2.0/gdk-sharp.dll" /> | |
- <ProjectReference type="Assembly" localcopy="False" refto="../../../../Library/Frameworks/Mono.framework/Versions/Current/lib/mono/gtk-sharp-2.0/glib-sharp.dll" /> | |
+ <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Core, Version=1.9.0.0, Culture=neutral, PublicKeyToken=null" /> | |
+ <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Components, Version=1.9.0.0, Culture=neutral, PublicKeyToken=null" /> | |
+ <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Core.Gui, Version=1.9.0.0, Culture=neutral, PublicKeyToken=null" /> | |
+ <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Gettext, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" /> | |
+ <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.GtkCore, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" /> | |
+ <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Ide, Version=1.9.0.0, Culture=neutral, PublicKeyToken=null" /> | |
+ <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Projects, Version=1.9.0.0, Culture=neutral, PublicKeyToken=null" /> | |
+ <ProjectReference type="Gac" localcopy="True" refto="MonoDevelop.Projects.Gui, Version=1.9.0.0, Culture=neutral, PublicKeyToken=null" /> | |
+ <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> | |
+ <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> | |
<ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" /> | |
- <ProjectReference type="Assembly" localcopy="False" refto="../MonoDevelop/main/build/bin/MonoDevelop.Projects.dll" /> | |
- <ProjectReference type="Assembly" localcopy="False" refto="../MonoDevelop/main/build/bin/MonoDevelop.Projects.Gui.dll" /> | |
- <ProjectReference type="Assembly" localcopy="False" refto="../MonoDevelop/main/build/bin/MonoDevelop.Ide.dll" /> | |
- <ProjectReference type="Assembly" localcopy="False" refto="../MonoDevelop/main/build/bin/MonoDevelop.Core.dll" /> | |
- <ProjectReference type="Assembly" localcopy="False" refto="../MonoDevelop/main/build/bin/MonoDevelop.Core.Gui.dll" /> | |
- <ProjectReference type="Assembly" localcopy="False" refto="../MonoDevelop/main/build/bin/MonoDevelop.Components.dll" /> | |
+ <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> | |
+ <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" /> | |
</References> | |
<Deployment.LinuxDeployData generatePcFile="False" /> | |
+ <GtkDesignInfo /> | |
<MonoDevelop.Autotools.MakefileInfo RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../../../"> | |
<BuildFilesVar Sync="True" Name="FILES" /> | |
<DeployFilesVar /> | |
@@ -66,5 +69,4 @@ | |
<AsmRefVar Sync="True" Name="REFS" Prefix="-r:" /> | |
<ProjectRefVar Sync="True" Name="REFS" Prefix="-r:" /> | |
</MonoDevelop.Autotools.MakefileInfo> | |
- <GtkDesignInfo /> | |
</Project> | |
\ No newline at end of file |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment