Mercurial > repos > IBBoard.WarFoundry.GUI.GTK
changeset 145:135491fd1830
* Commit reformatted auto-generated code, because MonoDevelop changed its behaviour and now always uses its own format, not user format, for autogen code
| author | IBBoard <dev@ibboard.co.uk> |
|---|---|
| date | Sat, 12 Nov 2011 19:53:26 +0000 |
| parents | 929ef50c3919 |
| children | f3453f3e4591 |
| files | gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmAbout.cs gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmAboutCredits.cs gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmAddEquipment.cs gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmEditArmy.cs gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmEditEquipment.cs gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmMainWindow.cs gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewArmy.cs gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewUnit.cs gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmPreferences.cs gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmReplaceEquipment.cs gtk-gui/generated.cs |
| diffstat | 11 files changed, 350 insertions(+), 373 deletions(-) [+] |
line wrap: on
line diff
--- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmAbout.cs Tue Oct 25 20:32:47 2011 +0100 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmAbout.cs Sat Nov 12 19:53:26 2011 +0000 @@ -11,14 +11,14 @@ private global::Gtk.Label lblWarFoundryLink; private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnCredits; private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnClose; - - protected virtual void Build() + + protected virtual void Build () { - global::Stetic.Gui.Initialize(this); + global::Stetic.Gui.Initialize (this); // Widget IBBoard.WarFoundry.GUI.GTK.FrmAbout this.Name = "IBBoard.WarFoundry.GUI.GTK.FrmAbout"; - this.Title = global::Mono.Unix.Catalog.GetString("About WF"); - this.Icon = global::Gdk.Pixbuf.LoadFromResource("App.ico"); + this.Title = global::Mono.Unix.Catalog.GetString ("About WF"); + this.Icon = global::Gdk.Pixbuf.LoadFromResource ("App.ico"); this.TypeHint = ((global::Gdk.WindowTypeHint)(1)); this.WindowPosition = ((global::Gtk.WindowPosition)(4)); this.Resizable = false; @@ -30,51 +30,51 @@ w1.Name = "dialog1_VBox"; w1.BorderWidth = ((uint)(2)); // Container child dialog1_VBox.Gtk.Box+BoxChild - this.logoImage = new global::Gtk.Image(); + this.logoImage = new global::Gtk.Image (); this.logoImage.Name = "logoImage"; - this.logoImage.Pixbuf = global::Gdk.Pixbuf.LoadFromResource("IBBoard.WarFoundry.GUI.GTK.App-lrg.png"); - w1.Add(this.logoImage); - global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(w1[this.logoImage])); + this.logoImage.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("IBBoard.WarFoundry.GUI.GTK.App-lrg.png"); + w1.Add (this.logoImage); + global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(w1 [this.logoImage])); w2.Position = 0; w2.Expand = false; w2.Fill = false; // Container child dialog1_VBox.Gtk.Box+BoxChild - this.label1 = new global::Gtk.Label(); + this.label1 = new global::Gtk.Label (); this.label1.Name = "label1"; - this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("<span font_size=\"x-large\" weight=\"bold\">WarFoundry v0.1 RC 1</span>"); + this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("<span font_size=\"x-large\" weight=\"bold\">WarFoundry v0.1 RC 1</span>"); this.label1.UseMarkup = true; - w1.Add(this.label1); - global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(w1[this.label1])); + w1.Add (this.label1); + global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(w1 [this.label1])); w3.Position = 1; w3.Expand = false; w3.Fill = false; // Container child dialog1_VBox.Gtk.Box+BoxChild - this.lblWarFoundryDesc = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel(); + this.lblWarFoundryDesc = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel (); this.lblWarFoundryDesc.Name = "lblWarFoundryDesc"; - this.lblWarFoundryDesc.LabelProp = global::Mono.Unix.Catalog.GetString("WarFoundry is an open-source army creation tool that lets you create rosters for multiple game systems."); + this.lblWarFoundryDesc.LabelProp = global::Mono.Unix.Catalog.GetString ("WarFoundry is an open-source army creation tool that lets you create rosters for multiple game systems."); this.lblWarFoundryDesc.Wrap = true; this.lblWarFoundryDesc.Justify = ((global::Gtk.Justification)(2)); - w1.Add(this.lblWarFoundryDesc); - global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(w1[this.lblWarFoundryDesc])); + w1.Add (this.lblWarFoundryDesc); + global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(w1 [this.lblWarFoundryDesc])); w4.Position = 2; w4.Expand = false; w4.Fill = false; // Container child dialog1_VBox.Gtk.Box+BoxChild - this.lblWarFoundryCopyright = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel(); + this.lblWarFoundryCopyright = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel (); this.lblWarFoundryCopyright.Name = "lblWarFoundryCopyright"; - this.lblWarFoundryCopyright.LabelProp = global::Mono.Unix.Catalog.GetString("© 2007-2010, IBBoard and others"); - w1.Add(this.lblWarFoundryCopyright); - global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(w1[this.lblWarFoundryCopyright])); + this.lblWarFoundryCopyright.LabelProp = global::Mono.Unix.Catalog.GetString ("© 2007-2010, IBBoard and others"); + w1.Add (this.lblWarFoundryCopyright); + global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(w1 [this.lblWarFoundryCopyright])); w5.Position = 3; w5.Expand = false; w5.Fill = false; // Container child dialog1_VBox.Gtk.Box+BoxChild - this.lblWarFoundryLink = new global::Gtk.Label(); + this.lblWarFoundryLink = new global::Gtk.Label (); this.lblWarFoundryLink.Name = "lblWarFoundryLink"; - this.lblWarFoundryLink.LabelProp = global::Mono.Unix.Catalog.GetString("<a href=\"http://warfoundry.co.uk\">http://warfoundry.co.uk</a>"); + this.lblWarFoundryLink.LabelProp = global::Mono.Unix.Catalog.GetString ("<a href=\"http://warfoundry.co.uk\">http://warfoundry.co.uk</a>"); this.lblWarFoundryLink.UseMarkup = true; - w1.Add(this.lblWarFoundryLink); - global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(w1[this.lblWarFoundryLink])); + w1.Add (this.lblWarFoundryLink); + global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(w1 [this.lblWarFoundryLink])); w6.Position = 4; w6.Expand = false; w6.Fill = false; @@ -85,38 +85,37 @@ w7.BorderWidth = ((uint)(5)); w7.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4)); // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild - this.bttnCredits = new global::IBBoard.GtkSharp.Translatable.TranslatableButton(); + this.bttnCredits = new global::IBBoard.GtkSharp.Translatable.TranslatableButton (); this.bttnCredits.CanFocus = true; this.bttnCredits.Name = "bttnCredits"; this.bttnCredits.UseStock = true; this.bttnCredits.UseUnderline = true; this.bttnCredits.Label = "gtk-about"; - w7.Add(this.bttnCredits); - global::Gtk.ButtonBox.ButtonBoxChild w8 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w7[this.bttnCredits])); + w7.Add (this.bttnCredits); + global::Gtk.ButtonBox.ButtonBoxChild w8 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w7 [this.bttnCredits])); w8.Expand = false; w8.Fill = false; // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild - this.bttnClose = new global::IBBoard.GtkSharp.Translatable.TranslatableButton(); + this.bttnClose = new global::IBBoard.GtkSharp.Translatable.TranslatableButton (); this.bttnClose.CanDefault = true; this.bttnClose.CanFocus = true; this.bttnClose.Name = "bttnClose"; this.bttnClose.UseStock = true; this.bttnClose.UseUnderline = true; this.bttnClose.Label = "gtk-close"; - this.AddActionWidget(this.bttnClose, -7); - global::Gtk.ButtonBox.ButtonBoxChild w9 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w7[this.bttnClose])); + this.AddActionWidget (this.bttnClose, -7); + global::Gtk.ButtonBox.ButtonBoxChild w9 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w7 [this.bttnClose])); w9.Position = 1; w9.Expand = false; w9.Fill = false; - if ((this.Child != null)) - { - this.Child.ShowAll(); + if ((this.Child != null)) { + this.Child.ShowAll (); } this.DefaultWidth = 330; this.DefaultHeight = 300; this.bttnClose.HasDefault = true; - this.Show(); - this.bttnCredits.Clicked += new global::System.EventHandler(this.BttnCreditsClicked); + this.Show (); + this.bttnCredits.Clicked += new global::System.EventHandler (this.BttnCreditsClicked); } } }
--- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmAboutCredits.cs Tue Oct 25 20:32:47 2011 +0100 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmAboutCredits.cs Sat Nov 12 19:53:26 2011 +0000 @@ -12,13 +12,13 @@ private global::IBBoard.GtkSharp.Translatable.TranslatableLabel lblTestersCommon; private global::IBBoard.GtkSharp.Translatable.TranslatableLabel lblTestersGtk; private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnClose; - - protected virtual void Build() + + protected virtual void Build () { - global::Stetic.Gui.Initialize(this); + global::Stetic.Gui.Initialize (this); // Widget IBBoard.WarFoundry.GUI.GTK.FrmAboutCredits this.Name = "IBBoard.WarFoundry.GUI.GTK.FrmAboutCredits"; - this.Icon = global::Gdk.Pixbuf.LoadFromResource("App.ico"); + this.Icon = global::Gdk.Pixbuf.LoadFromResource ("App.ico"); this.TypeHint = ((global::Gdk.WindowTypeHint)(1)); this.WindowPosition = ((global::Gtk.WindowPosition)(4)); this.SkipPagerHint = true; @@ -28,49 +28,49 @@ w1.Name = "dialog1_VBox"; w1.BorderWidth = ((uint)(2)); // Container child dialog1_VBox.Gtk.Box+BoxChild - this.table1 = new global::Gtk.Table(((uint)(3)), ((uint)(2)), false); + this.table1 = new global::Gtk.Table (((uint)(3)), ((uint)(2)), false); this.table1.Name = "table1"; this.table1.RowSpacing = ((uint)(6)); this.table1.ColumnSpacing = ((uint)(6)); // Container child table1.Gtk.Table+TableChild - this.label1 = new global::Gtk.Label(); + this.label1 = new global::Gtk.Label (); this.label1.Name = "label1"; this.label1.Xpad = 3; this.label1.Ypad = 3; this.label1.Xalign = 0F; this.label1.Yalign = 0F; this.label1.LabelProp = "IBBoard (Main developer and project lead)"; - this.table1.Add(this.label1); - global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1[this.label1])); + this.table1.Add (this.label1); + global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1 [this.label1])); w2.LeftAttach = ((uint)(1)); w2.RightAttach = ((uint)(2)); w2.XOptions = ((global::Gtk.AttachOptions)(4)); w2.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild - this.label2 = new global::Gtk.Label(); + this.label2 = new global::Gtk.Label (); this.label2.Name = "label2"; this.label2.Xpad = 3; this.label2.Ypad = 3; this.label2.Xalign = 0F; this.label2.Yalign = 0F; - this.label2.LabelProp = global::Mono.Unix.Catalog.GetString("HeWhoWatches"); - this.table1.Add(this.label2); - global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1[this.label2])); + this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("HeWhoWatches"); + this.table1.Add (this.label2); + global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.label2])); w3.TopAttach = ((uint)(1)); w3.BottomAttach = ((uint)(2)); w3.LeftAttach = ((uint)(1)); w3.RightAttach = ((uint)(2)); w3.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild - this.label3 = new global::Gtk.Label(); + this.label3 = new global::Gtk.Label (); this.label3.Name = "label3"; this.label3.Xpad = 3; this.label3.Ypad = 3; this.label3.Xalign = 0F; this.label3.Yalign = 0F; - this.label3.LabelProp = global::Mono.Unix.Catalog.GetString("Snowblizz,\r\nFrostlee,\r\nLord_Archaon,\r\nFurrie,\r\nclutch110,\r\nMollo,\r\nHeWhoWatches"); - this.table1.Add(this.label3); - global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1[this.label3])); + this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("Snowblizz,\r\nFrostlee,\r\nLord_Archaon,\r\nFurrie,\r\nclutch110,\r\nMollo,\r\nHeWhoWatches"); + this.table1.Add (this.label3); + global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1 [this.label3])); w4.TopAttach = ((uint)(2)); w4.BottomAttach = ((uint)(3)); w4.LeftAttach = ((uint)(1)); @@ -78,47 +78,47 @@ w4.XOptions = ((global::Gtk.AttachOptions)(4)); w4.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild - this.lblDevelopers = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel(); + this.lblDevelopers = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel (); this.lblDevelopers.Name = "lblDevelopers"; this.lblDevelopers.Xpad = 3; this.lblDevelopers.Ypad = 3; this.lblDevelopers.Xalign = 0F; this.lblDevelopers.Yalign = 0F; - this.lblDevelopers.LabelProp = global::Mono.Unix.Catalog.GetString("developers:"); - this.table1.Add(this.lblDevelopers); - global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1[this.lblDevelopers])); + this.lblDevelopers.LabelProp = global::Mono.Unix.Catalog.GetString ("developers:"); + this.table1.Add (this.lblDevelopers); + global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1 [this.lblDevelopers])); w5.XOptions = ((global::Gtk.AttachOptions)(4)); w5.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild - this.lblTestersCommon = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel(); + this.lblTestersCommon = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel (); this.lblTestersCommon.Name = "lblTestersCommon"; this.lblTestersCommon.Xpad = 3; this.lblTestersCommon.Ypad = 3; this.lblTestersCommon.Xalign = 0F; this.lblTestersCommon.Yalign = 0F; - this.lblTestersCommon.LabelProp = global::Mono.Unix.Catalog.GetString("testers (common):"); - this.table1.Add(this.lblTestersCommon); - global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1[this.lblTestersCommon])); + this.lblTestersCommon.LabelProp = global::Mono.Unix.Catalog.GetString ("testers (common):"); + this.table1.Add (this.lblTestersCommon); + global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1 [this.lblTestersCommon])); w6.TopAttach = ((uint)(2)); w6.BottomAttach = ((uint)(3)); w6.XOptions = ((global::Gtk.AttachOptions)(4)); w6.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild - this.lblTestersGtk = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel(); + this.lblTestersGtk = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel (); this.lblTestersGtk.Name = "lblTestersGtk"; this.lblTestersGtk.Xpad = 3; this.lblTestersGtk.Ypad = 3; this.lblTestersGtk.Xalign = 0F; this.lblTestersGtk.Yalign = 0F; - this.lblTestersGtk.LabelProp = global::Mono.Unix.Catalog.GetString("testers (GTK UI):"); - this.table1.Add(this.lblTestersGtk); - global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1[this.lblTestersGtk])); + this.lblTestersGtk.LabelProp = global::Mono.Unix.Catalog.GetString ("testers (GTK UI):"); + this.table1.Add (this.lblTestersGtk); + global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1 [this.lblTestersGtk])); w7.TopAttach = ((uint)(1)); w7.BottomAttach = ((uint)(2)); w7.XOptions = ((global::Gtk.AttachOptions)(4)); w7.YOptions = ((global::Gtk.AttachOptions)(4)); - w1.Add(this.table1); - global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(w1[this.table1])); + w1.Add (this.table1); + global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(w1 [this.table1])); w8.Position = 0; w8.Expand = false; w8.Fill = false; @@ -129,24 +129,23 @@ w9.BorderWidth = ((uint)(5)); w9.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4)); // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild - this.bttnClose = new global::IBBoard.GtkSharp.Translatable.TranslatableButton(); + this.bttnClose = new global::IBBoard.GtkSharp.Translatable.TranslatableButton (); this.bttnClose.CanDefault = true; this.bttnClose.CanFocus = true; this.bttnClose.Name = "bttnClose"; this.bttnClose.UseStock = true; this.bttnClose.UseUnderline = true; this.bttnClose.Label = "gtk-close"; - this.AddActionWidget(this.bttnClose, -7); - global::Gtk.ButtonBox.ButtonBoxChild w10 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w9[this.bttnClose])); + this.AddActionWidget (this.bttnClose, -7); + global::Gtk.ButtonBox.ButtonBoxChild w10 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w9 [this.bttnClose])); w10.Expand = false; w10.Fill = false; - if ((this.Child != null)) - { - this.Child.ShowAll(); + if ((this.Child != null)) { + this.Child.ShowAll (); } this.DefaultWidth = 376; this.DefaultHeight = 250; - this.Show(); + this.Show (); } } }
--- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmAddEquipment.cs Tue Oct 25 20:32:47 2011 +0100 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmAddEquipment.cs Sat Nov 12 19:53:26 2011 +0000 @@ -20,13 +20,13 @@ private global::IBBoard.GtkSharp.Translatable.TranslatableLabel lblItem; private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnCancel; private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnOkay; - - protected virtual void Build() + + protected virtual void Build () { - global::Stetic.Gui.Initialize(this); + global::Stetic.Gui.Initialize (this); // Widget IBBoard.WarFoundry.GUI.GTK.FrmAddEquipment this.Name = "IBBoard.WarFoundry.GUI.GTK.FrmAddEquipment"; - this.Title = global::Mono.Unix.Catalog.GetString("Add equipment"); + this.Title = global::Mono.Unix.Catalog.GetString ("Add equipment"); this.WindowPosition = ((global::Gtk.WindowPosition)(4)); this.Modal = true; this.SkipPagerHint = true; @@ -36,51 +36,51 @@ w1.Name = "dialog1_VBox"; w1.BorderWidth = ((uint)(2)); // Container child dialog1_VBox.Gtk.Box+BoxChild - this.table1 = new global::Gtk.Table(((uint)(2)), ((uint)(2)), false); + this.table1 = new global::Gtk.Table (((uint)(2)), ((uint)(2)), false); this.table1.Name = "table1"; this.table1.RowSpacing = ((uint)(6)); this.table1.ColumnSpacing = ((uint)(6)); // Container child table1.Gtk.Table+TableChild - this.GtkScrolledWindow = new global::Gtk.ScrolledWindow(); + this.GtkScrolledWindow = new global::Gtk.ScrolledWindow (); this.GtkScrolledWindow.Name = "GtkScrolledWindow"; this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1)); // Container child GtkScrolledWindow.Gtk.Container+ContainerChild - this.lstEquipment = new global::Gtk.TreeView(); + this.lstEquipment = new global::Gtk.TreeView (); this.lstEquipment.CanFocus = true; this.lstEquipment.Name = "lstEquipment"; this.lstEquipment.HeadersVisible = false; - this.GtkScrolledWindow.Add(this.lstEquipment); - this.table1.Add(this.GtkScrolledWindow); - global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1[this.GtkScrolledWindow])); + this.GtkScrolledWindow.Add (this.lstEquipment); + this.table1.Add (this.GtkScrolledWindow); + global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.GtkScrolledWindow])); w3.LeftAttach = ((uint)(1)); w3.RightAttach = ((uint)(2)); w3.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild - this.hbox2 = new global::Gtk.HBox(); + this.hbox2 = new global::Gtk.HBox (); this.hbox2.Name = "hbox2"; this.hbox2.Spacing = 6; // Container child hbox2.Gtk.Box+BoxChild - this.table2 = new global::Gtk.Table(((uint)(3)), ((uint)(3)), false); + this.table2 = new global::Gtk.Table (((uint)(3)), ((uint)(3)), false); this.table2.Name = "table2"; this.table2.RowSpacing = ((uint)(6)); this.table2.ColumnSpacing = ((uint)(6)); // Container child table2.Gtk.Table+TableChild - this.lblEquipAll = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel(); + this.lblEquipAll = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel (); this.lblEquipAll.Name = "lblEquipAll"; - this.lblEquipAll.LabelProp = global::Mono.Unix.Catalog.GetString("equip all"); - this.table2.Add(this.lblEquipAll); - global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table2[this.lblEquipAll])); + this.lblEquipAll.LabelProp = global::Mono.Unix.Catalog.GetString ("equip all"); + this.table2.Add (this.lblEquipAll); + global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table2 [this.lblEquipAll])); w4.TopAttach = ((uint)(2)); w4.BottomAttach = ((uint)(3)); w4.LeftAttach = ((uint)(1)); w4.RightAttach = ((uint)(2)); w4.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table2.Gtk.Table+TableChild - this.lblPercent = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel(); + this.lblPercent = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel (); this.lblPercent.Name = "lblPercent"; - this.lblPercent.LabelProp = global::Mono.Unix.Catalog.GetString("%"); - this.table2.Add(this.lblPercent); - global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table2[this.lblPercent])); + this.lblPercent.LabelProp = global::Mono.Unix.Catalog.GetString ("%"); + this.table2.Add (this.lblPercent); + global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table2 [this.lblPercent])); w5.TopAttach = ((uint)(1)); w5.BottomAttach = ((uint)(2)); w5.LeftAttach = ((uint)(2)); @@ -88,28 +88,28 @@ w5.XOptions = ((global::Gtk.AttachOptions)(4)); w5.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table2.Gtk.Table+TableChild - this.numericAmount = new global::Gtk.SpinButton(0, 100, 1); + this.numericAmount = new global::Gtk.SpinButton (0, 100, 1); this.numericAmount.CanFocus = true; this.numericAmount.Name = "numericAmount"; this.numericAmount.Adjustment.PageIncrement = 10; this.numericAmount.ClimbRate = 1; this.numericAmount.Numeric = true; - this.table2.Add(this.numericAmount); - global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table2[this.numericAmount])); + this.table2.Add (this.numericAmount); + global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table2 [this.numericAmount])); w6.LeftAttach = ((uint)(1)); w6.RightAttach = ((uint)(2)); w6.XOptions = ((global::Gtk.AttachOptions)(0)); w6.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table2.Gtk.Table+TableChild - this.percentageAmount = new global::Gtk.SpinButton(0, 100, 1); + this.percentageAmount = new global::Gtk.SpinButton (0, 100, 1); this.percentageAmount.CanFocus = true; this.percentageAmount.Name = "percentageAmount"; this.percentageAmount.Adjustment.PageIncrement = 10; this.percentageAmount.ClimbRate = 1; this.percentageAmount.Digits = ((uint)(1)); this.percentageAmount.Numeric = true; - this.table2.Add(this.percentageAmount); - global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table2[this.percentageAmount])); + this.table2.Add (this.percentageAmount); + global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table2 [this.percentageAmount])); w7.TopAttach = ((uint)(1)); w7.BottomAttach = ((uint)(2)); w7.LeftAttach = ((uint)(1)); @@ -117,75 +117,75 @@ w7.XOptions = ((global::Gtk.AttachOptions)(0)); w7.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table2.Gtk.Table+TableChild - this.rbEquipAll = new global::Gtk.RadioButton(""); + this.rbEquipAll = new global::Gtk.RadioButton (""); this.rbEquipAll.CanFocus = true; this.rbEquipAll.Name = "rbEquipAll"; this.rbEquipAll.Active = true; this.rbEquipAll.DrawIndicator = true; this.rbEquipAll.UseUnderline = true; - this.rbEquipAll.Group = new global::GLib.SList(global::System.IntPtr.Zero); - this.table2.Add(this.rbEquipAll); - global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table2[this.rbEquipAll])); + this.rbEquipAll.Group = new global::GLib.SList (global::System.IntPtr.Zero); + this.table2.Add (this.rbEquipAll); + global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table2 [this.rbEquipAll])); w8.TopAttach = ((uint)(2)); w8.BottomAttach = ((uint)(3)); w8.XOptions = ((global::Gtk.AttachOptions)(4)); w8.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table2.Gtk.Table+TableChild - this.rbEquipNumeric = new global::Gtk.RadioButton(""); + this.rbEquipNumeric = new global::Gtk.RadioButton (""); this.rbEquipNumeric.CanFocus = true; this.rbEquipNumeric.Name = "rbEquipNumeric"; this.rbEquipNumeric.DrawIndicator = true; this.rbEquipNumeric.UseUnderline = true; this.rbEquipNumeric.Group = this.rbEquipAll.Group; - this.table2.Add(this.rbEquipNumeric); - global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table2[this.rbEquipNumeric])); + this.table2.Add (this.rbEquipNumeric); + global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table2 [this.rbEquipNumeric])); w9.XOptions = ((global::Gtk.AttachOptions)(4)); w9.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table2.Gtk.Table+TableChild - this.rbEquipPercent = new global::Gtk.RadioButton(""); + this.rbEquipPercent = new global::Gtk.RadioButton (""); this.rbEquipPercent.CanFocus = true; this.rbEquipPercent.Name = "rbEquipPercent"; this.rbEquipPercent.DrawIndicator = true; this.rbEquipPercent.UseUnderline = true; this.rbEquipPercent.Group = this.rbEquipAll.Group; - this.table2.Add(this.rbEquipPercent); - global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table2[this.rbEquipPercent])); + this.table2.Add (this.rbEquipPercent); + global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table2 [this.rbEquipPercent])); w10.TopAttach = ((uint)(1)); w10.BottomAttach = ((uint)(2)); w10.XOptions = ((global::Gtk.AttachOptions)(4)); w10.YOptions = ((global::Gtk.AttachOptions)(4)); - this.hbox2.Add(this.table2); - global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.table2])); + this.hbox2.Add (this.table2); + global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.table2])); w11.Position = 0; w11.Expand = false; w11.Fill = false; - this.table1.Add(this.hbox2); - global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1[this.hbox2])); + this.table1.Add (this.hbox2); + global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1 [this.hbox2])); w12.TopAttach = ((uint)(1)); w12.BottomAttach = ((uint)(2)); w12.LeftAttach = ((uint)(1)); w12.RightAttach = ((uint)(2)); w12.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild - this.lblAmount = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel(); + this.lblAmount = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel (); this.lblAmount.Name = "lblAmount"; - this.lblAmount.LabelProp = global::Mono.Unix.Catalog.GetString("amount:"); - this.table1.Add(this.lblAmount); - global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1[this.lblAmount])); + this.lblAmount.LabelProp = global::Mono.Unix.Catalog.GetString ("amount:"); + this.table1.Add (this.lblAmount); + global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1 [this.lblAmount])); w13.TopAttach = ((uint)(1)); w13.BottomAttach = ((uint)(2)); w13.XOptions = ((global::Gtk.AttachOptions)(4)); w13.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild - this.lblItem = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel(); + this.lblItem = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel (); this.lblItem.Name = "lblItem"; - this.lblItem.LabelProp = global::Mono.Unix.Catalog.GetString("equipment"); - this.table1.Add(this.lblItem); - global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1[this.lblItem])); + this.lblItem.LabelProp = global::Mono.Unix.Catalog.GetString ("equipment"); + this.table1.Add (this.lblItem); + global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1 [this.lblItem])); w14.XOptions = ((global::Gtk.AttachOptions)(4)); w14.YOptions = ((global::Gtk.AttachOptions)(4)); - w1.Add(this.table1); - global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(w1[this.table1])); + w1.Add (this.table1); + global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(w1 [this.table1])); w15.Position = 0; w15.Expand = false; w15.Fill = false; @@ -196,42 +196,41 @@ w16.BorderWidth = ((uint)(5)); w16.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4)); // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild - this.bttnCancel = new global::IBBoard.GtkSharp.Translatable.TranslatableButton(); + this.bttnCancel = new global::IBBoard.GtkSharp.Translatable.TranslatableButton (); this.bttnCancel.CanDefault = true; this.bttnCancel.CanFocus = true; this.bttnCancel.Name = "bttnCancel"; this.bttnCancel.UseStock = true; this.bttnCancel.UseUnderline = true; this.bttnCancel.Label = "gtk-cancel"; - this.AddActionWidget(this.bttnCancel, -6); - global::Gtk.ButtonBox.ButtonBoxChild w17 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16[this.bttnCancel])); + this.AddActionWidget (this.bttnCancel, -6); + global::Gtk.ButtonBox.ButtonBoxChild w17 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16 [this.bttnCancel])); w17.Expand = false; w17.Fill = false; // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild - this.bttnOkay = new global::IBBoard.GtkSharp.Translatable.TranslatableButton(); + this.bttnOkay = new global::IBBoard.GtkSharp.Translatable.TranslatableButton (); this.bttnOkay.CanDefault = true; this.bttnOkay.CanFocus = true; this.bttnOkay.Name = "bttnOkay"; this.bttnOkay.UseStock = true; this.bttnOkay.UseUnderline = true; this.bttnOkay.Label = "gtk-ok"; - this.AddActionWidget(this.bttnOkay, -5); - global::Gtk.ButtonBox.ButtonBoxChild w18 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16[this.bttnOkay])); + this.AddActionWidget (this.bttnOkay, -5); + global::Gtk.ButtonBox.ButtonBoxChild w18 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16 [this.bttnOkay])); w18.Position = 1; w18.Expand = false; w18.Fill = false; - if ((this.Child != null)) - { - this.Child.ShowAll(); + if ((this.Child != null)) { + this.Child.ShowAll (); } this.DefaultWidth = 400; this.DefaultHeight = 300; - this.Show(); - this.rbEquipNumeric.Clicked += new global::System.EventHandler(this.RadioButtonClicked); - this.percentageAmount.ValueChanged += new global::System.EventHandler(this.SpinButtonValueChanged); - this.numericAmount.ValueChanged += new global::System.EventHandler(this.SpinButtonValueChanged); - this.bttnCancel.Clicked += new global::System.EventHandler(this.CancelButtonClicked); - this.bttnOkay.Clicked += new global::System.EventHandler(this.OkayButtonClicked); + this.Show (); + this.rbEquipNumeric.Clicked += new global::System.EventHandler (this.RadioButtonClicked); + this.percentageAmount.ValueChanged += new global::System.EventHandler (this.SpinButtonValueChanged); + this.numericAmount.ValueChanged += new global::System.EventHandler (this.SpinButtonValueChanged); + this.bttnCancel.Clicked += new global::System.EventHandler (this.CancelButtonClicked); + this.bttnOkay.Clicked += new global::System.EventHandler (this.OkayButtonClicked); } } }
--- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmEditArmy.cs Tue Oct 25 20:32:47 2011 +0100 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmEditArmy.cs Sat Nov 12 19:53:26 2011 +0000 @@ -31,7 +31,6 @@ // Container child table1.Gtk.Table+TableChild this.hbox2 = new global::Gtk.HBox (); this.hbox2.Name = "hbox2"; - this.hbox2.Spacing = 0; // Container child hbox2.Gtk.Box+BoxChild this.sbPointsValue = new global::Gtk.SpinButton (0, 2000000000, 100); this.sbPointsValue.WidthRequest = 150;
--- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmEditEquipment.cs Tue Oct 25 20:32:47 2011 +0100 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmEditEquipment.cs Sat Nov 12 19:53:26 2011 +0000 @@ -17,13 +17,13 @@ private global::IBBoard.GtkSharp.Translatable.TranslatableLabel lblAmount; private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnCancel; private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnOkay; - - protected virtual void Build() + + protected virtual void Build () { - global::Stetic.Gui.Initialize(this); + global::Stetic.Gui.Initialize (this); // Widget IBBoard.WarFoundry.GUI.GTK.FrmEditEquipment this.Name = "IBBoard.WarFoundry.GUI.GTK.FrmEditEquipment"; - this.Title = global::Mono.Unix.Catalog.GetString("Edit equipment"); + this.Title = global::Mono.Unix.Catalog.GetString ("Edit equipment"); this.WindowPosition = ((global::Gtk.WindowPosition)(4)); this.Modal = true; this.SkipPagerHint = true; @@ -33,36 +33,36 @@ w1.Name = "dialog1_VBox"; w1.BorderWidth = ((uint)(2)); // Container child dialog1_VBox.Gtk.Box+BoxChild - this.table1 = new global::Gtk.Table(((uint)(1)), ((uint)(2)), false); + this.table1 = new global::Gtk.Table (((uint)(1)), ((uint)(2)), false); this.table1.Name = "table1"; this.table1.RowSpacing = ((uint)(6)); this.table1.ColumnSpacing = ((uint)(6)); // Container child table1.Gtk.Table+TableChild - this.hbox2 = new global::Gtk.HBox(); + this.hbox2 = new global::Gtk.HBox (); this.hbox2.Name = "hbox2"; this.hbox2.Spacing = 6; // Container child hbox2.Gtk.Box+BoxChild - this.table2 = new global::Gtk.Table(((uint)(3)), ((uint)(3)), false); + this.table2 = new global::Gtk.Table (((uint)(3)), ((uint)(3)), false); this.table2.Name = "table2"; this.table2.RowSpacing = ((uint)(6)); this.table2.ColumnSpacing = ((uint)(6)); // Container child table2.Gtk.Table+TableChild - this.lblEquipAll = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel(); + this.lblEquipAll = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel (); this.lblEquipAll.Name = "lblEquipAll"; - this.lblEquipAll.LabelProp = global::Mono.Unix.Catalog.GetString("equip all"); - this.table2.Add(this.lblEquipAll); - global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table2[this.lblEquipAll])); + this.lblEquipAll.LabelProp = global::Mono.Unix.Catalog.GetString ("equip all"); + this.table2.Add (this.lblEquipAll); + global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table2 [this.lblEquipAll])); w2.TopAttach = ((uint)(2)); w2.BottomAttach = ((uint)(3)); w2.LeftAttach = ((uint)(1)); w2.RightAttach = ((uint)(2)); w2.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table2.Gtk.Table+TableChild - this.lblPercent = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel(); + this.lblPercent = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel (); this.lblPercent.Name = "lblPercent"; - this.lblPercent.LabelProp = global::Mono.Unix.Catalog.GetString("%"); - this.table2.Add(this.lblPercent); - global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table2[this.lblPercent])); + this.lblPercent.LabelProp = global::Mono.Unix.Catalog.GetString ("%"); + this.table2.Add (this.lblPercent); + global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table2 [this.lblPercent])); w3.TopAttach = ((uint)(1)); w3.BottomAttach = ((uint)(2)); w3.LeftAttach = ((uint)(2)); @@ -70,28 +70,28 @@ w3.XOptions = ((global::Gtk.AttachOptions)(4)); w3.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table2.Gtk.Table+TableChild - this.numericAmount = new global::Gtk.SpinButton(0, 100, 1); + this.numericAmount = new global::Gtk.SpinButton (0, 100, 1); this.numericAmount.CanFocus = true; this.numericAmount.Name = "numericAmount"; this.numericAmount.Adjustment.PageIncrement = 10; this.numericAmount.ClimbRate = 1; this.numericAmount.Numeric = true; - this.table2.Add(this.numericAmount); - global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table2[this.numericAmount])); + this.table2.Add (this.numericAmount); + global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table2 [this.numericAmount])); w4.LeftAttach = ((uint)(1)); w4.RightAttach = ((uint)(2)); w4.XOptions = ((global::Gtk.AttachOptions)(0)); w4.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table2.Gtk.Table+TableChild - this.percentageAmount = new global::Gtk.SpinButton(0, 100, 1); + this.percentageAmount = new global::Gtk.SpinButton (0, 100, 1); this.percentageAmount.CanFocus = true; this.percentageAmount.Name = "percentageAmount"; this.percentageAmount.Adjustment.PageIncrement = 10; this.percentageAmount.ClimbRate = 1; this.percentageAmount.Digits = ((uint)(1)); this.percentageAmount.Numeric = true; - this.table2.Add(this.percentageAmount); - global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table2[this.percentageAmount])); + this.table2.Add (this.percentageAmount); + global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table2 [this.percentageAmount])); w5.TopAttach = ((uint)(1)); w5.BottomAttach = ((uint)(2)); w5.LeftAttach = ((uint)(1)); @@ -99,62 +99,62 @@ w5.XOptions = ((global::Gtk.AttachOptions)(0)); w5.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table2.Gtk.Table+TableChild - this.rbEquipAll = new global::Gtk.RadioButton(""); + this.rbEquipAll = new global::Gtk.RadioButton (""); this.rbEquipAll.CanFocus = true; this.rbEquipAll.Name = "rbEquipAll"; this.rbEquipAll.DrawIndicator = true; this.rbEquipAll.UseUnderline = true; - this.rbEquipAll.Group = new global::GLib.SList(global::System.IntPtr.Zero); - this.table2.Add(this.rbEquipAll); - global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table2[this.rbEquipAll])); + this.rbEquipAll.Group = new global::GLib.SList (global::System.IntPtr.Zero); + this.table2.Add (this.rbEquipAll); + global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table2 [this.rbEquipAll])); w6.TopAttach = ((uint)(2)); w6.BottomAttach = ((uint)(3)); w6.XOptions = ((global::Gtk.AttachOptions)(4)); w6.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table2.Gtk.Table+TableChild - this.rbEquipNumeric = new global::Gtk.RadioButton(""); + this.rbEquipNumeric = new global::Gtk.RadioButton (""); this.rbEquipNumeric.CanFocus = true; this.rbEquipNumeric.Name = "rbEquipNumeric"; this.rbEquipNumeric.DrawIndicator = true; this.rbEquipNumeric.UseUnderline = true; this.rbEquipNumeric.Group = this.rbEquipAll.Group; - this.table2.Add(this.rbEquipNumeric); - global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table2[this.rbEquipNumeric])); + this.table2.Add (this.rbEquipNumeric); + global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table2 [this.rbEquipNumeric])); w7.XOptions = ((global::Gtk.AttachOptions)(4)); w7.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table2.Gtk.Table+TableChild - this.rbEquipPercent = new global::Gtk.RadioButton(""); + this.rbEquipPercent = new global::Gtk.RadioButton (""); this.rbEquipPercent.CanFocus = true; this.rbEquipPercent.Name = "rbEquipPercent"; this.rbEquipPercent.DrawIndicator = true; this.rbEquipPercent.UseUnderline = true; this.rbEquipPercent.Group = this.rbEquipAll.Group; - this.table2.Add(this.rbEquipPercent); - global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table2[this.rbEquipPercent])); + this.table2.Add (this.rbEquipPercent); + global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table2 [this.rbEquipPercent])); w8.TopAttach = ((uint)(1)); w8.BottomAttach = ((uint)(2)); w8.XOptions = ((global::Gtk.AttachOptions)(4)); w8.YOptions = ((global::Gtk.AttachOptions)(4)); - this.hbox2.Add(this.table2); - global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.table2])); + this.hbox2.Add (this.table2); + global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.table2])); w9.Position = 0; w9.Expand = false; w9.Fill = false; - this.table1.Add(this.hbox2); - global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table1[this.hbox2])); + this.table1.Add (this.hbox2); + global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table1 [this.hbox2])); w10.LeftAttach = ((uint)(1)); w10.RightAttach = ((uint)(2)); w10.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild - this.lblAmount = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel(); + this.lblAmount = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel (); this.lblAmount.Name = "lblAmount"; - this.lblAmount.LabelProp = global::Mono.Unix.Catalog.GetString("amount:"); + this.lblAmount.LabelProp = global::Mono.Unix.Catalog.GetString ("amount:"); this.lblAmount.Justify = ((global::Gtk.Justification)(1)); - this.table1.Add(this.lblAmount); - global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1[this.lblAmount])); + this.table1.Add (this.lblAmount); + global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1 [this.lblAmount])); w11.YOptions = ((global::Gtk.AttachOptions)(4)); - w1.Add(this.table1); - global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(w1[this.table1])); + w1.Add (this.table1); + global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(w1 [this.table1])); w12.Position = 0; w12.Expand = false; w12.Fill = false; @@ -165,44 +165,43 @@ w13.BorderWidth = ((uint)(5)); w13.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4)); // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild - this.bttnCancel = new global::IBBoard.GtkSharp.Translatable.TranslatableButton(); + this.bttnCancel = new global::IBBoard.GtkSharp.Translatable.TranslatableButton (); this.bttnCancel.CanDefault = true; this.bttnCancel.CanFocus = true; this.bttnCancel.Name = "bttnCancel"; this.bttnCancel.UseStock = true; this.bttnCancel.UseUnderline = true; this.bttnCancel.Label = "gtk-cancel"; - this.AddActionWidget(this.bttnCancel, -6); - global::Gtk.ButtonBox.ButtonBoxChild w14 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w13[this.bttnCancel])); + this.AddActionWidget (this.bttnCancel, -6); + global::Gtk.ButtonBox.ButtonBoxChild w14 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w13 [this.bttnCancel])); w14.Expand = false; w14.Fill = false; // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild - this.bttnOkay = new global::IBBoard.GtkSharp.Translatable.TranslatableButton(); + this.bttnOkay = new global::IBBoard.GtkSharp.Translatable.TranslatableButton (); this.bttnOkay.CanDefault = true; this.bttnOkay.CanFocus = true; this.bttnOkay.Name = "bttnOkay"; this.bttnOkay.UseStock = true; this.bttnOkay.UseUnderline = true; this.bttnOkay.Label = "gtk-ok"; - this.AddActionWidget(this.bttnOkay, -5); - global::Gtk.ButtonBox.ButtonBoxChild w15 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w13[this.bttnOkay])); + this.AddActionWidget (this.bttnOkay, -5); + global::Gtk.ButtonBox.ButtonBoxChild w15 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w13 [this.bttnOkay])); w15.Position = 1; w15.Expand = false; w15.Fill = false; - if ((this.Child != null)) - { - this.Child.ShowAll(); + if ((this.Child != null)) { + this.Child.ShowAll (); } this.DefaultWidth = 280; this.DefaultHeight = 175; - this.Show(); - this.rbEquipPercent.Clicked += new global::System.EventHandler(this.RadioButtonClicked); - this.rbEquipNumeric.Clicked += new global::System.EventHandler(this.RadioButtonClicked); - this.rbEquipAll.Clicked += new global::System.EventHandler(this.RadioButtonClicked); - this.percentageAmount.ValueChanged += new global::System.EventHandler(this.SpinButtonValueChanged); - this.numericAmount.ValueChanged += new global::System.EventHandler(this.SpinButtonValueChanged); - this.bttnCancel.Clicked += new global::System.EventHandler(this.CancelButtonClicked); - this.bttnOkay.Clicked += new global::System.EventHandler(this.OkayButtonClicked); + this.Show (); + this.rbEquipPercent.Clicked += new global::System.EventHandler (this.RadioButtonClicked); + this.rbEquipNumeric.Clicked += new global::System.EventHandler (this.RadioButtonClicked); + this.rbEquipAll.Clicked += new global::System.EventHandler (this.RadioButtonClicked); + this.percentageAmount.ValueChanged += new global::System.EventHandler (this.SpinButtonValueChanged); + this.numericAmount.ValueChanged += new global::System.EventHandler (this.SpinButtonValueChanged); + this.bttnCancel.Clicked += new global::System.EventHandler (this.CancelButtonClicked); + this.bttnOkay.Clicked += new global::System.EventHandler (this.OkayButtonClicked); } } }
--- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmMainWindow.cs Tue Oct 25 20:32:47 2011 +0100 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmMainWindow.cs Sat Nov 12 19:53:26 2011 +0000 @@ -136,7 +136,6 @@ // Container child IBBoard.WarFoundry.GUI.GTK.FrmMainWindow.Gtk.Container+ContainerChild this.vbox1 = new global::Gtk.VBox (); this.vbox1.Name = "vbox1"; - this.vbox1.Spacing = 0; // Container child vbox1.Gtk.Box+BoxChild this.UIManager.AddUiFromString ("<ui><menubar name='menubar1'><menu name='menuFile' action='menuFile'><menuitem name='miNewArmy' action='miNewArmy'/><menuitem name='miOpenArmy' action='miOpenArmy'/><menuitem name='miSaveArmy' action='miSaveArmy'/><menuitem name='miSaveArmyAs' action='miSaveArmyAs'/><menu name='miExportArmyAs' action='miExportArmyAs'><menuitem name='miExportArmyAsBasicHTML' action='miExportArmyAsBasicHTML'/><menuitem name='miExportArmyAsTransformedXml' action='miExportArmyAsTransformedXml'/></menu><menuitem name='miCloseArmy' action='miCloseArmy'/><separator/><menuitem name='miReloadFiles' action='miReloadFiles'/><separator/><menuitem name='miExit' action='miExit'/></menu><menu name='menuEdit' action='menuEdit'><menuitem name='miUndo' action='miUndo'/><menuitem name='miRedo' action='miRedo'/><separator/><menuitem name='miEditArmy' action='miEditArmy'/><separator/><menuitem name='miPreferences' action='miPreferences'/></menu><menu name='menuHelp' action='menuHelp'><menuitem name='miAbout' action='miAbout'/></menu></menubar></ui>"); this.menubar1 = ((global::Gtk.MenuBar)(this.UIManager.GetWidget ("/menubar1")));
--- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewArmy.cs Tue Oct 25 20:32:47 2011 +0100 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewArmy.cs Sat Nov 12 19:53:26 2011 +0000 @@ -63,7 +63,6 @@ // Container child table1.Gtk.Table+TableChild this.hbox2 = new global::Gtk.HBox (); this.hbox2.Name = "hbox2"; - this.hbox2.Spacing = 0; // Container child hbox2.Gtk.Box+BoxChild this.sbPointsValue = new global::Gtk.SpinButton (0, 2000000000, 100); this.sbPointsValue.WidthRequest = 150;
--- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewUnit.cs Tue Oct 25 20:32:47 2011 +0100 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewUnit.cs Sat Nov 12 19:53:26 2011 +0000 @@ -111,7 +111,7 @@ this.Child.ShowAll (); } this.DefaultWidth = 403; - this.DefaultHeight = 311; + this.DefaultHeight = 234; this.validationWidget.Hide (); this.Show (); this.lstUnitTypes.RowActivated += new global::Gtk.RowActivatedHandler (this.OnRowActivated);
--- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmPreferences.cs Tue Oct 25 20:32:47 2011 +0100 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmPreferences.cs Sat Nov 12 19:53:26 2011 +0000 @@ -15,10 +15,10 @@ private global::Gtk.Label frameLabel; private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnCancel; private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnOkay; - - protected virtual void Build() + + protected virtual void Build () { - global::Stetic.Gui.Initialize(this); + global::Stetic.Gui.Initialize (this); // Widget IBBoard.WarFoundry.GUI.GTK.FrmPreferences this.Name = "IBBoard.WarFoundry.GUI.GTK.FrmPreferences"; this.TypeHint = ((global::Gdk.WindowTypeHint)(1)); @@ -30,64 +30,64 @@ w1.Name = "dialog1_VBox"; w1.BorderWidth = ((uint)(2)); // Container child dialog1_VBox.Gtk.Box+BoxChild - this.hpaned1 = new global::Gtk.HPaned(); + this.hpaned1 = new global::Gtk.HPaned (); this.hpaned1.CanFocus = true; this.hpaned1.Name = "hpaned1"; this.hpaned1.Position = 164; // Container child hpaned1.Gtk.Paned+PanedChild - this.GtkScrolledWindow = new global::Gtk.ScrolledWindow(); + this.GtkScrolledWindow = new global::Gtk.ScrolledWindow (); this.GtkScrolledWindow.Name = "GtkScrolledWindow"; this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1)); // Container child GtkScrolledWindow.Gtk.Container+ContainerChild - this.preferencesTree = new global::Gtk.TreeView(); + this.preferencesTree = new global::Gtk.TreeView (); this.preferencesTree.CanFocus = true; this.preferencesTree.Name = "preferencesTree"; this.preferencesTree.HeadersVisible = false; - this.GtkScrolledWindow.Add(this.preferencesTree); - this.hpaned1.Add(this.GtkScrolledWindow); - global::Gtk.Paned.PanedChild w3 = ((global::Gtk.Paned.PanedChild)(this.hpaned1[this.GtkScrolledWindow])); + this.GtkScrolledWindow.Add (this.preferencesTree); + this.hpaned1.Add (this.GtkScrolledWindow); + global::Gtk.Paned.PanedChild w3 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.GtkScrolledWindow])); w3.Resize = false; // Container child hpaned1.Gtk.Paned+PanedChild - this.prefsFrame = new global::Gtk.Frame(); + this.prefsFrame = new global::Gtk.Frame (); this.prefsFrame.Name = "prefsFrame"; this.prefsFrame.ShadowType = ((global::Gtk.ShadowType)(1)); this.prefsFrame.BorderWidth = ((uint)(2)); // Container child prefsFrame.Gtk.Container+ContainerChild - this.GtkAlignment2 = new global::Gtk.Alignment(0F, 0F, 1F, 1F); + this.GtkAlignment2 = new global::Gtk.Alignment (0F, 0F, 1F, 1F); this.GtkAlignment2.Name = "GtkAlignment2"; this.GtkAlignment2.LeftPadding = ((uint)(12)); // Container child GtkAlignment2.Gtk.Container+ContainerChild - this.table1 = new global::Gtk.Table(((uint)(3)), ((uint)(2)), false); + this.table1 = new global::Gtk.Table (((uint)(3)), ((uint)(2)), false); this.table1.Name = "table1"; this.table1.RowSpacing = ((uint)(6)); this.table1.ColumnSpacing = ((uint)(6)); // Container child table1.Gtk.Table+TableChild - this.languageList = global::Gtk.ComboBox.NewText(); + this.languageList = global::Gtk.ComboBox.NewText (); this.languageList.Name = "languageList"; - this.table1.Add(this.languageList); - global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1[this.languageList])); + this.table1.Add (this.languageList); + global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1 [this.languageList])); w4.LeftAttach = ((uint)(1)); w4.RightAttach = ((uint)(2)); w4.XOptions = ((global::Gtk.AttachOptions)(4)); w4.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild - this.lblLanguage = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel(); + this.lblLanguage = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel (); this.lblLanguage.Name = "lblLanguage"; - this.lblLanguage.LabelProp = global::Mono.Unix.Catalog.GetString("language:"); - this.table1.Add(this.lblLanguage); - global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1[this.lblLanguage])); + this.lblLanguage.LabelProp = global::Mono.Unix.Catalog.GetString ("language:"); + this.table1.Add (this.lblLanguage); + global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1 [this.lblLanguage])); w5.XOptions = ((global::Gtk.AttachOptions)(4)); w5.YOptions = ((global::Gtk.AttachOptions)(4)); - this.GtkAlignment2.Add(this.table1); - this.prefsFrame.Add(this.GtkAlignment2); - this.frameLabel = new global::Gtk.Label(); + this.GtkAlignment2.Add (this.table1); + this.prefsFrame.Add (this.GtkAlignment2); + this.frameLabel = new global::Gtk.Label (); this.frameLabel.Name = "frameLabel"; - this.frameLabel.LabelProp = global::Mono.Unix.Catalog.GetString("<b>language</b>"); + this.frameLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>language</b>"); this.frameLabel.UseMarkup = true; this.prefsFrame.LabelWidget = this.frameLabel; - this.hpaned1.Add(this.prefsFrame); - w1.Add(this.hpaned1); - global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(w1[this.hpaned1])); + this.hpaned1.Add (this.prefsFrame); + w1.Add (this.hpaned1); + global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(w1 [this.hpaned1])); w9.Position = 0; // Internal child IBBoard.WarFoundry.GUI.GTK.FrmPreferences.ActionArea global::Gtk.HButtonBox w10 = this.ActionArea; @@ -96,40 +96,39 @@ w10.BorderWidth = ((uint)(5)); w10.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4)); // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild - this.bttnCancel = new global::IBBoard.GtkSharp.Translatable.TranslatableButton(); + this.bttnCancel = new global::IBBoard.GtkSharp.Translatable.TranslatableButton (); this.bttnCancel.CanDefault = true; this.bttnCancel.CanFocus = true; this.bttnCancel.Name = "bttnCancel"; this.bttnCancel.UseStock = true; this.bttnCancel.UseUnderline = true; this.bttnCancel.Label = "gtk-cancel"; - this.AddActionWidget(this.bttnCancel, -6); - global::Gtk.ButtonBox.ButtonBoxChild w11 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w10[this.bttnCancel])); + this.AddActionWidget (this.bttnCancel, -6); + global::Gtk.ButtonBox.ButtonBoxChild w11 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w10 [this.bttnCancel])); w11.Expand = false; w11.Fill = false; // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild - this.bttnOkay = new global::IBBoard.GtkSharp.Translatable.TranslatableButton(); + this.bttnOkay = new global::IBBoard.GtkSharp.Translatable.TranslatableButton (); this.bttnOkay.CanDefault = true; this.bttnOkay.CanFocus = true; this.bttnOkay.Name = "bttnOkay"; this.bttnOkay.UseStock = true; this.bttnOkay.UseUnderline = true; this.bttnOkay.Label = "gtk-ok"; - this.AddActionWidget(this.bttnOkay, -5); - global::Gtk.ButtonBox.ButtonBoxChild w12 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w10[this.bttnOkay])); + this.AddActionWidget (this.bttnOkay, -5); + global::Gtk.ButtonBox.ButtonBoxChild w12 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w10 [this.bttnOkay])); w12.Position = 1; w12.Expand = false; w12.Fill = false; - if ((this.Child != null)) - { - this.Child.ShowAll(); + if ((this.Child != null)) { + this.Child.ShowAll (); } this.DefaultWidth = 400; this.DefaultHeight = 300; - this.Show(); - this.languageList.Changed += new global::System.EventHandler(this.languageListChanged); - this.bttnCancel.Clicked += new global::System.EventHandler(this.bttnCancelClicked); - this.bttnOkay.Clicked += new global::System.EventHandler(this.bttnOkayClicked); + this.Show (); + this.languageList.Changed += new global::System.EventHandler (this.languageListChanged); + this.bttnCancel.Clicked += new global::System.EventHandler (this.bttnCancelClicked); + this.bttnOkay.Clicked += new global::System.EventHandler (this.bttnOkayClicked); } } }
--- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmReplaceEquipment.cs Tue Oct 25 20:32:47 2011 +0100 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmReplaceEquipment.cs Sat Nov 12 19:53:26 2011 +0000 @@ -20,13 +20,13 @@ private global::IBBoard.GtkSharp.Translatable.TranslatableLabel lblItem; private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnCancel; private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnOkay; - - protected virtual void Build() + + protected virtual void Build () { - global::Stetic.Gui.Initialize(this); + global::Stetic.Gui.Initialize (this); // Widget IBBoard.WarFoundry.GUI.GTK.FrmReplaceEquipment this.Name = "IBBoard.WarFoundry.GUI.GTK.FrmReplaceEquipment"; - this.Title = global::Mono.Unix.Catalog.GetString("Add equipment"); + this.Title = global::Mono.Unix.Catalog.GetString ("Add equipment"); this.WindowPosition = ((global::Gtk.WindowPosition)(4)); this.Modal = true; this.SkipPagerHint = true; @@ -36,51 +36,51 @@ w1.Name = "dialog1_VBox"; w1.BorderWidth = ((uint)(2)); // Container child dialog1_VBox.Gtk.Box+BoxChild - this.table1 = new global::Gtk.Table(((uint)(2)), ((uint)(2)), false); + this.table1 = new global::Gtk.Table (((uint)(2)), ((uint)(2)), false); this.table1.Name = "table1"; this.table1.RowSpacing = ((uint)(6)); this.table1.ColumnSpacing = ((uint)(6)); // Container child table1.Gtk.Table+TableChild - this.GtkScrolledWindow = new global::Gtk.ScrolledWindow(); + this.GtkScrolledWindow = new global::Gtk.ScrolledWindow (); this.GtkScrolledWindow.Name = "GtkScrolledWindow"; this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1)); // Container child GtkScrolledWindow.Gtk.Container+ContainerChild - this.lstEquipment = new global::Gtk.TreeView(); + this.lstEquipment = new global::Gtk.TreeView (); this.lstEquipment.CanFocus = true; this.lstEquipment.Name = "lstEquipment"; this.lstEquipment.HeadersVisible = false; - this.GtkScrolledWindow.Add(this.lstEquipment); - this.table1.Add(this.GtkScrolledWindow); - global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1[this.GtkScrolledWindow])); + this.GtkScrolledWindow.Add (this.lstEquipment); + this.table1.Add (this.GtkScrolledWindow); + global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.GtkScrolledWindow])); w3.LeftAttach = ((uint)(1)); w3.RightAttach = ((uint)(2)); w3.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild - this.hbox2 = new global::Gtk.HBox(); + this.hbox2 = new global::Gtk.HBox (); this.hbox2.Name = "hbox2"; this.hbox2.Spacing = 6; // Container child hbox2.Gtk.Box+BoxChild - this.table2 = new global::Gtk.Table(((uint)(3)), ((uint)(3)), false); + this.table2 = new global::Gtk.Table (((uint)(3)), ((uint)(3)), false); this.table2.Name = "table2"; this.table2.RowSpacing = ((uint)(6)); this.table2.ColumnSpacing = ((uint)(6)); // Container child table2.Gtk.Table+TableChild - this.lblEquipAll = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel(); + this.lblEquipAll = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel (); this.lblEquipAll.Name = "lblEquipAll"; - this.lblEquipAll.LabelProp = global::Mono.Unix.Catalog.GetString("equip all"); - this.table2.Add(this.lblEquipAll); - global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table2[this.lblEquipAll])); + this.lblEquipAll.LabelProp = global::Mono.Unix.Catalog.GetString ("equip all"); + this.table2.Add (this.lblEquipAll); + global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table2 [this.lblEquipAll])); w4.TopAttach = ((uint)(2)); w4.BottomAttach = ((uint)(3)); w4.LeftAttach = ((uint)(1)); w4.RightAttach = ((uint)(2)); w4.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table2.Gtk.Table+TableChild - this.lblPercent = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel(); + this.lblPercent = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel (); this.lblPercent.Name = "lblPercent"; - this.lblPercent.LabelProp = global::Mono.Unix.Catalog.GetString("%"); - this.table2.Add(this.lblPercent); - global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table2[this.lblPercent])); + this.lblPercent.LabelProp = global::Mono.Unix.Catalog.GetString ("%"); + this.table2.Add (this.lblPercent); + global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table2 [this.lblPercent])); w5.TopAttach = ((uint)(1)); w5.BottomAttach = ((uint)(2)); w5.LeftAttach = ((uint)(2)); @@ -88,28 +88,28 @@ w5.XOptions = ((global::Gtk.AttachOptions)(4)); w5.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table2.Gtk.Table+TableChild - this.numericAmount = new global::Gtk.SpinButton(0, 100, 1); + this.numericAmount = new global::Gtk.SpinButton (0, 100, 1); this.numericAmount.CanFocus = true; this.numericAmount.Name = "numericAmount"; this.numericAmount.Adjustment.PageIncrement = 10; this.numericAmount.ClimbRate = 1; this.numericAmount.Numeric = true; - this.table2.Add(this.numericAmount); - global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table2[this.numericAmount])); + this.table2.Add (this.numericAmount); + global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table2 [this.numericAmount])); w6.LeftAttach = ((uint)(1)); w6.RightAttach = ((uint)(2)); w6.XOptions = ((global::Gtk.AttachOptions)(0)); w6.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table2.Gtk.Table+TableChild - this.percentageAmount = new global::Gtk.SpinButton(0, 100, 1); + this.percentageAmount = new global::Gtk.SpinButton (0, 100, 1); this.percentageAmount.CanFocus = true; this.percentageAmount.Name = "percentageAmount"; this.percentageAmount.Adjustment.PageIncrement = 10; this.percentageAmount.ClimbRate = 1; this.percentageAmount.Digits = ((uint)(1)); this.percentageAmount.Numeric = true; - this.table2.Add(this.percentageAmount); - global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table2[this.percentageAmount])); + this.table2.Add (this.percentageAmount); + global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table2 [this.percentageAmount])); w7.TopAttach = ((uint)(1)); w7.BottomAttach = ((uint)(2)); w7.LeftAttach = ((uint)(1)); @@ -117,74 +117,74 @@ w7.XOptions = ((global::Gtk.AttachOptions)(0)); w7.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table2.Gtk.Table+TableChild - this.rbEquipAll = new global::Gtk.RadioButton(""); + this.rbEquipAll = new global::Gtk.RadioButton (""); this.rbEquipAll.CanFocus = true; this.rbEquipAll.Name = "rbEquipAll"; this.rbEquipAll.DrawIndicator = true; this.rbEquipAll.UseUnderline = true; - this.rbEquipAll.Group = new global::GLib.SList(global::System.IntPtr.Zero); - this.table2.Add(this.rbEquipAll); - global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table2[this.rbEquipAll])); + this.rbEquipAll.Group = new global::GLib.SList (global::System.IntPtr.Zero); + this.table2.Add (this.rbEquipAll); + global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table2 [this.rbEquipAll])); w8.TopAttach = ((uint)(2)); w8.BottomAttach = ((uint)(3)); w8.XOptions = ((global::Gtk.AttachOptions)(4)); w8.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table2.Gtk.Table+TableChild - this.rbEquipNumeric = new global::Gtk.RadioButton(""); + this.rbEquipNumeric = new global::Gtk.RadioButton (""); this.rbEquipNumeric.CanFocus = true; this.rbEquipNumeric.Name = "rbEquipNumeric"; this.rbEquipNumeric.DrawIndicator = true; this.rbEquipNumeric.UseUnderline = true; this.rbEquipNumeric.Group = this.rbEquipAll.Group; - this.table2.Add(this.rbEquipNumeric); - global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table2[this.rbEquipNumeric])); + this.table2.Add (this.rbEquipNumeric); + global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table2 [this.rbEquipNumeric])); w9.XOptions = ((global::Gtk.AttachOptions)(4)); w9.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table2.Gtk.Table+TableChild - this.rbEquipPercent = new global::Gtk.RadioButton(""); + this.rbEquipPercent = new global::Gtk.RadioButton (""); this.rbEquipPercent.CanFocus = true; this.rbEquipPercent.Name = "rbEquipPercent"; this.rbEquipPercent.DrawIndicator = true; this.rbEquipPercent.UseUnderline = true; this.rbEquipPercent.Group = this.rbEquipAll.Group; - this.table2.Add(this.rbEquipPercent); - global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table2[this.rbEquipPercent])); + this.table2.Add (this.rbEquipPercent); + global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table2 [this.rbEquipPercent])); w10.TopAttach = ((uint)(1)); w10.BottomAttach = ((uint)(2)); w10.XOptions = ((global::Gtk.AttachOptions)(4)); w10.YOptions = ((global::Gtk.AttachOptions)(4)); - this.hbox2.Add(this.table2); - global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.table2])); + this.hbox2.Add (this.table2); + global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.table2])); w11.Position = 0; w11.Expand = false; w11.Fill = false; - this.table1.Add(this.hbox2); - global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1[this.hbox2])); + this.table1.Add (this.hbox2); + global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1 [this.hbox2])); w12.TopAttach = ((uint)(1)); w12.BottomAttach = ((uint)(2)); w12.LeftAttach = ((uint)(1)); w12.RightAttach = ((uint)(2)); w12.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild - this.lblAmount = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel(); + this.lblAmount = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel (); this.lblAmount.Name = "lblAmount"; - this.lblAmount.LabelProp = global::Mono.Unix.Catalog.GetString("amount:"); - this.table1.Add(this.lblAmount); - global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1[this.lblAmount])); + this.lblAmount.LabelProp = global::Mono.Unix.Catalog.GetString ("amount:"); + this.table1.Add (this.lblAmount); + global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1 [this.lblAmount])); w13.TopAttach = ((uint)(1)); w13.BottomAttach = ((uint)(2)); w13.XOptions = ((global::Gtk.AttachOptions)(4)); w13.YOptions = ((global::Gtk.AttachOptions)(4)); // Container child table1.Gtk.Table+TableChild - this.lblItem = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel(); + this.lblItem = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel (); this.lblItem.Name = "lblItem"; - this.lblItem.LabelProp = global::Mono.Unix.Catalog.GetString("equipment"); - this.table1.Add(this.lblItem); - global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1[this.lblItem])); + this.lblItem.LabelProp = global::Mono.Unix.Catalog.GetString ("equipment"); + this.table1.Add (this.lblItem); + global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1 [this.lblItem])); w14.XOptions = ((global::Gtk.AttachOptions)(4)); w14.YOptions = ((global::Gtk.AttachOptions)(4)); - w1.Add(this.table1); - global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(w1[this.table1])); + w1.Add (this.table1); + global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(w1 [this.table1])); w15.Position = 0; w15.Expand = false; w15.Fill = false; @@ -195,42 +195,41 @@ w16.BorderWidth = ((uint)(5)); w16.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4)); // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild - this.bttnCancel = new global::IBBoard.GtkSharp.Translatable.TranslatableButton(); + this.bttnCancel = new global::IBBoard.GtkSharp.Translatable.TranslatableButton (); this.bttnCancel.CanDefault = true; this.bttnCancel.CanFocus = true; this.bttnCancel.Name = "bttnCancel"; this.bttnCancel.UseStock = true; this.bttnCancel.UseUnderline = true; this.bttnCancel.Label = "gtk-cancel"; - this.AddActionWidget(this.bttnCancel, -6); - global::Gtk.ButtonBox.ButtonBoxChild w17 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16[this.bttnCancel])); + this.AddActionWidget (this.bttnCancel, -6); + global::Gtk.ButtonBox.ButtonBoxChild w17 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16 [this.bttnCancel])); w17.Expand = false; w17.Fill = false; // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild - this.bttnOkay = new global::IBBoard.GtkSharp.Translatable.TranslatableButton(); + this.bttnOkay = new global::IBBoard.GtkSharp.Translatable.TranslatableButton (); this.bttnOkay.CanDefault = true; this.bttnOkay.CanFocus = true; this.bttnOkay.Name = "bttnOkay"; this.bttnOkay.UseStock = true; this.bttnOkay.UseUnderline = true; this.bttnOkay.Label = "gtk-ok"; - this.AddActionWidget(this.bttnOkay, -5); - global::Gtk.ButtonBox.ButtonBoxChild w18 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16[this.bttnOkay])); + this.AddActionWidget (this.bttnOkay, -5); + global::Gtk.ButtonBox.ButtonBoxChild w18 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16 [this.bttnOkay])); w18.Position = 1; w18.Expand = false; w18.Fill = false; - if ((this.Child != null)) - { - this.Child.ShowAll(); + if ((this.Child != null)) { + this.Child.ShowAll (); } this.DefaultWidth = 400; this.DefaultHeight = 300; - this.Show(); - this.rbEquipNumeric.Clicked += new global::System.EventHandler(this.RadioButtonClicked); - this.percentageAmount.ValueChanged += new global::System.EventHandler(this.SpinButtonValueChanged); - this.numericAmount.ValueChanged += new global::System.EventHandler(this.SpinButtonValueChanged); - this.bttnCancel.Clicked += new global::System.EventHandler(this.CancelButtonClicked); - this.bttnOkay.Clicked += new global::System.EventHandler(this.OkayButtonClicked); + this.Show (); + this.rbEquipNumeric.Clicked += new global::System.EventHandler (this.RadioButtonClicked); + this.percentageAmount.ValueChanged += new global::System.EventHandler (this.SpinButtonValueChanged); + this.numericAmount.ValueChanged += new global::System.EventHandler (this.SpinButtonValueChanged); + this.bttnCancel.Clicked += new global::System.EventHandler (this.CancelButtonClicked); + this.bttnOkay.Clicked += new global::System.EventHandler (this.OkayButtonClicked); } } }
--- a/gtk-gui/generated.cs Tue Oct 25 20:32:47 2011 +0100 +++ b/gtk-gui/generated.cs Sat Nov 12 19:53:26 2011 +0000 @@ -5,123 +5,109 @@ internal class Gui { private static bool initialized; - - internal static void Initialize(Gtk.Widget iconRenderer) + + internal static void Initialize (Gtk.Widget iconRenderer) { - if ((Stetic.Gui.initialized == false)) - { + if ((Stetic.Gui.initialized == false)) { Stetic.Gui.initialized = true; } } } - + internal class IconLoader { - public static Gdk.Pixbuf LoadIcon(Gtk.Widget widget, string name, Gtk.IconSize size) + public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size) { - Gdk.Pixbuf res = widget.RenderIcon(name, size, null); - if ((res != null)) - { + Gdk.Pixbuf res = widget.RenderIcon (name, size, null); + if ((res != null)) { return res; - } - else - { + } else { int sz; int sy; - global::Gtk.Icon.SizeLookup(size, out sz, out sy); - try - { - return Gtk.IconTheme.Default.LoadIcon(name, sz, 0); - } - catch (System.Exception) - { - if ((name != "gtk-missing-image")) - { - return Stetic.IconLoader.LoadIcon(widget, "gtk-missing-image", size); - } - else - { - Gdk.Pixmap pmap = new Gdk.Pixmap(Gdk.Screen.Default.RootWindow, sz, sz); - Gdk.GC gc = new Gdk.GC(pmap); - gc.RgbFgColor = new Gdk.Color(255, 255, 255); - pmap.DrawRectangle(gc, true, 0, 0, sz, sz); - gc.RgbFgColor = new Gdk.Color(0, 0, 0); - pmap.DrawRectangle(gc, false, 0, 0, (sz - 1), (sz - 1)); - gc.SetLineAttributes(3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round); - gc.RgbFgColor = new Gdk.Color(255, 0, 0); - pmap.DrawLine(gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4))); - pmap.DrawLine(gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4))); - return Gdk.Pixbuf.FromDrawable(pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz); + global::Gtk.Icon.SizeLookup (size, out sz, out sy); + try { + return Gtk.IconTheme.Default.LoadIcon (name, sz, 0); + } catch (System.Exception) { + if ((name != "gtk-missing-image")) { + return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size); + } else { + Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz); + Gdk.GC gc = new Gdk.GC (pmap); + gc.RgbFgColor = new Gdk.Color (255, 255, 255); + pmap.DrawRectangle (gc, true, 0, 0, sz, sz); + gc.RgbFgColor = new Gdk.Color (0, 0, 0); + pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1)); + gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round); + gc.RgbFgColor = new Gdk.Color (255, 0, 0); + pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4))); + pmap.DrawLine (gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4))); + return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz); } } } } } - + internal class BinContainer { private Gtk.Widget child; private Gtk.UIManager uimanager; - - public static BinContainer Attach(Gtk.Bin bin) + + 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); + 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) + + private void OnSizeRequested (object sender, Gtk.SizeRequestedArgs args) { - if ((this.child != null)) - { - args.Requisition = this.child.SizeRequest(); + if ((this.child != null)) { + args.Requisition = this.child.SizeRequest (); } } - - private void OnSizeAllocated(object sender, Gtk.SizeAllocatedArgs args) + + private void OnSizeAllocated (object sender, Gtk.SizeAllocatedArgs args) { - if ((this.child != null)) - { + if ((this.child != null)) { this.child.Allocation = args.Allocation; } } - - private void OnAdded(object sender, Gtk.AddedArgs args) + + private void OnAdded (object sender, Gtk.AddedArgs args) { this.child = args.Widget; } - - public void SetUiManager(Gtk.UIManager uim) + + public void SetUiManager (Gtk.UIManager uim) { this.uimanager = uim; - this.child.Realized += new System.EventHandler(this.OnRealized); + this.child.Realized += new System.EventHandler (this.OnRealized); } - - private void OnRealized(object sender, System.EventArgs args) + + private void OnRealized (object sender, System.EventArgs args) { - if ((this.uimanager != null)) - { + 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); + 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) + public static Gtk.ActionGroup GetActionGroup (System.Type type) { - return Stetic.ActionGroups.GetActionGroup(type.FullName); + return Stetic.ActionGroups.GetActionGroup (type.FullName); } - - public static Gtk.ActionGroup GetActionGroup(string name) + + public static Gtk.ActionGroup GetActionGroup (string name) { return null; }