diff options
author | iain holmes <iain@xamarin.com> | 2017-11-24 20:02:56 +0300 |
---|---|---|
committer | iain holmes <iain@xamarin.com> | 2018-03-29 12:49:43 +0300 |
commit | 50cfb60dfff75eab0c4c0c8b61c0d5928039d504 (patch) | |
tree | 8e77189627bd7dff843472f3b199959df3a778ed /main/src/addins/ILAsmBinding | |
parent | 968eb8bc3e9ef05aceca26054cca9e3c1c7f00d9 (diff) |
Remove stetic files, and make the autogenerated UI files the definitive version
Stop autogenerating files and in future any changes to the generated UI files
can be made in the CS code itself
Diffstat (limited to 'main/src/addins/ILAsmBinding')
-rw-r--r-- | main/src/addins/ILAsmBinding/Gui/ILAsmBinding.CompilerParametersPanelWidget.cs (renamed from main/src/addins/ILAsmBinding/gtk-gui/ILAsmBinding.CompilerParametersPanelWidget.cs) | 4 | ||||
-rw-r--r-- | main/src/addins/ILAsmBinding/ILAsmBinding.csproj | 8 | ||||
-rw-r--r-- | main/src/addins/ILAsmBinding/gtk-gui/generated.cs | 81 | ||||
-rw-r--r-- | main/src/addins/ILAsmBinding/gtk-gui/gui.stetic | 124 |
4 files changed, 4 insertions, 213 deletions
diff --git a/main/src/addins/ILAsmBinding/gtk-gui/ILAsmBinding.CompilerParametersPanelWidget.cs b/main/src/addins/ILAsmBinding/Gui/ILAsmBinding.CompilerParametersPanelWidget.cs index b73f09c547..7f0ad74236 100644 --- a/main/src/addins/ILAsmBinding/gtk-gui/ILAsmBinding.CompilerParametersPanelWidget.cs +++ b/main/src/addins/ILAsmBinding/Gui/ILAsmBinding.CompilerParametersPanelWidget.cs @@ -17,9 +17,9 @@ namespace ILAsmBinding protected virtual void Build () { - global::Stetic.Gui.Initialize (this); + MonoDevelop.Components.Gui.Initialize (this); // Widget ILAsmBinding.CompilerParametersPanelWidget - global::Stetic.BinContainer.Attach (this); + MonoDevelop.Components.BinContainer.Attach (this); this.Name = "ILAsmBinding.CompilerParametersPanelWidget"; // Container child ILAsmBinding.CompilerParametersPanelWidget.Gtk.Container+ContainerChild this.vbox1 = new global::Gtk.VBox (); diff --git a/main/src/addins/ILAsmBinding/ILAsmBinding.csproj b/main/src/addins/ILAsmBinding/ILAsmBinding.csproj index 38f3dcebf6..f62f71e238 100644 --- a/main/src/addins/ILAsmBinding/ILAsmBinding.csproj +++ b/main/src/addins/ILAsmBinding/ILAsmBinding.csproj @@ -83,19 +83,15 @@ <EmbeddedResource Include="ILAsmBinding.addin.xml"> <LogicalName>ILAsmBinding.addin.xml</LogicalName> </EmbeddedResource> - <EmbeddedResource Include="gtk-gui\gui.stetic"> - <LogicalName>gui.stetic</LogicalName> - </EmbeddedResource> </ItemGroup> <ItemGroup> <Compile Include="Project\ILAsmCompilerParameters.cs" /> <Compile Include="ILAsmCompilerManager.cs" /> <Compile Include="AssemblyInfo.cs" /> - <Compile Include="Gui\CompilerParametersPanelWidget.cs" /> - <Compile Include="gtk-gui\generated.cs" /> - <Compile Include="gtk-gui\ILAsmBinding.CompilerParametersPanelWidget.cs" /> <Compile Include="AddinInfo.cs" /> <Compile Include="ILAsmProject.cs" /> + <Compile Include="Gui\CompilerParametersPanelWidget.cs" /> + <Compile Include="Gui\ILAsmBinding.CompilerParametersPanelWidget.cs" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> </Project> diff --git a/main/src/addins/ILAsmBinding/gtk-gui/generated.cs b/main/src/addins/ILAsmBinding/gtk-gui/generated.cs deleted file mode 100644 index 75935e2e55..0000000000 --- a/main/src/addins/ILAsmBinding/gtk-gui/generated.cs +++ /dev/null @@ -1,81 +0,0 @@ - -// This file has been generated by the GUI designer. Do not modify. -namespace Stetic -{ - internal class Gui - { - private static bool initialized; - - internal static void Initialize (Gtk.Widget iconRenderer) - { - if ((Stetic.Gui.initialized == false)) { - Stetic.Gui.initialized = true; - } - } - } - - internal class BinContainer - { - private Gtk.Widget child; - private Gtk.UIManager uimanager; - - public static BinContainer Attach (Gtk.Bin bin) - { - BinContainer bc = new BinContainer (); - bin.SizeRequested += new Gtk.SizeRequestedHandler (bc.OnSizeRequested); - bin.SizeAllocated += new Gtk.SizeAllocatedHandler (bc.OnSizeAllocated); - bin.Added += new Gtk.AddedHandler (bc.OnAdded); - return bc; - } - - private void OnSizeRequested (object sender, Gtk.SizeRequestedArgs args) - { - if ((this.child != null)) { - args.Requisition = this.child.SizeRequest (); - } - } - - private void OnSizeAllocated (object sender, Gtk.SizeAllocatedArgs args) - { - if ((this.child != null)) { - this.child.Allocation = args.Allocation; - } - } - - private void OnAdded (object sender, Gtk.AddedArgs args) - { - this.child = args.Widget; - } - - public void SetUiManager (Gtk.UIManager uim) - { - this.uimanager = uim; - this.child.Realized += new System.EventHandler (this.OnRealized); - } - - private void OnRealized (object sender, System.EventArgs args) - { - if ((this.uimanager != null)) { - Gtk.Widget w; - w = this.child.Toplevel; - if (((w != null) && typeof(Gtk.Window).IsInstanceOfType (w))) { - ((Gtk.Window)(w)).AddAccelGroup (this.uimanager.AccelGroup); - this.uimanager = null; - } - } - } - } - - internal class ActionGroups - { - public static Gtk.ActionGroup GetActionGroup (System.Type type) - { - return Stetic.ActionGroups.GetActionGroup (type.FullName); - } - - public static Gtk.ActionGroup GetActionGroup (string name) - { - return null; - } - } -} diff --git a/main/src/addins/ILAsmBinding/gtk-gui/gui.stetic b/main/src/addins/ILAsmBinding/gtk-gui/gui.stetic deleted file mode 100644 index 20f8d4d595..0000000000 --- a/main/src/addins/ILAsmBinding/gtk-gui/gui.stetic +++ /dev/null @@ -1,124 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<stetic-interface> - <configuration> - <images-root-path>..</images-root-path> - <target-gtk-version>2.12</target-gtk-version> - </configuration> - <import> - <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" /> - <widget-library name="../../../../build/AddIns/BackendBindings/ILAsmBinding.dll" internal="true" /> - </import> - <widget class="Gtk.Bin" id="ILAsmBinding.CompilerParametersPanelWidget" design-size="340 110"> - <property name="MemberName" /> - <property name="Visible">False</property> - <property name="GeneratePublic">False</property> - <child> - <widget class="Gtk.VBox" id="vbox1"> - <property name="MemberName" /> - <property name="Spacing">6</property> - <child> - <widget class="Gtk.Frame" id="frame1"> - <property name="MemberName" /> - <property name="ShadowType">None</property> - <child> - <widget class="Gtk.Alignment" id="GtkAlignment"> - <property name="MemberName" /> - <property name="Xalign">0</property> - <property name="Yalign">0</property> - <property name="LeftPadding">12</property> - <child> - <widget class="Gtk.VBox" id="vbox3"> - <property name="MemberName" /> - <property name="Spacing">6</property> - <child> - <widget class="Gtk.HBox" id="hbox1"> - <property name="MemberName" /> - <property name="Spacing">6</property> - <child> - <widget class="Gtk.Label" id="label86"> - <property name="MemberName" /> - <property name="Xalign">0</property> - <property name="LabelProp" translatable="yes">Compile _Target:</property> - <property name="UseUnderline">True</property> - </widget> - <packing> - <property name="Position">0</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - <child> - <widget class="Gtk.HBox" id="hbox57"> - <property name="MemberName" /> - <child> - <widget class="Gtk.ComboBox" id="compileTargetCombo"> - <property name="MemberName" /> - <property name="IsTextCombo">False</property> - <property name="Items" /> - </widget> - <packing> - <property name="Position">0</property> - <property name="AutoSize">False</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="Position">1</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="Position">0</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - <child> - <widget class="Gtk.CheckButton" id="checkbuttonIncludeDebugInfo"> - <property name="MemberName" /> - <property name="CanFocus">True</property> - <property name="Label" translatable="yes">Include debug information</property> - <property name="DrawIndicator">True</property> - <property name="HasLabel">True</property> - <property name="UseUnderline">True</property> - </widget> - <packing> - <property name="Position">1</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - <child> - <widget class="Gtk.Label" id="GtkLabel1"> - <property name="MemberName" /> - <property name="LabelProp" translatable="yes"><b>Code Generation</b></property> - <property name="UseMarkup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="Position">0</property> - <property name="AutoSize">True</property> - <property name="Expand">False</property> - <property name="Fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> -</stetic-interface>
\ No newline at end of file |