From 920025c73b124cfb7011ec7e615ff75aa1a3f0a8 Mon Sep 17 00:00:00 2001 From: Ian Toal Date: Fri, 10 Jan 2020 20:01:56 +0000 Subject: Remove Stetic markup and generated files --- .../DotNetCoreRuntimeOptionsPanelWidget.Gui.cs | 4 +- ...GtkDotNetCoreProjectTemplateWizardPageWidget.cs | 136 ++++++++++++++- .../MonoDevelop.DotNetCore.csproj | 3 - ...GtkDotNetCoreProjectTemplateWizardPageWidget.cs | 138 ---------------- .../MonoDevelop.DotNetCore/gtk-gui/generated.cs | 88 ---------- .../MonoDevelop.DotNetCore/gtk-gui/gui.stetic | 183 --------------------- 6 files changed, 136 insertions(+), 416 deletions(-) delete mode 100644 main/src/addins/MonoDevelop.DotNetCore/gtk-gui/MonoDevelop.DotNetCore.Gui.GtkDotNetCoreProjectTemplateWizardPageWidget.cs delete mode 100644 main/src/addins/MonoDevelop.DotNetCore/gtk-gui/generated.cs delete mode 100644 main/src/addins/MonoDevelop.DotNetCore/gtk-gui/gui.stetic diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Gui/DotNetCoreRuntimeOptionsPanelWidget.Gui.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Gui/DotNetCoreRuntimeOptionsPanelWidget.Gui.cs index d10e41e58c..5467472836 100644 --- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Gui/DotNetCoreRuntimeOptionsPanelWidget.Gui.cs +++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Gui/DotNetCoreRuntimeOptionsPanelWidget.Gui.cs @@ -38,8 +38,8 @@ namespace MonoDevelop.DotNetCore.Gui void Build () { - Stetic.Gui.Initialize (this); - Stetic.BinContainer.Attach (this); + MonoDevelop.Components.Gui.Initialize (this); + MonoDevelop.Components.BinContainer.Attach (this); Name = "MonoDevelop.Ide.Projects.DotNetCoreRuntimeOptionsPanelWidget"; mainVBox = new VBox (); diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Gui/GtkDotNetCoreProjectTemplateWizardPageWidget.cs b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Gui/GtkDotNetCoreProjectTemplateWizardPageWidget.cs index c6927d5c76..8d0a2d02e8 100644 --- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Gui/GtkDotNetCoreProjectTemplateWizardPageWidget.cs +++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.Gui/GtkDotNetCoreProjectTemplateWizardPageWidget.cs @@ -24,11 +24,11 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -using System; -using System.Linq; +using System; using Gdk; using Gtk; using MonoDevelop.Components; +using MonoDevelop.Core; using MonoDevelop.Core.Assemblies; using MonoDevelop.DotNetCore.Templating; using MonoDevelop.Ide.Gui; @@ -43,6 +43,19 @@ namespace MonoDevelop.DotNetCore.Gui ImageView backgroundImageView; Xwt.Drawing.Image backgroundImage; + HBox mainHBox; + EventBox leftBorderEventBox; + VBox configurationVBox; + EventBox configurationTopEventBox; + EventBox configurationTableEventBox; + Table configurationTable; + ComboBox targetFrameworkComboBox; + Label targetFrameworkInformationLabel; + Label targetFrameworkLabel; + EventBox configurationBottomEventBox; + EventBox backgroundLargeImageEventBox; + VBox backgroundLargeImageVBox; + public GtkDotNetCoreProjectTemplateWizardPageWidget () { this.Build (); @@ -87,5 +100,124 @@ namespace MonoDevelop.DotNetCore.Gui { wizardPage.SelectedTargetFrameworkIndex = targetFrameworkComboBox.Active; } + + protected virtual void Build () + { + MonoDevelop.Components.Gui.Initialize (this); + BinContainer.Attach (this); + + Name = "MonoDevelop.DotNetCore.Gui.GtkDotNetCoreProjectTemplateWizardPageWidget"; + + mainHBox = new HBox (); + mainHBox.Name = "mainHBox"; + + leftBorderEventBox = new EventBox (); + leftBorderEventBox.WidthRequest = 30; + leftBorderEventBox.Name = "leftBorderEventBox"; + mainHBox.Add (leftBorderEventBox); + + var w1 = (Box.BoxChild)mainHBox [leftBorderEventBox]; + w1.Position = 0; + w1.Expand = false; + + configurationVBox = new VBox (); + configurationVBox.WidthRequest = 440; + configurationVBox.Name = "configurationVBox"; + + configurationTopEventBox = new EventBox (); + configurationTopEventBox.Name = "configurationTopEventBox"; + configurationVBox.Add (configurationTopEventBox); + + var w2 = (Box.BoxChild)configurationVBox [configurationTopEventBox]; + w2.Position = 0; + + configurationTableEventBox = new EventBox (); + configurationTableEventBox.Name = "configurationTableEventBox"; + + configurationTable = new Table (2, 3, false); + configurationTable.Name = "configurationTable"; + configurationTable.RowSpacing = 7; + configurationTable.ColumnSpacing = 6; + + targetFrameworkComboBox = ComboBox.NewText (); + targetFrameworkComboBox.WidthRequest = 250; + targetFrameworkComboBox.Name = "targetFrameworkComboBox"; + configurationTable.Add (targetFrameworkComboBox); + + var w3 = (Table.TableChild)configurationTable [targetFrameworkComboBox]; + w3.TopAttach = 1; + w3.BottomAttach = 2; + w3.LeftAttach = 1; + w3.RightAttach = 2; + w3.XOptions = (AttachOptions)4; + w3.YOptions = (AttachOptions)4; + + targetFrameworkInformationLabel = new Label (); + targetFrameworkInformationLabel.Name = "targetFrameworkInformationLabel"; + targetFrameworkInformationLabel.Xpad = 5; + targetFrameworkInformationLabel.Xalign = 0F; + targetFrameworkInformationLabel.LabelProp = GettextCatalog.GetString ("Select the target framework for your project."); + targetFrameworkInformationLabel.Justify = (Justification)1; + configurationTable.Add (targetFrameworkInformationLabel); + + var w4 = (Table.TableChild)configurationTable [targetFrameworkInformationLabel]; + w4.LeftAttach = 1; + w4.RightAttach = 2; + w4.XOptions = (AttachOptions)4; + w4.YOptions = (AttachOptions)4; + + targetFrameworkLabel = new Label (); + targetFrameworkLabel.WidthRequest = 132; + targetFrameworkLabel.Name = "targetFrameworkLabel"; + targetFrameworkLabel.Xpad = 5; + targetFrameworkLabel.Xalign = 1F; + targetFrameworkLabel.LabelProp = GettextCatalog.GetString ("Target Framework:"); + targetFrameworkLabel.Justify = (Justification)1; + configurationTable.Add (targetFrameworkLabel); + + var w5 = (Table.TableChild)configurationTable [targetFrameworkLabel]; + w5.TopAttach = 1; + w5.BottomAttach = 2; + w5.XOptions = (AttachOptions)4; + w5.YOptions = (AttachOptions)4; + + configurationTableEventBox.Add (configurationTable); + configurationVBox.Add (configurationTableEventBox); + + var w7 = (Box.BoxChild)configurationVBox [configurationTableEventBox]; + w7.Position = 1; + w7.Expand = false; + w7.Fill = false; + + configurationBottomEventBox = new EventBox (); + configurationBottomEventBox.Name = "configurationBottomEventBox"; + configurationVBox.Add (configurationBottomEventBox); + + var w8 = (Box.BoxChild)configurationVBox [configurationBottomEventBox]; + w8.Position = 2; + mainHBox.Add (configurationVBox); + + var w9 = (Box.BoxChild)mainHBox [configurationVBox]; + w9.Position = 1; + + backgroundLargeImageEventBox = new EventBox (); + backgroundLargeImageEventBox.Name = "backgroundLargeImageEventBox"; + + backgroundLargeImageVBox = new VBox (); + backgroundLargeImageVBox.Name = "backgroundLargeImageVBox"; + backgroundLargeImageEventBox.Add (backgroundLargeImageVBox); + mainHBox.Add (backgroundLargeImageEventBox); + + var w11 = (Box.BoxChild)mainHBox [backgroundLargeImageEventBox]; + w11.Position = 2; + + Add (mainHBox); + + if (Child != null) { + Child.ShowAll (); + } + + Hide (); + } } } diff --git a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj index 68fcebe996..01af0f8ead 100644 --- a/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj +++ b/main/src/addins/MonoDevelop.DotNetCore/MonoDevelop.DotNetCore.csproj @@ -73,9 +73,7 @@ - - @@ -148,7 +146,6 @@ - diff --git a/main/src/addins/MonoDevelop.DotNetCore/gtk-gui/MonoDevelop.DotNetCore.Gui.GtkDotNetCoreProjectTemplateWizardPageWidget.cs b/main/src/addins/MonoDevelop.DotNetCore/gtk-gui/MonoDevelop.DotNetCore.Gui.GtkDotNetCoreProjectTemplateWizardPageWidget.cs deleted file mode 100644 index 0151710038..0000000000 --- a/main/src/addins/MonoDevelop.DotNetCore/gtk-gui/MonoDevelop.DotNetCore.Gui.GtkDotNetCoreProjectTemplateWizardPageWidget.cs +++ /dev/null @@ -1,138 +0,0 @@ - -// This file has been generated by the GUI designer. Do not modify. -namespace MonoDevelop.DotNetCore.Gui -{ - partial class GtkDotNetCoreProjectTemplateWizardPageWidget - { - private global::Gtk.HBox mainHBox; - - private global::Gtk.EventBox leftBorderEventBox; - - private global::Gtk.VBox configurationVBox; - - private global::Gtk.EventBox configurationTopEventBox; - - private global::Gtk.EventBox configurationTableEventBox; - - private global::Gtk.Table configurationTable; - - private global::Gtk.ComboBox targetFrameworkComboBox; - - private global::Gtk.Label targetFrameworkInformationLabel; - - private global::Gtk.Label targetFrameworkLabel; - - private global::Gtk.EventBox configurationBottomEventBox; - - private global::Gtk.EventBox backgroundLargeImageEventBox; - - private global::Gtk.VBox backgroundLargeImageVBox; - - protected virtual void Build() - { - global::Stetic.Gui.Initialize(this); - // Widget MonoDevelop.DotNetCore.Gui.GtkDotNetCoreProjectTemplateWizardPageWidget - global::Stetic.BinContainer.Attach(this); - this.Name = "MonoDevelop.DotNetCore.Gui.GtkDotNetCoreProjectTemplateWizardPageWidget"; - // Container child MonoDevelop.DotNetCore.Gui.GtkDotNetCoreProjectTemplateWizardPageWidget.Gtk.Container+ContainerChild - this.mainHBox = new global::Gtk.HBox(); - this.mainHBox.Name = "mainHBox"; - // Container child mainHBox.Gtk.Box+BoxChild - this.leftBorderEventBox = new global::Gtk.EventBox(); - this.leftBorderEventBox.WidthRequest = 30; - this.leftBorderEventBox.Name = "leftBorderEventBox"; - this.mainHBox.Add(this.leftBorderEventBox); - global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.mainHBox[this.leftBorderEventBox])); - w1.Position = 0; - w1.Expand = false; - // Container child mainHBox.Gtk.Box+BoxChild - this.configurationVBox = new global::Gtk.VBox(); - this.configurationVBox.WidthRequest = 440; - this.configurationVBox.Name = "configurationVBox"; - // Container child configurationVBox.Gtk.Box+BoxChild - this.configurationTopEventBox = new global::Gtk.EventBox(); - this.configurationTopEventBox.Name = "configurationTopEventBox"; - this.configurationVBox.Add(this.configurationTopEventBox); - global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.configurationVBox[this.configurationTopEventBox])); - w2.Position = 0; - // Container child configurationVBox.Gtk.Box+BoxChild - this.configurationTableEventBox = new global::Gtk.EventBox(); - this.configurationTableEventBox.Name = "configurationTableEventBox"; - // Container child configurationTableEventBox.Gtk.Container+ContainerChild - this.configurationTable = new global::Gtk.Table(((uint)(2)), ((uint)(3)), false); - this.configurationTable.Name = "configurationTable"; - this.configurationTable.RowSpacing = ((uint)(7)); - this.configurationTable.ColumnSpacing = ((uint)(6)); - // Container child configurationTable.Gtk.Table+TableChild - this.targetFrameworkComboBox = global::Gtk.ComboBox.NewText(); - this.targetFrameworkComboBox.WidthRequest = 250; - this.targetFrameworkComboBox.Name = "targetFrameworkComboBox"; - this.configurationTable.Add(this.targetFrameworkComboBox); - global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.configurationTable[this.targetFrameworkComboBox])); - w3.TopAttach = ((uint)(1)); - w3.BottomAttach = ((uint)(2)); - w3.LeftAttach = ((uint)(1)); - w3.RightAttach = ((uint)(2)); - w3.XOptions = ((global::Gtk.AttachOptions)(4)); - w3.YOptions = ((global::Gtk.AttachOptions)(4)); - // Container child configurationTable.Gtk.Table+TableChild - this.targetFrameworkInformationLabel = new global::Gtk.Label(); - this.targetFrameworkInformationLabel.Name = "targetFrameworkInformationLabel"; - this.targetFrameworkInformationLabel.Xpad = 5; - this.targetFrameworkInformationLabel.Xalign = 0F; - this.targetFrameworkInformationLabel.LabelProp = global::Mono.Unix.Catalog.GetString("Select the target framework for your project."); - this.targetFrameworkInformationLabel.Justify = ((global::Gtk.Justification)(1)); - this.configurationTable.Add(this.targetFrameworkInformationLabel); - global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.configurationTable[this.targetFrameworkInformationLabel])); - w4.LeftAttach = ((uint)(1)); - w4.RightAttach = ((uint)(2)); - w4.XOptions = ((global::Gtk.AttachOptions)(4)); - w4.YOptions = ((global::Gtk.AttachOptions)(4)); - // Container child configurationTable.Gtk.Table+TableChild - this.targetFrameworkLabel = new global::Gtk.Label(); - this.targetFrameworkLabel.WidthRequest = 132; - this.targetFrameworkLabel.Name = "targetFrameworkLabel"; - this.targetFrameworkLabel.Xpad = 5; - this.targetFrameworkLabel.Xalign = 1F; - this.targetFrameworkLabel.LabelProp = global::Mono.Unix.Catalog.GetString("Target Framework:"); - this.targetFrameworkLabel.Justify = ((global::Gtk.Justification)(1)); - this.configurationTable.Add(this.targetFrameworkLabel); - global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.configurationTable[this.targetFrameworkLabel])); - w5.TopAttach = ((uint)(1)); - w5.BottomAttach = ((uint)(2)); - w5.XOptions = ((global::Gtk.AttachOptions)(4)); - w5.YOptions = ((global::Gtk.AttachOptions)(4)); - this.configurationTableEventBox.Add(this.configurationTable); - this.configurationVBox.Add(this.configurationTableEventBox); - global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.configurationVBox[this.configurationTableEventBox])); - w7.Position = 1; - w7.Expand = false; - w7.Fill = false; - // Container child configurationVBox.Gtk.Box+BoxChild - this.configurationBottomEventBox = new global::Gtk.EventBox(); - this.configurationBottomEventBox.Name = "configurationBottomEventBox"; - this.configurationVBox.Add(this.configurationBottomEventBox); - global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.configurationVBox[this.configurationBottomEventBox])); - w8.Position = 2; - this.mainHBox.Add(this.configurationVBox); - global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.mainHBox[this.configurationVBox])); - w9.Position = 1; - // Container child mainHBox.Gtk.Box+BoxChild - this.backgroundLargeImageEventBox = new global::Gtk.EventBox(); - this.backgroundLargeImageEventBox.Name = "backgroundLargeImageEventBox"; - // Container child backgroundLargeImageEventBox.Gtk.Container+ContainerChild - this.backgroundLargeImageVBox = new global::Gtk.VBox(); - this.backgroundLargeImageVBox.Name = "backgroundLargeImageVBox"; - this.backgroundLargeImageEventBox.Add(this.backgroundLargeImageVBox); - this.mainHBox.Add(this.backgroundLargeImageEventBox); - global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.mainHBox[this.backgroundLargeImageEventBox])); - w11.Position = 2; - this.Add(this.mainHBox); - if ((this.Child != null)) - { - this.Child.ShowAll(); - } - this.Hide(); - } - } -} diff --git a/main/src/addins/MonoDevelop.DotNetCore/gtk-gui/generated.cs b/main/src/addins/MonoDevelop.DotNetCore/gtk-gui/generated.cs deleted file mode 100644 index 453751b36a..0000000000 --- a/main/src/addins/MonoDevelop.DotNetCore/gtk-gui/generated.cs +++ /dev/null @@ -1,88 +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/MonoDevelop.DotNetCore/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.DotNetCore/gtk-gui/gui.stetic deleted file mode 100644 index b97a417600..0000000000 --- a/main/src/addins/MonoDevelop.DotNetCore/gtk-gui/gui.stetic +++ /dev/null @@ -1,183 +0,0 @@ - - - - .. - 2.12 - - - - - - - - - False - - - - - - - 30 - - - - - - 0 - False - False - - - - - - 440 - - - - - - - - - 0 - True - - - - - - - - - 2 - 3 - 7 - 6 - - - - - - - - - - - - - 250 - True - - - - 1 - 2 - 1 - 2 - True - Fill - Fill - False - True - False - False - True - False - - - - - - 5 - 0 - Select the target framework for your project. - Right - - - 1 - 2 - True - Fill - Fill - False - True - False - False - True - False - - - - - - 132 - 5 - 1 - Target Framework: - Right - - - 1 - 2 - True - Fill - Fill - False - True - False - False - True - False - - - - - - - 1 - True - False - False - - - - - - - - - - - 2 - True - - - - - 1 - True - - - - - - - - - - - - - - - - 2 - False - - - - - - \ No newline at end of file -- cgit v1.2.3