diff options
author | Lluis Sanchez Gual <lluis@novell.com> | 2010-11-04 13:42:42 +0300 |
---|---|---|
committer | Lluis Sanchez Gual <lluis@novell.com> | 2010-11-04 13:42:42 +0300 |
commit | 37bf38d48da8bd5418e4dd30014cebe59df5d8e5 (patch) | |
tree | 50eb4ea6f5bd8969f4b1c03b870e52988ab20368 /main/src/addins/MonoDevelop.Moonlight | |
parent | b239a9631f2e7ebb47738f844de8bfbff3599a23 (diff) |
Flush stetic changes.
Diffstat (limited to 'main/src/addins/MonoDevelop.Moonlight')
3 files changed, 35 insertions, 64 deletions
diff --git a/main/src/addins/MonoDevelop.Moonlight/gtk-gui/MonoDevelop.Moonlight.Gui.MoonlightOptionsPanelWidget.cs b/main/src/addins/MonoDevelop.Moonlight/gtk-gui/MonoDevelop.Moonlight.Gui.MoonlightOptionsPanelWidget.cs index 87125b851c..de66beca97 100644 --- a/main/src/addins/MonoDevelop.Moonlight/gtk-gui/MonoDevelop.Moonlight.Gui.MoonlightOptionsPanelWidget.cs +++ b/main/src/addins/MonoDevelop.Moonlight/gtk-gui/MonoDevelop.Moonlight.Gui.MoonlightOptionsPanelWidget.cs @@ -5,63 +5,34 @@ namespace MonoDevelop.Moonlight.Gui public partial class MoonlightOptionsPanelWidget { private global::Gtk.VBox vbox1; - private global::Gtk.VBox applicationOptionsBox; - private global::Gtk.Label label1; - private global::Gtk.Alignment alignment1; - private global::Gtk.VBox vbox2; - private global::Gtk.HBox hbox1; - private global::Gtk.Label label2; - private global::Gtk.Entry xapFilenameEntry; - private global::Gtk.Alignment alignment2; - private global::Gtk.VBox vbox3; - private global::Gtk.CheckButton generateManifestCheck; - private global::Gtk.Alignment alignment4; - private global::Gtk.Table manifestTable; - private global::Gtk.ComboBoxEntry entryPointCombo; - private global::Gtk.Label label6; - private global::Gtk.Label label7; - private global::Gtk.Entry manifestTemplateFilenameEntry; - private global::Gtk.Label label3; - private global::Gtk.Alignment alignment5; - private global::Gtk.VBox vbox4; - private global::Gtk.CheckButton generateTestPageCheck; - private global::Gtk.Alignment alignment3; - private global::Gtk.HBox testPageBox; - private global::Gtk.Label label5; - private global::Gtk.Entry testPageFilenameEntry; - private global::Gtk.Label label4; - private global::Gtk.Alignment xamlAlignment; - private global::Gtk.VBox vbox6; - private global::Gtk.CheckButton validateXamlCheck; - private global::Gtk.CheckButton throwXamlErrorsCheck; protected virtual void Build () @@ -81,16 +52,16 @@ namespace MonoDevelop.Moonlight.Gui // Container child applicationOptionsBox.Gtk.Box+BoxChild this.label1 = new global::Gtk.Label (); this.label1.Name = "label1"; - this.label1.Xalign = 0f; + this.label1.Xalign = 0F; this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>XAP Generation</b>"); this.label1.UseMarkup = true; this.applicationOptionsBox.Add (this.label1); - global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.applicationOptionsBox[this.label1])); + global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.applicationOptionsBox [this.label1])); w1.Position = 0; w1.Expand = false; w1.Fill = false; // Container child applicationOptionsBox.Gtk.Box+BoxChild - this.alignment1 = new global::Gtk.Alignment (0.5f, 0.5f, 1f, 1f); + this.alignment1 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F); this.alignment1.Name = "alignment1"; this.alignment1.LeftPadding = ((uint)(16)); // Container child alignment1.Gtk.Container+ContainerChild @@ -107,7 +78,7 @@ namespace MonoDevelop.Moonlight.Gui this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("XAP _filename:"); this.label2.UseUnderline = true; this.hbox1.Add (this.label2); - global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.label2])); + global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.label2])); w2.Position = 0; w2.Expand = false; w2.Fill = false; @@ -118,15 +89,15 @@ namespace MonoDevelop.Moonlight.Gui this.xapFilenameEntry.IsEditable = true; this.xapFilenameEntry.InvisibleChar = '●'; this.hbox1.Add (this.xapFilenameEntry); - global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.xapFilenameEntry])); + global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.xapFilenameEntry])); w3.Position = 1; this.vbox2.Add (this.hbox1); - global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.hbox1])); + global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox1])); w4.Position = 0; w4.Expand = false; w4.Fill = false; // Container child vbox2.Gtk.Box+BoxChild - this.alignment2 = new global::Gtk.Alignment (0.5f, 0.5f, 1f, 1f); + this.alignment2 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F); this.alignment2.Name = "alignment2"; // Container child alignment2.Gtk.Container+ContainerChild this.vbox3 = new global::Gtk.VBox (); @@ -140,12 +111,12 @@ namespace MonoDevelop.Moonlight.Gui this.generateManifestCheck.DrawIndicator = true; this.generateManifestCheck.UseUnderline = true; this.vbox3.Add (this.generateManifestCheck); - global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.generateManifestCheck])); + global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.generateManifestCheck])); w5.Position = 0; w5.Expand = false; w5.Fill = false; // Container child vbox3.Gtk.Box+BoxChild - this.alignment4 = new global::Gtk.Alignment (0.5f, 0.5f, 1f, 1f); + this.alignment4 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F); this.alignment4.Name = "alignment4"; this.alignment4.LeftPadding = ((uint)(36)); // Container child alignment4.Gtk.Container+ContainerChild @@ -157,7 +128,7 @@ namespace MonoDevelop.Moonlight.Gui this.entryPointCombo = global::Gtk.ComboBoxEntry.NewText (); this.entryPointCombo.Name = "entryPointCombo"; this.manifestTable.Add (this.entryPointCombo); - global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.manifestTable[this.entryPointCombo])); + global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.manifestTable [this.entryPointCombo])); w6.TopAttach = ((uint)(1)); w6.BottomAttach = ((uint)(2)); w6.LeftAttach = ((uint)(1)); @@ -166,11 +137,11 @@ namespace MonoDevelop.Moonlight.Gui // Container child manifestTable.Gtk.Table+TableChild this.label6 = new global::Gtk.Label (); this.label6.Name = "label6"; - this.label6.Xalign = 0f; + this.label6.Xalign = 0F; this.label6.LabelProp = global::Mono.Unix.Catalog.GetString ("Entry _point:"); this.label6.UseUnderline = true; this.manifestTable.Add (this.label6); - global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.manifestTable[this.label6])); + global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.manifestTable [this.label6])); w7.TopAttach = ((uint)(1)); w7.BottomAttach = ((uint)(2)); w7.XOptions = ((global::Gtk.AttachOptions)(4)); @@ -181,7 +152,7 @@ namespace MonoDevelop.Moonlight.Gui this.label7.LabelProp = global::Mono.Unix.Catalog.GetString ("Te_mplate file:"); this.label7.UseUnderline = true; this.manifestTable.Add (this.label7); - global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.manifestTable[this.label7])); + global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.manifestTable [this.label7])); w8.XOptions = ((global::Gtk.AttachOptions)(4)); w8.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child manifestTable.Gtk.Table+TableChild @@ -191,35 +162,35 @@ namespace MonoDevelop.Moonlight.Gui this.manifestTemplateFilenameEntry.IsEditable = true; this.manifestTemplateFilenameEntry.InvisibleChar = '●'; this.manifestTable.Add (this.manifestTemplateFilenameEntry); - global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.manifestTable[this.manifestTemplateFilenameEntry])); + global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.manifestTable [this.manifestTemplateFilenameEntry])); w9.LeftAttach = ((uint)(1)); w9.RightAttach = ((uint)(2)); w9.YOptions = ((global::Gtk.AttachOptions)(4)); this.alignment4.Add (this.manifestTable); this.vbox3.Add (this.alignment4); - global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.alignment4])); + global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.alignment4])); w11.Position = 1; this.alignment2.Add (this.vbox3); this.vbox2.Add (this.alignment2); - global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.alignment2])); + global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.alignment2])); w13.Position = 1; this.alignment1.Add (this.vbox2); this.applicationOptionsBox.Add (this.alignment1); - global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.applicationOptionsBox[this.alignment1])); + global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.applicationOptionsBox [this.alignment1])); w15.Position = 1; // Container child applicationOptionsBox.Gtk.Box+BoxChild this.label3 = new global::Gtk.Label (); this.label3.Name = "label3"; - this.label3.Xalign = 0f; + this.label3.Xalign = 0F; this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Test Page</b>"); this.label3.UseMarkup = true; this.applicationOptionsBox.Add (this.label3); - global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.applicationOptionsBox[this.label3])); + global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.applicationOptionsBox [this.label3])); w16.Position = 2; w16.Expand = false; w16.Fill = false; // Container child applicationOptionsBox.Gtk.Box+BoxChild - this.alignment5 = new global::Gtk.Alignment (0.5f, 0.5f, 1f, 1f); + this.alignment5 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F); this.alignment5.Name = "alignment5"; this.alignment5.LeftPadding = ((uint)(16)); // Container child alignment5.Gtk.Container+ContainerChild @@ -234,12 +205,12 @@ namespace MonoDevelop.Moonlight.Gui this.generateTestPageCheck.DrawIndicator = true; this.generateTestPageCheck.UseUnderline = true; this.vbox4.Add (this.generateTestPageCheck); - global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.generateTestPageCheck])); + global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.generateTestPageCheck])); w17.Position = 0; w17.Expand = false; w17.Fill = false; // Container child vbox4.Gtk.Box+BoxChild - this.alignment3 = new global::Gtk.Alignment (0f, 0.5f, 1f, 1f); + this.alignment3 = new global::Gtk.Alignment (0F, 0.5F, 1F, 1F); this.alignment3.Name = "alignment3"; this.alignment3.LeftPadding = ((uint)(36)); // Container child alignment3.Gtk.Container+ContainerChild @@ -252,7 +223,7 @@ namespace MonoDevelop.Moonlight.Gui this.label5.LabelProp = global::Mono.Unix.Catalog.GetString ("Test _page filename:"); this.label5.UseUnderline = true; this.testPageBox.Add (this.label5); - global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.testPageBox[this.label5])); + global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.testPageBox [this.label5])); w18.Position = 0; w18.Expand = false; w18.Fill = false; @@ -263,34 +234,34 @@ namespace MonoDevelop.Moonlight.Gui this.testPageFilenameEntry.IsEditable = true; this.testPageFilenameEntry.InvisibleChar = '●'; this.testPageBox.Add (this.testPageFilenameEntry); - global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.testPageBox[this.testPageFilenameEntry])); + global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.testPageBox [this.testPageFilenameEntry])); w19.Position = 1; this.alignment3.Add (this.testPageBox); this.vbox4.Add (this.alignment3); - global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.vbox4[this.alignment3])); + global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.alignment3])); w21.Position = 1; w21.Expand = false; w21.Fill = false; this.alignment5.Add (this.vbox4); this.applicationOptionsBox.Add (this.alignment5); - global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.applicationOptionsBox[this.alignment5])); + global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.applicationOptionsBox [this.alignment5])); w23.Position = 3; this.vbox1.Add (this.applicationOptionsBox); - global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.applicationOptionsBox])); + global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.applicationOptionsBox])); w24.Position = 0; // Container child vbox1.Gtk.Box+BoxChild this.label4 = new global::Gtk.Label (); this.label4.Name = "label4"; - this.label4.Xalign = 0f; + this.label4.Xalign = 0F; this.label4.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>XAML Validation</b>"); this.label4.UseMarkup = true; this.vbox1.Add (this.label4); - global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.label4])); + global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.label4])); w25.Position = 1; w25.Expand = false; w25.Fill = false; // Container child vbox1.Gtk.Box+BoxChild - this.xamlAlignment = new global::Gtk.Alignment (0.5f, 0.5f, 1f, 1f); + this.xamlAlignment = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F); this.xamlAlignment.Name = "xamlAlignment"; this.xamlAlignment.LeftPadding = ((uint)(16)); // Container child xamlAlignment.Gtk.Container+ContainerChild @@ -305,7 +276,7 @@ namespace MonoDevelop.Moonlight.Gui this.validateXamlCheck.DrawIndicator = true; this.validateXamlCheck.UseUnderline = true; this.vbox6.Add (this.validateXamlCheck); - global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.vbox6[this.validateXamlCheck])); + global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.validateXamlCheck])); w26.Position = 0; w26.Expand = false; w26.Fill = false; @@ -317,13 +288,13 @@ namespace MonoDevelop.Moonlight.Gui this.throwXamlErrorsCheck.DrawIndicator = true; this.throwXamlErrorsCheck.UseUnderline = true; this.vbox6.Add (this.throwXamlErrorsCheck); - global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.vbox6[this.throwXamlErrorsCheck])); + global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.vbox6 [this.throwXamlErrorsCheck])); w27.Position = 1; w27.Expand = false; w27.Fill = false; this.xamlAlignment.Add (this.vbox6); this.vbox1.Add (this.xamlAlignment); - global::Gtk.Box.BoxChild w29 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.xamlAlignment])); + global::Gtk.Box.BoxChild w29 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.xamlAlignment])); w29.Position = 2; this.Add (this.vbox1); if ((this.Child != null)) { diff --git a/main/src/addins/MonoDevelop.Moonlight/gtk-gui/generated.cs b/main/src/addins/MonoDevelop.Moonlight/gtk-gui/generated.cs index aa96390c4a..75935e2e55 100644 --- a/main/src/addins/MonoDevelop.Moonlight/gtk-gui/generated.cs +++ b/main/src/addins/MonoDevelop.Moonlight/gtk-gui/generated.cs @@ -6,7 +6,7 @@ namespace Stetic { private static bool initialized; - static internal void Initialize (Gtk.Widget iconRenderer) + internal static void Initialize (Gtk.Widget iconRenderer) { if ((Stetic.Gui.initialized == false)) { Stetic.Gui.initialized = true; @@ -17,7 +17,6 @@ namespace Stetic internal class BinContainer { private Gtk.Widget child; - private Gtk.UIManager uimanager; public static BinContainer Attach (Gtk.Bin bin) diff --git a/main/src/addins/MonoDevelop.Moonlight/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.Moonlight/gtk-gui/gui.stetic index 29b12b7628..c4aa42f540 100644 --- a/main/src/addins/MonoDevelop.Moonlight/gtk-gui/gui.stetic +++ b/main/src/addins/MonoDevelop.Moonlight/gtk-gui/gui.stetic @@ -8,6 +8,7 @@ <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" /> <widget-library name="../../../../build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll" /> <widget-library name="../../../../build/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll" /> + <widget-library name="../../../../build/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll" /> <widget-library name="../../../../build/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll" /> <widget-library name="../../../../build/AddIns/MonoDevelop.Moonlight/MonoDevelop.Moonlight.dll" internal="true" /> </import> |