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 diff
     1.1 --- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmAbout.cs	Tue Oct 25 20:32:47 2011 +0100
     1.2 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmAbout.cs	Sat Nov 12 19:53:26 2011 +0000
     1.3 @@ -11,14 +11,14 @@
     1.4  		private global::Gtk.Label lblWarFoundryLink;
     1.5  		private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnCredits;
     1.6  		private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnClose;
     1.7 -
     1.8 -		protected virtual void Build()
     1.9 +		
    1.10 +		protected virtual void Build ()
    1.11  		{
    1.12 -			global::Stetic.Gui.Initialize(this);
    1.13 +			global::Stetic.Gui.Initialize (this);
    1.14  			// Widget IBBoard.WarFoundry.GUI.GTK.FrmAbout
    1.15  			this.Name = "IBBoard.WarFoundry.GUI.GTK.FrmAbout";
    1.16 -			this.Title = global::Mono.Unix.Catalog.GetString("About WF");
    1.17 -			this.Icon = global::Gdk.Pixbuf.LoadFromResource("App.ico");
    1.18 +			this.Title = global::Mono.Unix.Catalog.GetString ("About WF");
    1.19 +			this.Icon = global::Gdk.Pixbuf.LoadFromResource ("App.ico");
    1.20  			this.TypeHint = ((global::Gdk.WindowTypeHint)(1));
    1.21  			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
    1.22  			this.Resizable = false;
    1.23 @@ -30,51 +30,51 @@
    1.24  			w1.Name = "dialog1_VBox";
    1.25  			w1.BorderWidth = ((uint)(2));
    1.26  			// Container child dialog1_VBox.Gtk.Box+BoxChild
    1.27 -			this.logoImage = new global::Gtk.Image();
    1.28 +			this.logoImage = new global::Gtk.Image ();
    1.29  			this.logoImage.Name = "logoImage";
    1.30 -			this.logoImage.Pixbuf = global::Gdk.Pixbuf.LoadFromResource("IBBoard.WarFoundry.GUI.GTK.App-lrg.png");
    1.31 -			w1.Add(this.logoImage);
    1.32 -			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(w1[this.logoImage]));
    1.33 +			this.logoImage.Pixbuf = global::Gdk.Pixbuf.LoadFromResource ("IBBoard.WarFoundry.GUI.GTK.App-lrg.png");
    1.34 +			w1.Add (this.logoImage);
    1.35 +			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(w1 [this.logoImage]));
    1.36  			w2.Position = 0;
    1.37  			w2.Expand = false;
    1.38  			w2.Fill = false;
    1.39  			// Container child dialog1_VBox.Gtk.Box+BoxChild
    1.40 -			this.label1 = new global::Gtk.Label();
    1.41 +			this.label1 = new global::Gtk.Label ();
    1.42  			this.label1.Name = "label1";
    1.43 -			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("<span font_size=\"x-large\" weight=\"bold\">WarFoundry v0.1 RC 1</span>");
    1.44 +			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("<span font_size=\"x-large\" weight=\"bold\">WarFoundry v0.1 RC 1</span>");
    1.45  			this.label1.UseMarkup = true;
    1.46 -			w1.Add(this.label1);
    1.47 -			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(w1[this.label1]));
    1.48 +			w1.Add (this.label1);
    1.49 +			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(w1 [this.label1]));
    1.50  			w3.Position = 1;
    1.51  			w3.Expand = false;
    1.52  			w3.Fill = false;
    1.53  			// Container child dialog1_VBox.Gtk.Box+BoxChild
    1.54 -			this.lblWarFoundryDesc = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
    1.55 +			this.lblWarFoundryDesc = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel ();
    1.56  			this.lblWarFoundryDesc.Name = "lblWarFoundryDesc";
    1.57 -			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.");
    1.58 +			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.");
    1.59  			this.lblWarFoundryDesc.Wrap = true;
    1.60  			this.lblWarFoundryDesc.Justify = ((global::Gtk.Justification)(2));
    1.61 -			w1.Add(this.lblWarFoundryDesc);
    1.62 -			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(w1[this.lblWarFoundryDesc]));
    1.63 +			w1.Add (this.lblWarFoundryDesc);
    1.64 +			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(w1 [this.lblWarFoundryDesc]));
    1.65  			w4.Position = 2;
    1.66  			w4.Expand = false;
    1.67  			w4.Fill = false;
    1.68  			// Container child dialog1_VBox.Gtk.Box+BoxChild
    1.69 -			this.lblWarFoundryCopyright = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
    1.70 +			this.lblWarFoundryCopyright = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel ();
    1.71  			this.lblWarFoundryCopyright.Name = "lblWarFoundryCopyright";
    1.72 -			this.lblWarFoundryCopyright.LabelProp = global::Mono.Unix.Catalog.GetString("© 2007-2010, IBBoard and others");
    1.73 -			w1.Add(this.lblWarFoundryCopyright);
    1.74 -			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(w1[this.lblWarFoundryCopyright]));
    1.75 +			this.lblWarFoundryCopyright.LabelProp = global::Mono.Unix.Catalog.GetString ("© 2007-2010, IBBoard and others");
    1.76 +			w1.Add (this.lblWarFoundryCopyright);
    1.77 +			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(w1 [this.lblWarFoundryCopyright]));
    1.78  			w5.Position = 3;
    1.79  			w5.Expand = false;
    1.80  			w5.Fill = false;
    1.81  			// Container child dialog1_VBox.Gtk.Box+BoxChild
    1.82 -			this.lblWarFoundryLink = new global::Gtk.Label();
    1.83 +			this.lblWarFoundryLink = new global::Gtk.Label ();
    1.84  			this.lblWarFoundryLink.Name = "lblWarFoundryLink";
    1.85 -			this.lblWarFoundryLink.LabelProp = global::Mono.Unix.Catalog.GetString("<a href=\"http://warfoundry.co.uk\">http://warfoundry.co.uk</a>");
    1.86 +			this.lblWarFoundryLink.LabelProp = global::Mono.Unix.Catalog.GetString ("<a href=\"http://warfoundry.co.uk\">http://warfoundry.co.uk</a>");
    1.87  			this.lblWarFoundryLink.UseMarkup = true;
    1.88 -			w1.Add(this.lblWarFoundryLink);
    1.89 -			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(w1[this.lblWarFoundryLink]));
    1.90 +			w1.Add (this.lblWarFoundryLink);
    1.91 +			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(w1 [this.lblWarFoundryLink]));
    1.92  			w6.Position = 4;
    1.93  			w6.Expand = false;
    1.94  			w6.Fill = false;
    1.95 @@ -85,38 +85,37 @@
    1.96  			w7.BorderWidth = ((uint)(5));
    1.97  			w7.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
    1.98  			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
    1.99 -			this.bttnCredits = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
   1.100 +			this.bttnCredits = new global::IBBoard.GtkSharp.Translatable.TranslatableButton ();
   1.101  			this.bttnCredits.CanFocus = true;
   1.102  			this.bttnCredits.Name = "bttnCredits";
   1.103  			this.bttnCredits.UseStock = true;
   1.104  			this.bttnCredits.UseUnderline = true;
   1.105  			this.bttnCredits.Label = "gtk-about";
   1.106 -			w7.Add(this.bttnCredits);
   1.107 -			global::Gtk.ButtonBox.ButtonBoxChild w8 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w7[this.bttnCredits]));
   1.108 +			w7.Add (this.bttnCredits);
   1.109 +			global::Gtk.ButtonBox.ButtonBoxChild w8 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w7 [this.bttnCredits]));
   1.110  			w8.Expand = false;
   1.111  			w8.Fill = false;
   1.112  			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
   1.113 -			this.bttnClose = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
   1.114 +			this.bttnClose = new global::IBBoard.GtkSharp.Translatable.TranslatableButton ();
   1.115  			this.bttnClose.CanDefault = true;
   1.116  			this.bttnClose.CanFocus = true;
   1.117  			this.bttnClose.Name = "bttnClose";
   1.118  			this.bttnClose.UseStock = true;
   1.119  			this.bttnClose.UseUnderline = true;
   1.120  			this.bttnClose.Label = "gtk-close";
   1.121 -			this.AddActionWidget(this.bttnClose, -7);
   1.122 -			global::Gtk.ButtonBox.ButtonBoxChild w9 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w7[this.bttnClose]));
   1.123 +			this.AddActionWidget (this.bttnClose, -7);
   1.124 +			global::Gtk.ButtonBox.ButtonBoxChild w9 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w7 [this.bttnClose]));
   1.125  			w9.Position = 1;
   1.126  			w9.Expand = false;
   1.127  			w9.Fill = false;
   1.128 -			if ((this.Child != null))
   1.129 -			{
   1.130 -				this.Child.ShowAll();
   1.131 +			if ((this.Child != null)) {
   1.132 +				this.Child.ShowAll ();
   1.133  			}
   1.134  			this.DefaultWidth = 330;
   1.135  			this.DefaultHeight = 300;
   1.136  			this.bttnClose.HasDefault = true;
   1.137 -			this.Show();
   1.138 -			this.bttnCredits.Clicked += new global::System.EventHandler(this.BttnCreditsClicked);
   1.139 +			this.Show ();
   1.140 +			this.bttnCredits.Clicked += new global::System.EventHandler (this.BttnCreditsClicked);
   1.141  		}
   1.142  	}
   1.143  }
     2.1 --- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmAboutCredits.cs	Tue Oct 25 20:32:47 2011 +0100
     2.2 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmAboutCredits.cs	Sat Nov 12 19:53:26 2011 +0000
     2.3 @@ -12,13 +12,13 @@
     2.4  		private global::IBBoard.GtkSharp.Translatable.TranslatableLabel lblTestersCommon;
     2.5  		private global::IBBoard.GtkSharp.Translatable.TranslatableLabel lblTestersGtk;
     2.6  		private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnClose;
     2.7 -
     2.8 -		protected virtual void Build()
     2.9 +		
    2.10 +		protected virtual void Build ()
    2.11  		{
    2.12 -			global::Stetic.Gui.Initialize(this);
    2.13 +			global::Stetic.Gui.Initialize (this);
    2.14  			// Widget IBBoard.WarFoundry.GUI.GTK.FrmAboutCredits
    2.15  			this.Name = "IBBoard.WarFoundry.GUI.GTK.FrmAboutCredits";
    2.16 -			this.Icon = global::Gdk.Pixbuf.LoadFromResource("App.ico");
    2.17 +			this.Icon = global::Gdk.Pixbuf.LoadFromResource ("App.ico");
    2.18  			this.TypeHint = ((global::Gdk.WindowTypeHint)(1));
    2.19  			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
    2.20  			this.SkipPagerHint = true;
    2.21 @@ -28,49 +28,49 @@
    2.22  			w1.Name = "dialog1_VBox";
    2.23  			w1.BorderWidth = ((uint)(2));
    2.24  			// Container child dialog1_VBox.Gtk.Box+BoxChild
    2.25 -			this.table1 = new global::Gtk.Table(((uint)(3)), ((uint)(2)), false);
    2.26 +			this.table1 = new global::Gtk.Table (((uint)(3)), ((uint)(2)), false);
    2.27  			this.table1.Name = "table1";
    2.28  			this.table1.RowSpacing = ((uint)(6));
    2.29  			this.table1.ColumnSpacing = ((uint)(6));
    2.30  			// Container child table1.Gtk.Table+TableChild
    2.31 -			this.label1 = new global::Gtk.Label();
    2.32 +			this.label1 = new global::Gtk.Label ();
    2.33  			this.label1.Name = "label1";
    2.34  			this.label1.Xpad = 3;
    2.35  			this.label1.Ypad = 3;
    2.36  			this.label1.Xalign = 0F;
    2.37  			this.label1.Yalign = 0F;
    2.38  			this.label1.LabelProp = "IBBoard (Main developer and project lead)";
    2.39 -			this.table1.Add(this.label1);
    2.40 -			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1[this.label1]));
    2.41 +			this.table1.Add (this.label1);
    2.42 +			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1 [this.label1]));
    2.43  			w2.LeftAttach = ((uint)(1));
    2.44  			w2.RightAttach = ((uint)(2));
    2.45  			w2.XOptions = ((global::Gtk.AttachOptions)(4));
    2.46  			w2.YOptions = ((global::Gtk.AttachOptions)(4));
    2.47  			// Container child table1.Gtk.Table+TableChild
    2.48 -			this.label2 = new global::Gtk.Label();
    2.49 +			this.label2 = new global::Gtk.Label ();
    2.50  			this.label2.Name = "label2";
    2.51  			this.label2.Xpad = 3;
    2.52  			this.label2.Ypad = 3;
    2.53  			this.label2.Xalign = 0F;
    2.54  			this.label2.Yalign = 0F;
    2.55 -			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString("HeWhoWatches");
    2.56 -			this.table1.Add(this.label2);
    2.57 -			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1[this.label2]));
    2.58 +			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("HeWhoWatches");
    2.59 +			this.table1.Add (this.label2);
    2.60 +			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.label2]));
    2.61  			w3.TopAttach = ((uint)(1));
    2.62  			w3.BottomAttach = ((uint)(2));
    2.63  			w3.LeftAttach = ((uint)(1));
    2.64  			w3.RightAttach = ((uint)(2));
    2.65  			w3.YOptions = ((global::Gtk.AttachOptions)(4));
    2.66  			// Container child table1.Gtk.Table+TableChild
    2.67 -			this.label3 = new global::Gtk.Label();
    2.68 +			this.label3 = new global::Gtk.Label ();
    2.69  			this.label3.Name = "label3";
    2.70  			this.label3.Xpad = 3;
    2.71  			this.label3.Ypad = 3;
    2.72  			this.label3.Xalign = 0F;
    2.73  			this.label3.Yalign = 0F;
    2.74 -			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString("Snowblizz,\r\nFrostlee,\r\nLord_Archaon,\r\nFurrie,\r\nclutch110,\r\nMollo,\r\nHeWhoWatches");
    2.75 -			this.table1.Add(this.label3);
    2.76 -			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1[this.label3]));
    2.77 +			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("Snowblizz,\r\nFrostlee,\r\nLord_Archaon,\r\nFurrie,\r\nclutch110,\r\nMollo,\r\nHeWhoWatches");
    2.78 +			this.table1.Add (this.label3);
    2.79 +			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1 [this.label3]));
    2.80  			w4.TopAttach = ((uint)(2));
    2.81  			w4.BottomAttach = ((uint)(3));
    2.82  			w4.LeftAttach = ((uint)(1));
    2.83 @@ -78,47 +78,47 @@
    2.84  			w4.XOptions = ((global::Gtk.AttachOptions)(4));
    2.85  			w4.YOptions = ((global::Gtk.AttachOptions)(4));
    2.86  			// Container child table1.Gtk.Table+TableChild
    2.87 -			this.lblDevelopers = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
    2.88 +			this.lblDevelopers = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel ();
    2.89  			this.lblDevelopers.Name = "lblDevelopers";
    2.90  			this.lblDevelopers.Xpad = 3;
    2.91  			this.lblDevelopers.Ypad = 3;
    2.92  			this.lblDevelopers.Xalign = 0F;
    2.93  			this.lblDevelopers.Yalign = 0F;
    2.94 -			this.lblDevelopers.LabelProp = global::Mono.Unix.Catalog.GetString("developers:");
    2.95 -			this.table1.Add(this.lblDevelopers);
    2.96 -			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1[this.lblDevelopers]));
    2.97 +			this.lblDevelopers.LabelProp = global::Mono.Unix.Catalog.GetString ("developers:");
    2.98 +			this.table1.Add (this.lblDevelopers);
    2.99 +			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1 [this.lblDevelopers]));
   2.100  			w5.XOptions = ((global::Gtk.AttachOptions)(4));
   2.101  			w5.YOptions = ((global::Gtk.AttachOptions)(4));
   2.102  			// Container child table1.Gtk.Table+TableChild
   2.103 -			this.lblTestersCommon = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
   2.104 +			this.lblTestersCommon = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel ();
   2.105  			this.lblTestersCommon.Name = "lblTestersCommon";
   2.106  			this.lblTestersCommon.Xpad = 3;
   2.107  			this.lblTestersCommon.Ypad = 3;
   2.108  			this.lblTestersCommon.Xalign = 0F;
   2.109  			this.lblTestersCommon.Yalign = 0F;
   2.110 -			this.lblTestersCommon.LabelProp = global::Mono.Unix.Catalog.GetString("testers (common):");
   2.111 -			this.table1.Add(this.lblTestersCommon);
   2.112 -			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1[this.lblTestersCommon]));
   2.113 +			this.lblTestersCommon.LabelProp = global::Mono.Unix.Catalog.GetString ("testers (common):");
   2.114 +			this.table1.Add (this.lblTestersCommon);
   2.115 +			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1 [this.lblTestersCommon]));
   2.116  			w6.TopAttach = ((uint)(2));
   2.117  			w6.BottomAttach = ((uint)(3));
   2.118  			w6.XOptions = ((global::Gtk.AttachOptions)(4));
   2.119  			w6.YOptions = ((global::Gtk.AttachOptions)(4));
   2.120  			// Container child table1.Gtk.Table+TableChild
   2.121 -			this.lblTestersGtk = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
   2.122 +			this.lblTestersGtk = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel ();
   2.123  			this.lblTestersGtk.Name = "lblTestersGtk";
   2.124  			this.lblTestersGtk.Xpad = 3;
   2.125  			this.lblTestersGtk.Ypad = 3;
   2.126  			this.lblTestersGtk.Xalign = 0F;
   2.127  			this.lblTestersGtk.Yalign = 0F;
   2.128 -			this.lblTestersGtk.LabelProp = global::Mono.Unix.Catalog.GetString("testers (GTK UI):");
   2.129 -			this.table1.Add(this.lblTestersGtk);
   2.130 -			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1[this.lblTestersGtk]));
   2.131 +			this.lblTestersGtk.LabelProp = global::Mono.Unix.Catalog.GetString ("testers (GTK UI):");
   2.132 +			this.table1.Add (this.lblTestersGtk);
   2.133 +			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1 [this.lblTestersGtk]));
   2.134  			w7.TopAttach = ((uint)(1));
   2.135  			w7.BottomAttach = ((uint)(2));
   2.136  			w7.XOptions = ((global::Gtk.AttachOptions)(4));
   2.137  			w7.YOptions = ((global::Gtk.AttachOptions)(4));
   2.138 -			w1.Add(this.table1);
   2.139 -			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(w1[this.table1]));
   2.140 +			w1.Add (this.table1);
   2.141 +			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(w1 [this.table1]));
   2.142  			w8.Position = 0;
   2.143  			w8.Expand = false;
   2.144  			w8.Fill = false;
   2.145 @@ -129,24 +129,23 @@
   2.146  			w9.BorderWidth = ((uint)(5));
   2.147  			w9.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
   2.148  			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
   2.149 -			this.bttnClose = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
   2.150 +			this.bttnClose = new global::IBBoard.GtkSharp.Translatable.TranslatableButton ();
   2.151  			this.bttnClose.CanDefault = true;
   2.152  			this.bttnClose.CanFocus = true;
   2.153  			this.bttnClose.Name = "bttnClose";
   2.154  			this.bttnClose.UseStock = true;
   2.155  			this.bttnClose.UseUnderline = true;
   2.156  			this.bttnClose.Label = "gtk-close";
   2.157 -			this.AddActionWidget(this.bttnClose, -7);
   2.158 -			global::Gtk.ButtonBox.ButtonBoxChild w10 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w9[this.bttnClose]));
   2.159 +			this.AddActionWidget (this.bttnClose, -7);
   2.160 +			global::Gtk.ButtonBox.ButtonBoxChild w10 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w9 [this.bttnClose]));
   2.161  			w10.Expand = false;
   2.162  			w10.Fill = false;
   2.163 -			if ((this.Child != null))
   2.164 -			{
   2.165 -				this.Child.ShowAll();
   2.166 +			if ((this.Child != null)) {
   2.167 +				this.Child.ShowAll ();
   2.168  			}
   2.169  			this.DefaultWidth = 376;
   2.170  			this.DefaultHeight = 250;
   2.171 -			this.Show();
   2.172 +			this.Show ();
   2.173  		}
   2.174  	}
   2.175  }
     3.1 --- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmAddEquipment.cs	Tue Oct 25 20:32:47 2011 +0100
     3.2 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmAddEquipment.cs	Sat Nov 12 19:53:26 2011 +0000
     3.3 @@ -20,13 +20,13 @@
     3.4  		private global::IBBoard.GtkSharp.Translatable.TranslatableLabel lblItem;
     3.5  		private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnCancel;
     3.6  		private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnOkay;
     3.7 -
     3.8 -		protected virtual void Build()
     3.9 +		
    3.10 +		protected virtual void Build ()
    3.11  		{
    3.12 -			global::Stetic.Gui.Initialize(this);
    3.13 +			global::Stetic.Gui.Initialize (this);
    3.14  			// Widget IBBoard.WarFoundry.GUI.GTK.FrmAddEquipment
    3.15  			this.Name = "IBBoard.WarFoundry.GUI.GTK.FrmAddEquipment";
    3.16 -			this.Title = global::Mono.Unix.Catalog.GetString("Add equipment");
    3.17 +			this.Title = global::Mono.Unix.Catalog.GetString ("Add equipment");
    3.18  			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
    3.19  			this.Modal = true;
    3.20  			this.SkipPagerHint = true;
    3.21 @@ -36,51 +36,51 @@
    3.22  			w1.Name = "dialog1_VBox";
    3.23  			w1.BorderWidth = ((uint)(2));
    3.24  			// Container child dialog1_VBox.Gtk.Box+BoxChild
    3.25 -			this.table1 = new global::Gtk.Table(((uint)(2)), ((uint)(2)), false);
    3.26 +			this.table1 = new global::Gtk.Table (((uint)(2)), ((uint)(2)), false);
    3.27  			this.table1.Name = "table1";
    3.28  			this.table1.RowSpacing = ((uint)(6));
    3.29  			this.table1.ColumnSpacing = ((uint)(6));
    3.30  			// Container child table1.Gtk.Table+TableChild
    3.31 -			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow();
    3.32 +			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow ();
    3.33  			this.GtkScrolledWindow.Name = "GtkScrolledWindow";
    3.34  			this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));
    3.35  			// Container child GtkScrolledWindow.Gtk.Container+ContainerChild
    3.36 -			this.lstEquipment = new global::Gtk.TreeView();
    3.37 +			this.lstEquipment = new global::Gtk.TreeView ();
    3.38  			this.lstEquipment.CanFocus = true;
    3.39  			this.lstEquipment.Name = "lstEquipment";
    3.40  			this.lstEquipment.HeadersVisible = false;
    3.41 -			this.GtkScrolledWindow.Add(this.lstEquipment);
    3.42 -			this.table1.Add(this.GtkScrolledWindow);
    3.43 -			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1[this.GtkScrolledWindow]));
    3.44 +			this.GtkScrolledWindow.Add (this.lstEquipment);
    3.45 +			this.table1.Add (this.GtkScrolledWindow);
    3.46 +			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.GtkScrolledWindow]));
    3.47  			w3.LeftAttach = ((uint)(1));
    3.48  			w3.RightAttach = ((uint)(2));
    3.49  			w3.YOptions = ((global::Gtk.AttachOptions)(4));
    3.50  			// Container child table1.Gtk.Table+TableChild
    3.51 -			this.hbox2 = new global::Gtk.HBox();
    3.52 +			this.hbox2 = new global::Gtk.HBox ();
    3.53  			this.hbox2.Name = "hbox2";
    3.54  			this.hbox2.Spacing = 6;
    3.55  			// Container child hbox2.Gtk.Box+BoxChild
    3.56 -			this.table2 = new global::Gtk.Table(((uint)(3)), ((uint)(3)), false);
    3.57 +			this.table2 = new global::Gtk.Table (((uint)(3)), ((uint)(3)), false);
    3.58  			this.table2.Name = "table2";
    3.59  			this.table2.RowSpacing = ((uint)(6));
    3.60  			this.table2.ColumnSpacing = ((uint)(6));
    3.61  			// Container child table2.Gtk.Table+TableChild
    3.62 -			this.lblEquipAll = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
    3.63 +			this.lblEquipAll = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel ();
    3.64  			this.lblEquipAll.Name = "lblEquipAll";
    3.65 -			this.lblEquipAll.LabelProp = global::Mono.Unix.Catalog.GetString("equip all");
    3.66 -			this.table2.Add(this.lblEquipAll);
    3.67 -			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table2[this.lblEquipAll]));
    3.68 +			this.lblEquipAll.LabelProp = global::Mono.Unix.Catalog.GetString ("equip all");
    3.69 +			this.table2.Add (this.lblEquipAll);
    3.70 +			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table2 [this.lblEquipAll]));
    3.71  			w4.TopAttach = ((uint)(2));
    3.72  			w4.BottomAttach = ((uint)(3));
    3.73  			w4.LeftAttach = ((uint)(1));
    3.74  			w4.RightAttach = ((uint)(2));
    3.75  			w4.YOptions = ((global::Gtk.AttachOptions)(4));
    3.76  			// Container child table2.Gtk.Table+TableChild
    3.77 -			this.lblPercent = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
    3.78 +			this.lblPercent = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel ();
    3.79  			this.lblPercent.Name = "lblPercent";
    3.80 -			this.lblPercent.LabelProp = global::Mono.Unix.Catalog.GetString("%");
    3.81 -			this.table2.Add(this.lblPercent);
    3.82 -			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table2[this.lblPercent]));
    3.83 +			this.lblPercent.LabelProp = global::Mono.Unix.Catalog.GetString ("%");
    3.84 +			this.table2.Add (this.lblPercent);
    3.85 +			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table2 [this.lblPercent]));
    3.86  			w5.TopAttach = ((uint)(1));
    3.87  			w5.BottomAttach = ((uint)(2));
    3.88  			w5.LeftAttach = ((uint)(2));
    3.89 @@ -88,28 +88,28 @@
    3.90  			w5.XOptions = ((global::Gtk.AttachOptions)(4));
    3.91  			w5.YOptions = ((global::Gtk.AttachOptions)(4));
    3.92  			// Container child table2.Gtk.Table+TableChild
    3.93 -			this.numericAmount = new global::Gtk.SpinButton(0, 100, 1);
    3.94 +			this.numericAmount = new global::Gtk.SpinButton (0, 100, 1);
    3.95  			this.numericAmount.CanFocus = true;
    3.96  			this.numericAmount.Name = "numericAmount";
    3.97  			this.numericAmount.Adjustment.PageIncrement = 10;
    3.98  			this.numericAmount.ClimbRate = 1;
    3.99  			this.numericAmount.Numeric = true;
   3.100 -			this.table2.Add(this.numericAmount);
   3.101 -			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table2[this.numericAmount]));
   3.102 +			this.table2.Add (this.numericAmount);
   3.103 +			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table2 [this.numericAmount]));
   3.104  			w6.LeftAttach = ((uint)(1));
   3.105  			w6.RightAttach = ((uint)(2));
   3.106  			w6.XOptions = ((global::Gtk.AttachOptions)(0));
   3.107  			w6.YOptions = ((global::Gtk.AttachOptions)(4));
   3.108  			// Container child table2.Gtk.Table+TableChild
   3.109 -			this.percentageAmount = new global::Gtk.SpinButton(0, 100, 1);
   3.110 +			this.percentageAmount = new global::Gtk.SpinButton (0, 100, 1);
   3.111  			this.percentageAmount.CanFocus = true;
   3.112  			this.percentageAmount.Name = "percentageAmount";
   3.113  			this.percentageAmount.Adjustment.PageIncrement = 10;
   3.114  			this.percentageAmount.ClimbRate = 1;
   3.115  			this.percentageAmount.Digits = ((uint)(1));
   3.116  			this.percentageAmount.Numeric = true;
   3.117 -			this.table2.Add(this.percentageAmount);
   3.118 -			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table2[this.percentageAmount]));
   3.119 +			this.table2.Add (this.percentageAmount);
   3.120 +			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table2 [this.percentageAmount]));
   3.121  			w7.TopAttach = ((uint)(1));
   3.122  			w7.BottomAttach = ((uint)(2));
   3.123  			w7.LeftAttach = ((uint)(1));
   3.124 @@ -117,75 +117,75 @@
   3.125  			w7.XOptions = ((global::Gtk.AttachOptions)(0));
   3.126  			w7.YOptions = ((global::Gtk.AttachOptions)(4));
   3.127  			// Container child table2.Gtk.Table+TableChild
   3.128 -			this.rbEquipAll = new global::Gtk.RadioButton("");
   3.129 +			this.rbEquipAll = new global::Gtk.RadioButton ("");
   3.130  			this.rbEquipAll.CanFocus = true;
   3.131  			this.rbEquipAll.Name = "rbEquipAll";
   3.132  			this.rbEquipAll.Active = true;
   3.133  			this.rbEquipAll.DrawIndicator = true;
   3.134  			this.rbEquipAll.UseUnderline = true;
   3.135 -			this.rbEquipAll.Group = new global::GLib.SList(global::System.IntPtr.Zero);
   3.136 -			this.table2.Add(this.rbEquipAll);
   3.137 -			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table2[this.rbEquipAll]));
   3.138 +			this.rbEquipAll.Group = new global::GLib.SList (global::System.IntPtr.Zero);
   3.139 +			this.table2.Add (this.rbEquipAll);
   3.140 +			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table2 [this.rbEquipAll]));
   3.141  			w8.TopAttach = ((uint)(2));
   3.142  			w8.BottomAttach = ((uint)(3));
   3.143  			w8.XOptions = ((global::Gtk.AttachOptions)(4));
   3.144  			w8.YOptions = ((global::Gtk.AttachOptions)(4));
   3.145  			// Container child table2.Gtk.Table+TableChild
   3.146 -			this.rbEquipNumeric = new global::Gtk.RadioButton("");
   3.147 +			this.rbEquipNumeric = new global::Gtk.RadioButton ("");
   3.148  			this.rbEquipNumeric.CanFocus = true;
   3.149  			this.rbEquipNumeric.Name = "rbEquipNumeric";
   3.150  			this.rbEquipNumeric.DrawIndicator = true;
   3.151  			this.rbEquipNumeric.UseUnderline = true;
   3.152  			this.rbEquipNumeric.Group = this.rbEquipAll.Group;
   3.153 -			this.table2.Add(this.rbEquipNumeric);
   3.154 -			global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table2[this.rbEquipNumeric]));
   3.155 +			this.table2.Add (this.rbEquipNumeric);
   3.156 +			global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table2 [this.rbEquipNumeric]));
   3.157  			w9.XOptions = ((global::Gtk.AttachOptions)(4));
   3.158  			w9.YOptions = ((global::Gtk.AttachOptions)(4));
   3.159  			// Container child table2.Gtk.Table+TableChild
   3.160 -			this.rbEquipPercent = new global::Gtk.RadioButton("");
   3.161 +			this.rbEquipPercent = new global::Gtk.RadioButton ("");
   3.162  			this.rbEquipPercent.CanFocus = true;
   3.163  			this.rbEquipPercent.Name = "rbEquipPercent";
   3.164  			this.rbEquipPercent.DrawIndicator = true;
   3.165  			this.rbEquipPercent.UseUnderline = true;
   3.166  			this.rbEquipPercent.Group = this.rbEquipAll.Group;
   3.167 -			this.table2.Add(this.rbEquipPercent);
   3.168 -			global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table2[this.rbEquipPercent]));
   3.169 +			this.table2.Add (this.rbEquipPercent);
   3.170 +			global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table2 [this.rbEquipPercent]));
   3.171  			w10.TopAttach = ((uint)(1));
   3.172  			w10.BottomAttach = ((uint)(2));
   3.173  			w10.XOptions = ((global::Gtk.AttachOptions)(4));
   3.174  			w10.YOptions = ((global::Gtk.AttachOptions)(4));
   3.175 -			this.hbox2.Add(this.table2);
   3.176 -			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.table2]));
   3.177 +			this.hbox2.Add (this.table2);
   3.178 +			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.table2]));
   3.179  			w11.Position = 0;
   3.180  			w11.Expand = false;
   3.181  			w11.Fill = false;
   3.182 -			this.table1.Add(this.hbox2);
   3.183 -			global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1[this.hbox2]));
   3.184 +			this.table1.Add (this.hbox2);
   3.185 +			global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1 [this.hbox2]));
   3.186  			w12.TopAttach = ((uint)(1));
   3.187  			w12.BottomAttach = ((uint)(2));
   3.188  			w12.LeftAttach = ((uint)(1));
   3.189  			w12.RightAttach = ((uint)(2));
   3.190  			w12.YOptions = ((global::Gtk.AttachOptions)(4));
   3.191  			// Container child table1.Gtk.Table+TableChild
   3.192 -			this.lblAmount = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
   3.193 +			this.lblAmount = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel ();
   3.194  			this.lblAmount.Name = "lblAmount";
   3.195 -			this.lblAmount.LabelProp = global::Mono.Unix.Catalog.GetString("amount:");
   3.196 -			this.table1.Add(this.lblAmount);
   3.197 -			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1[this.lblAmount]));
   3.198 +			this.lblAmount.LabelProp = global::Mono.Unix.Catalog.GetString ("amount:");
   3.199 +			this.table1.Add (this.lblAmount);
   3.200 +			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1 [this.lblAmount]));
   3.201  			w13.TopAttach = ((uint)(1));
   3.202  			w13.BottomAttach = ((uint)(2));
   3.203  			w13.XOptions = ((global::Gtk.AttachOptions)(4));
   3.204  			w13.YOptions = ((global::Gtk.AttachOptions)(4));
   3.205  			// Container child table1.Gtk.Table+TableChild
   3.206 -			this.lblItem = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
   3.207 +			this.lblItem = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel ();
   3.208  			this.lblItem.Name = "lblItem";
   3.209 -			this.lblItem.LabelProp = global::Mono.Unix.Catalog.GetString("equipment");
   3.210 -			this.table1.Add(this.lblItem);
   3.211 -			global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1[this.lblItem]));
   3.212 +			this.lblItem.LabelProp = global::Mono.Unix.Catalog.GetString ("equipment");
   3.213 +			this.table1.Add (this.lblItem);
   3.214 +			global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1 [this.lblItem]));
   3.215  			w14.XOptions = ((global::Gtk.AttachOptions)(4));
   3.216  			w14.YOptions = ((global::Gtk.AttachOptions)(4));
   3.217 -			w1.Add(this.table1);
   3.218 -			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(w1[this.table1]));
   3.219 +			w1.Add (this.table1);
   3.220 +			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(w1 [this.table1]));
   3.221  			w15.Position = 0;
   3.222  			w15.Expand = false;
   3.223  			w15.Fill = false;
   3.224 @@ -196,42 +196,41 @@
   3.225  			w16.BorderWidth = ((uint)(5));
   3.226  			w16.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
   3.227  			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
   3.228 -			this.bttnCancel = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
   3.229 +			this.bttnCancel = new global::IBBoard.GtkSharp.Translatable.TranslatableButton ();
   3.230  			this.bttnCancel.CanDefault = true;
   3.231  			this.bttnCancel.CanFocus = true;
   3.232  			this.bttnCancel.Name = "bttnCancel";
   3.233  			this.bttnCancel.UseStock = true;
   3.234  			this.bttnCancel.UseUnderline = true;
   3.235  			this.bttnCancel.Label = "gtk-cancel";
   3.236 -			this.AddActionWidget(this.bttnCancel, -6);
   3.237 -			global::Gtk.ButtonBox.ButtonBoxChild w17 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16[this.bttnCancel]));
   3.238 +			this.AddActionWidget (this.bttnCancel, -6);
   3.239 +			global::Gtk.ButtonBox.ButtonBoxChild w17 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16 [this.bttnCancel]));
   3.240  			w17.Expand = false;
   3.241  			w17.Fill = false;
   3.242  			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
   3.243 -			this.bttnOkay = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
   3.244 +			this.bttnOkay = new global::IBBoard.GtkSharp.Translatable.TranslatableButton ();
   3.245  			this.bttnOkay.CanDefault = true;
   3.246  			this.bttnOkay.CanFocus = true;
   3.247  			this.bttnOkay.Name = "bttnOkay";
   3.248  			this.bttnOkay.UseStock = true;
   3.249  			this.bttnOkay.UseUnderline = true;
   3.250  			this.bttnOkay.Label = "gtk-ok";
   3.251 -			this.AddActionWidget(this.bttnOkay, -5);
   3.252 -			global::Gtk.ButtonBox.ButtonBoxChild w18 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16[this.bttnOkay]));
   3.253 +			this.AddActionWidget (this.bttnOkay, -5);
   3.254 +			global::Gtk.ButtonBox.ButtonBoxChild w18 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16 [this.bttnOkay]));
   3.255  			w18.Position = 1;
   3.256  			w18.Expand = false;
   3.257  			w18.Fill = false;
   3.258 -			if ((this.Child != null))
   3.259 -			{
   3.260 -				this.Child.ShowAll();
   3.261 +			if ((this.Child != null)) {
   3.262 +				this.Child.ShowAll ();
   3.263  			}
   3.264  			this.DefaultWidth = 400;
   3.265  			this.DefaultHeight = 300;
   3.266 -			this.Show();
   3.267 -			this.rbEquipNumeric.Clicked += new global::System.EventHandler(this.RadioButtonClicked);
   3.268 -			this.percentageAmount.ValueChanged += new global::System.EventHandler(this.SpinButtonValueChanged);
   3.269 -			this.numericAmount.ValueChanged += new global::System.EventHandler(this.SpinButtonValueChanged);
   3.270 -			this.bttnCancel.Clicked += new global::System.EventHandler(this.CancelButtonClicked);
   3.271 -			this.bttnOkay.Clicked += new global::System.EventHandler(this.OkayButtonClicked);
   3.272 +			this.Show ();
   3.273 +			this.rbEquipNumeric.Clicked += new global::System.EventHandler (this.RadioButtonClicked);
   3.274 +			this.percentageAmount.ValueChanged += new global::System.EventHandler (this.SpinButtonValueChanged);
   3.275 +			this.numericAmount.ValueChanged += new global::System.EventHandler (this.SpinButtonValueChanged);
   3.276 +			this.bttnCancel.Clicked += new global::System.EventHandler (this.CancelButtonClicked);
   3.277 +			this.bttnOkay.Clicked += new global::System.EventHandler (this.OkayButtonClicked);
   3.278  		}
   3.279  	}
   3.280  }
     4.1 --- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmEditArmy.cs	Tue Oct 25 20:32:47 2011 +0100
     4.2 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmEditArmy.cs	Sat Nov 12 19:53:26 2011 +0000
     4.3 @@ -31,7 +31,6 @@
     4.4  			// Container child table1.Gtk.Table+TableChild
     4.5  			this.hbox2 = new global::Gtk.HBox ();
     4.6  			this.hbox2.Name = "hbox2";
     4.7 -			this.hbox2.Spacing = 0;
     4.8  			// Container child hbox2.Gtk.Box+BoxChild
     4.9  			this.sbPointsValue = new global::Gtk.SpinButton (0, 2000000000, 100);
    4.10  			this.sbPointsValue.WidthRequest = 150;
     5.1 --- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmEditEquipment.cs	Tue Oct 25 20:32:47 2011 +0100
     5.2 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmEditEquipment.cs	Sat Nov 12 19:53:26 2011 +0000
     5.3 @@ -17,13 +17,13 @@
     5.4  		private global::IBBoard.GtkSharp.Translatable.TranslatableLabel lblAmount;
     5.5  		private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnCancel;
     5.6  		private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnOkay;
     5.7 -
     5.8 -		protected virtual void Build()
     5.9 +		
    5.10 +		protected virtual void Build ()
    5.11  		{
    5.12 -			global::Stetic.Gui.Initialize(this);
    5.13 +			global::Stetic.Gui.Initialize (this);
    5.14  			// Widget IBBoard.WarFoundry.GUI.GTK.FrmEditEquipment
    5.15  			this.Name = "IBBoard.WarFoundry.GUI.GTK.FrmEditEquipment";
    5.16 -			this.Title = global::Mono.Unix.Catalog.GetString("Edit equipment");
    5.17 +			this.Title = global::Mono.Unix.Catalog.GetString ("Edit equipment");
    5.18  			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
    5.19  			this.Modal = true;
    5.20  			this.SkipPagerHint = true;
    5.21 @@ -33,36 +33,36 @@
    5.22  			w1.Name = "dialog1_VBox";
    5.23  			w1.BorderWidth = ((uint)(2));
    5.24  			// Container child dialog1_VBox.Gtk.Box+BoxChild
    5.25 -			this.table1 = new global::Gtk.Table(((uint)(1)), ((uint)(2)), false);
    5.26 +			this.table1 = new global::Gtk.Table (((uint)(1)), ((uint)(2)), false);
    5.27  			this.table1.Name = "table1";
    5.28  			this.table1.RowSpacing = ((uint)(6));
    5.29  			this.table1.ColumnSpacing = ((uint)(6));
    5.30  			// Container child table1.Gtk.Table+TableChild
    5.31 -			this.hbox2 = new global::Gtk.HBox();
    5.32 +			this.hbox2 = new global::Gtk.HBox ();
    5.33  			this.hbox2.Name = "hbox2";
    5.34  			this.hbox2.Spacing = 6;
    5.35  			// Container child hbox2.Gtk.Box+BoxChild
    5.36 -			this.table2 = new global::Gtk.Table(((uint)(3)), ((uint)(3)), false);
    5.37 +			this.table2 = new global::Gtk.Table (((uint)(3)), ((uint)(3)), false);
    5.38  			this.table2.Name = "table2";
    5.39  			this.table2.RowSpacing = ((uint)(6));
    5.40  			this.table2.ColumnSpacing = ((uint)(6));
    5.41  			// Container child table2.Gtk.Table+TableChild
    5.42 -			this.lblEquipAll = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
    5.43 +			this.lblEquipAll = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel ();
    5.44  			this.lblEquipAll.Name = "lblEquipAll";
    5.45 -			this.lblEquipAll.LabelProp = global::Mono.Unix.Catalog.GetString("equip all");
    5.46 -			this.table2.Add(this.lblEquipAll);
    5.47 -			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table2[this.lblEquipAll]));
    5.48 +			this.lblEquipAll.LabelProp = global::Mono.Unix.Catalog.GetString ("equip all");
    5.49 +			this.table2.Add (this.lblEquipAll);
    5.50 +			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table2 [this.lblEquipAll]));
    5.51  			w2.TopAttach = ((uint)(2));
    5.52  			w2.BottomAttach = ((uint)(3));
    5.53  			w2.LeftAttach = ((uint)(1));
    5.54  			w2.RightAttach = ((uint)(2));
    5.55  			w2.YOptions = ((global::Gtk.AttachOptions)(4));
    5.56  			// Container child table2.Gtk.Table+TableChild
    5.57 -			this.lblPercent = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
    5.58 +			this.lblPercent = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel ();
    5.59  			this.lblPercent.Name = "lblPercent";
    5.60 -			this.lblPercent.LabelProp = global::Mono.Unix.Catalog.GetString("%");
    5.61 -			this.table2.Add(this.lblPercent);
    5.62 -			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table2[this.lblPercent]));
    5.63 +			this.lblPercent.LabelProp = global::Mono.Unix.Catalog.GetString ("%");
    5.64 +			this.table2.Add (this.lblPercent);
    5.65 +			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table2 [this.lblPercent]));
    5.66  			w3.TopAttach = ((uint)(1));
    5.67  			w3.BottomAttach = ((uint)(2));
    5.68  			w3.LeftAttach = ((uint)(2));
    5.69 @@ -70,28 +70,28 @@
    5.70  			w3.XOptions = ((global::Gtk.AttachOptions)(4));
    5.71  			w3.YOptions = ((global::Gtk.AttachOptions)(4));
    5.72  			// Container child table2.Gtk.Table+TableChild
    5.73 -			this.numericAmount = new global::Gtk.SpinButton(0, 100, 1);
    5.74 +			this.numericAmount = new global::Gtk.SpinButton (0, 100, 1);
    5.75  			this.numericAmount.CanFocus = true;
    5.76  			this.numericAmount.Name = "numericAmount";
    5.77  			this.numericAmount.Adjustment.PageIncrement = 10;
    5.78  			this.numericAmount.ClimbRate = 1;
    5.79  			this.numericAmount.Numeric = true;
    5.80 -			this.table2.Add(this.numericAmount);
    5.81 -			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table2[this.numericAmount]));
    5.82 +			this.table2.Add (this.numericAmount);
    5.83 +			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table2 [this.numericAmount]));
    5.84  			w4.LeftAttach = ((uint)(1));
    5.85  			w4.RightAttach = ((uint)(2));
    5.86  			w4.XOptions = ((global::Gtk.AttachOptions)(0));
    5.87  			w4.YOptions = ((global::Gtk.AttachOptions)(4));
    5.88  			// Container child table2.Gtk.Table+TableChild
    5.89 -			this.percentageAmount = new global::Gtk.SpinButton(0, 100, 1);
    5.90 +			this.percentageAmount = new global::Gtk.SpinButton (0, 100, 1);
    5.91  			this.percentageAmount.CanFocus = true;
    5.92  			this.percentageAmount.Name = "percentageAmount";
    5.93  			this.percentageAmount.Adjustment.PageIncrement = 10;
    5.94  			this.percentageAmount.ClimbRate = 1;
    5.95  			this.percentageAmount.Digits = ((uint)(1));
    5.96  			this.percentageAmount.Numeric = true;
    5.97 -			this.table2.Add(this.percentageAmount);
    5.98 -			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table2[this.percentageAmount]));
    5.99 +			this.table2.Add (this.percentageAmount);
   5.100 +			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table2 [this.percentageAmount]));
   5.101  			w5.TopAttach = ((uint)(1));
   5.102  			w5.BottomAttach = ((uint)(2));
   5.103  			w5.LeftAttach = ((uint)(1));
   5.104 @@ -99,62 +99,62 @@
   5.105  			w5.XOptions = ((global::Gtk.AttachOptions)(0));
   5.106  			w5.YOptions = ((global::Gtk.AttachOptions)(4));
   5.107  			// Container child table2.Gtk.Table+TableChild
   5.108 -			this.rbEquipAll = new global::Gtk.RadioButton("");
   5.109 +			this.rbEquipAll = new global::Gtk.RadioButton ("");
   5.110  			this.rbEquipAll.CanFocus = true;
   5.111  			this.rbEquipAll.Name = "rbEquipAll";
   5.112  			this.rbEquipAll.DrawIndicator = true;
   5.113  			this.rbEquipAll.UseUnderline = true;
   5.114 -			this.rbEquipAll.Group = new global::GLib.SList(global::System.IntPtr.Zero);
   5.115 -			this.table2.Add(this.rbEquipAll);
   5.116 -			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table2[this.rbEquipAll]));
   5.117 +			this.rbEquipAll.Group = new global::GLib.SList (global::System.IntPtr.Zero);
   5.118 +			this.table2.Add (this.rbEquipAll);
   5.119 +			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table2 [this.rbEquipAll]));
   5.120  			w6.TopAttach = ((uint)(2));
   5.121  			w6.BottomAttach = ((uint)(3));
   5.122  			w6.XOptions = ((global::Gtk.AttachOptions)(4));
   5.123  			w6.YOptions = ((global::Gtk.AttachOptions)(4));
   5.124  			// Container child table2.Gtk.Table+TableChild
   5.125 -			this.rbEquipNumeric = new global::Gtk.RadioButton("");
   5.126 +			this.rbEquipNumeric = new global::Gtk.RadioButton ("");
   5.127  			this.rbEquipNumeric.CanFocus = true;
   5.128  			this.rbEquipNumeric.Name = "rbEquipNumeric";
   5.129  			this.rbEquipNumeric.DrawIndicator = true;
   5.130  			this.rbEquipNumeric.UseUnderline = true;
   5.131  			this.rbEquipNumeric.Group = this.rbEquipAll.Group;
   5.132 -			this.table2.Add(this.rbEquipNumeric);
   5.133 -			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table2[this.rbEquipNumeric]));
   5.134 +			this.table2.Add (this.rbEquipNumeric);
   5.135 +			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table2 [this.rbEquipNumeric]));
   5.136  			w7.XOptions = ((global::Gtk.AttachOptions)(4));
   5.137  			w7.YOptions = ((global::Gtk.AttachOptions)(4));
   5.138  			// Container child table2.Gtk.Table+TableChild
   5.139 -			this.rbEquipPercent = new global::Gtk.RadioButton("");
   5.140 +			this.rbEquipPercent = new global::Gtk.RadioButton ("");
   5.141  			this.rbEquipPercent.CanFocus = true;
   5.142  			this.rbEquipPercent.Name = "rbEquipPercent";
   5.143  			this.rbEquipPercent.DrawIndicator = true;
   5.144  			this.rbEquipPercent.UseUnderline = true;
   5.145  			this.rbEquipPercent.Group = this.rbEquipAll.Group;
   5.146 -			this.table2.Add(this.rbEquipPercent);
   5.147 -			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table2[this.rbEquipPercent]));
   5.148 +			this.table2.Add (this.rbEquipPercent);
   5.149 +			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table2 [this.rbEquipPercent]));
   5.150  			w8.TopAttach = ((uint)(1));
   5.151  			w8.BottomAttach = ((uint)(2));
   5.152  			w8.XOptions = ((global::Gtk.AttachOptions)(4));
   5.153  			w8.YOptions = ((global::Gtk.AttachOptions)(4));
   5.154 -			this.hbox2.Add(this.table2);
   5.155 -			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.table2]));
   5.156 +			this.hbox2.Add (this.table2);
   5.157 +			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.table2]));
   5.158  			w9.Position = 0;
   5.159  			w9.Expand = false;
   5.160  			w9.Fill = false;
   5.161 -			this.table1.Add(this.hbox2);
   5.162 -			global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table1[this.hbox2]));
   5.163 +			this.table1.Add (this.hbox2);
   5.164 +			global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table1 [this.hbox2]));
   5.165  			w10.LeftAttach = ((uint)(1));
   5.166  			w10.RightAttach = ((uint)(2));
   5.167  			w10.YOptions = ((global::Gtk.AttachOptions)(4));
   5.168  			// Container child table1.Gtk.Table+TableChild
   5.169 -			this.lblAmount = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
   5.170 +			this.lblAmount = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel ();
   5.171  			this.lblAmount.Name = "lblAmount";
   5.172 -			this.lblAmount.LabelProp = global::Mono.Unix.Catalog.GetString("amount:");
   5.173 +			this.lblAmount.LabelProp = global::Mono.Unix.Catalog.GetString ("amount:");
   5.174  			this.lblAmount.Justify = ((global::Gtk.Justification)(1));
   5.175 -			this.table1.Add(this.lblAmount);
   5.176 -			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1[this.lblAmount]));
   5.177 +			this.table1.Add (this.lblAmount);
   5.178 +			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1 [this.lblAmount]));
   5.179  			w11.YOptions = ((global::Gtk.AttachOptions)(4));
   5.180 -			w1.Add(this.table1);
   5.181 -			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(w1[this.table1]));
   5.182 +			w1.Add (this.table1);
   5.183 +			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(w1 [this.table1]));
   5.184  			w12.Position = 0;
   5.185  			w12.Expand = false;
   5.186  			w12.Fill = false;
   5.187 @@ -165,44 +165,43 @@
   5.188  			w13.BorderWidth = ((uint)(5));
   5.189  			w13.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
   5.190  			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
   5.191 -			this.bttnCancel = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
   5.192 +			this.bttnCancel = new global::IBBoard.GtkSharp.Translatable.TranslatableButton ();
   5.193  			this.bttnCancel.CanDefault = true;
   5.194  			this.bttnCancel.CanFocus = true;
   5.195  			this.bttnCancel.Name = "bttnCancel";
   5.196  			this.bttnCancel.UseStock = true;
   5.197  			this.bttnCancel.UseUnderline = true;
   5.198  			this.bttnCancel.Label = "gtk-cancel";
   5.199 -			this.AddActionWidget(this.bttnCancel, -6);
   5.200 -			global::Gtk.ButtonBox.ButtonBoxChild w14 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w13[this.bttnCancel]));
   5.201 +			this.AddActionWidget (this.bttnCancel, -6);
   5.202 +			global::Gtk.ButtonBox.ButtonBoxChild w14 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w13 [this.bttnCancel]));
   5.203  			w14.Expand = false;
   5.204  			w14.Fill = false;
   5.205  			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
   5.206 -			this.bttnOkay = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
   5.207 +			this.bttnOkay = new global::IBBoard.GtkSharp.Translatable.TranslatableButton ();
   5.208  			this.bttnOkay.CanDefault = true;
   5.209  			this.bttnOkay.CanFocus = true;
   5.210  			this.bttnOkay.Name = "bttnOkay";
   5.211  			this.bttnOkay.UseStock = true;
   5.212  			this.bttnOkay.UseUnderline = true;
   5.213  			this.bttnOkay.Label = "gtk-ok";
   5.214 -			this.AddActionWidget(this.bttnOkay, -5);
   5.215 -			global::Gtk.ButtonBox.ButtonBoxChild w15 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w13[this.bttnOkay]));
   5.216 +			this.AddActionWidget (this.bttnOkay, -5);
   5.217 +			global::Gtk.ButtonBox.ButtonBoxChild w15 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w13 [this.bttnOkay]));
   5.218  			w15.Position = 1;
   5.219  			w15.Expand = false;
   5.220  			w15.Fill = false;
   5.221 -			if ((this.Child != null))
   5.222 -			{
   5.223 -				this.Child.ShowAll();
   5.224 +			if ((this.Child != null)) {
   5.225 +				this.Child.ShowAll ();
   5.226  			}
   5.227  			this.DefaultWidth = 280;
   5.228  			this.DefaultHeight = 175;
   5.229 -			this.Show();
   5.230 -			this.rbEquipPercent.Clicked += new global::System.EventHandler(this.RadioButtonClicked);
   5.231 -			this.rbEquipNumeric.Clicked += new global::System.EventHandler(this.RadioButtonClicked);
   5.232 -			this.rbEquipAll.Clicked += new global::System.EventHandler(this.RadioButtonClicked);
   5.233 -			this.percentageAmount.ValueChanged += new global::System.EventHandler(this.SpinButtonValueChanged);
   5.234 -			this.numericAmount.ValueChanged += new global::System.EventHandler(this.SpinButtonValueChanged);
   5.235 -			this.bttnCancel.Clicked += new global::System.EventHandler(this.CancelButtonClicked);
   5.236 -			this.bttnOkay.Clicked += new global::System.EventHandler(this.OkayButtonClicked);
   5.237 +			this.Show ();
   5.238 +			this.rbEquipPercent.Clicked += new global::System.EventHandler (this.RadioButtonClicked);
   5.239 +			this.rbEquipNumeric.Clicked += new global::System.EventHandler (this.RadioButtonClicked);
   5.240 +			this.rbEquipAll.Clicked += new global::System.EventHandler (this.RadioButtonClicked);
   5.241 +			this.percentageAmount.ValueChanged += new global::System.EventHandler (this.SpinButtonValueChanged);
   5.242 +			this.numericAmount.ValueChanged += new global::System.EventHandler (this.SpinButtonValueChanged);
   5.243 +			this.bttnCancel.Clicked += new global::System.EventHandler (this.CancelButtonClicked);
   5.244 +			this.bttnOkay.Clicked += new global::System.EventHandler (this.OkayButtonClicked);
   5.245  		}
   5.246  	}
   5.247  }
     6.1 --- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmMainWindow.cs	Tue Oct 25 20:32:47 2011 +0100
     6.2 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmMainWindow.cs	Sat Nov 12 19:53:26 2011 +0000
     6.3 @@ -136,7 +136,6 @@
     6.4  			// Container child IBBoard.WarFoundry.GUI.GTK.FrmMainWindow.Gtk.Container+ContainerChild
     6.5  			this.vbox1 = new global::Gtk.VBox ();
     6.6  			this.vbox1.Name = "vbox1";
     6.7 -			this.vbox1.Spacing = 0;
     6.8  			// Container child vbox1.Gtk.Box+BoxChild
     6.9  			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>");
    6.10  			this.menubar1 = ((global::Gtk.MenuBar)(this.UIManager.GetWidget ("/menubar1")));
     7.1 --- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewArmy.cs	Tue Oct 25 20:32:47 2011 +0100
     7.2 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewArmy.cs	Sat Nov 12 19:53:26 2011 +0000
     7.3 @@ -63,7 +63,6 @@
     7.4  			// Container child table1.Gtk.Table+TableChild
     7.5  			this.hbox2 = new global::Gtk.HBox ();
     7.6  			this.hbox2.Name = "hbox2";
     7.7 -			this.hbox2.Spacing = 0;
     7.8  			// Container child hbox2.Gtk.Box+BoxChild
     7.9  			this.sbPointsValue = new global::Gtk.SpinButton (0, 2000000000, 100);
    7.10  			this.sbPointsValue.WidthRequest = 150;
     8.1 --- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewUnit.cs	Tue Oct 25 20:32:47 2011 +0100
     8.2 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewUnit.cs	Sat Nov 12 19:53:26 2011 +0000
     8.3 @@ -111,7 +111,7 @@
     8.4  				this.Child.ShowAll ();
     8.5  			}
     8.6  			this.DefaultWidth = 403;
     8.7 -			this.DefaultHeight = 311;
     8.8 +			this.DefaultHeight = 234;
     8.9  			this.validationWidget.Hide ();
    8.10  			this.Show ();
    8.11  			this.lstUnitTypes.RowActivated += new global::Gtk.RowActivatedHandler (this.OnRowActivated);
     9.1 --- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmPreferences.cs	Tue Oct 25 20:32:47 2011 +0100
     9.2 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmPreferences.cs	Sat Nov 12 19:53:26 2011 +0000
     9.3 @@ -15,10 +15,10 @@
     9.4  		private global::Gtk.Label frameLabel;
     9.5  		private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnCancel;
     9.6  		private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnOkay;
     9.7 -
     9.8 -		protected virtual void Build()
     9.9 +		
    9.10 +		protected virtual void Build ()
    9.11  		{
    9.12 -			global::Stetic.Gui.Initialize(this);
    9.13 +			global::Stetic.Gui.Initialize (this);
    9.14  			// Widget IBBoard.WarFoundry.GUI.GTK.FrmPreferences
    9.15  			this.Name = "IBBoard.WarFoundry.GUI.GTK.FrmPreferences";
    9.16  			this.TypeHint = ((global::Gdk.WindowTypeHint)(1));
    9.17 @@ -30,64 +30,64 @@
    9.18  			w1.Name = "dialog1_VBox";
    9.19  			w1.BorderWidth = ((uint)(2));
    9.20  			// Container child dialog1_VBox.Gtk.Box+BoxChild
    9.21 -			this.hpaned1 = new global::Gtk.HPaned();
    9.22 +			this.hpaned1 = new global::Gtk.HPaned ();
    9.23  			this.hpaned1.CanFocus = true;
    9.24  			this.hpaned1.Name = "hpaned1";
    9.25  			this.hpaned1.Position = 164;
    9.26  			// Container child hpaned1.Gtk.Paned+PanedChild
    9.27 -			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow();
    9.28 +			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow ();
    9.29  			this.GtkScrolledWindow.Name = "GtkScrolledWindow";
    9.30  			this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));
    9.31  			// Container child GtkScrolledWindow.Gtk.Container+ContainerChild
    9.32 -			this.preferencesTree = new global::Gtk.TreeView();
    9.33 +			this.preferencesTree = new global::Gtk.TreeView ();
    9.34  			this.preferencesTree.CanFocus = true;
    9.35  			this.preferencesTree.Name = "preferencesTree";
    9.36  			this.preferencesTree.HeadersVisible = false;
    9.37 -			this.GtkScrolledWindow.Add(this.preferencesTree);
    9.38 -			this.hpaned1.Add(this.GtkScrolledWindow);
    9.39 -			global::Gtk.Paned.PanedChild w3 = ((global::Gtk.Paned.PanedChild)(this.hpaned1[this.GtkScrolledWindow]));
    9.40 +			this.GtkScrolledWindow.Add (this.preferencesTree);
    9.41 +			this.hpaned1.Add (this.GtkScrolledWindow);
    9.42 +			global::Gtk.Paned.PanedChild w3 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.GtkScrolledWindow]));
    9.43  			w3.Resize = false;
    9.44  			// Container child hpaned1.Gtk.Paned+PanedChild
    9.45 -			this.prefsFrame = new global::Gtk.Frame();
    9.46 +			this.prefsFrame = new global::Gtk.Frame ();
    9.47  			this.prefsFrame.Name = "prefsFrame";
    9.48  			this.prefsFrame.ShadowType = ((global::Gtk.ShadowType)(1));
    9.49  			this.prefsFrame.BorderWidth = ((uint)(2));
    9.50  			// Container child prefsFrame.Gtk.Container+ContainerChild
    9.51 -			this.GtkAlignment2 = new global::Gtk.Alignment(0F, 0F, 1F, 1F);
    9.52 +			this.GtkAlignment2 = new global::Gtk.Alignment (0F, 0F, 1F, 1F);
    9.53  			this.GtkAlignment2.Name = "GtkAlignment2";
    9.54  			this.GtkAlignment2.LeftPadding = ((uint)(12));
    9.55  			// Container child GtkAlignment2.Gtk.Container+ContainerChild
    9.56 -			this.table1 = new global::Gtk.Table(((uint)(3)), ((uint)(2)), false);
    9.57 +			this.table1 = new global::Gtk.Table (((uint)(3)), ((uint)(2)), false);
    9.58  			this.table1.Name = "table1";
    9.59  			this.table1.RowSpacing = ((uint)(6));
    9.60  			this.table1.ColumnSpacing = ((uint)(6));
    9.61  			// Container child table1.Gtk.Table+TableChild
    9.62 -			this.languageList = global::Gtk.ComboBox.NewText();
    9.63 +			this.languageList = global::Gtk.ComboBox.NewText ();
    9.64  			this.languageList.Name = "languageList";
    9.65 -			this.table1.Add(this.languageList);
    9.66 -			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1[this.languageList]));
    9.67 +			this.table1.Add (this.languageList);
    9.68 +			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1 [this.languageList]));
    9.69  			w4.LeftAttach = ((uint)(1));
    9.70  			w4.RightAttach = ((uint)(2));
    9.71  			w4.XOptions = ((global::Gtk.AttachOptions)(4));
    9.72  			w4.YOptions = ((global::Gtk.AttachOptions)(4));
    9.73  			// Container child table1.Gtk.Table+TableChild
    9.74 -			this.lblLanguage = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
    9.75 +			this.lblLanguage = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel ();
    9.76  			this.lblLanguage.Name = "lblLanguage";
    9.77 -			this.lblLanguage.LabelProp = global::Mono.Unix.Catalog.GetString("language:");
    9.78 -			this.table1.Add(this.lblLanguage);
    9.79 -			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1[this.lblLanguage]));
    9.80 +			this.lblLanguage.LabelProp = global::Mono.Unix.Catalog.GetString ("language:");
    9.81 +			this.table1.Add (this.lblLanguage);
    9.82 +			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1 [this.lblLanguage]));
    9.83  			w5.XOptions = ((global::Gtk.AttachOptions)(4));
    9.84  			w5.YOptions = ((global::Gtk.AttachOptions)(4));
    9.85 -			this.GtkAlignment2.Add(this.table1);
    9.86 -			this.prefsFrame.Add(this.GtkAlignment2);
    9.87 -			this.frameLabel = new global::Gtk.Label();
    9.88 +			this.GtkAlignment2.Add (this.table1);
    9.89 +			this.prefsFrame.Add (this.GtkAlignment2);
    9.90 +			this.frameLabel = new global::Gtk.Label ();
    9.91  			this.frameLabel.Name = "frameLabel";
    9.92 -			this.frameLabel.LabelProp = global::Mono.Unix.Catalog.GetString("<b>language</b>");
    9.93 +			this.frameLabel.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>language</b>");
    9.94  			this.frameLabel.UseMarkup = true;
    9.95  			this.prefsFrame.LabelWidget = this.frameLabel;
    9.96 -			this.hpaned1.Add(this.prefsFrame);
    9.97 -			w1.Add(this.hpaned1);
    9.98 -			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(w1[this.hpaned1]));
    9.99 +			this.hpaned1.Add (this.prefsFrame);
   9.100 +			w1.Add (this.hpaned1);
   9.101 +			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(w1 [this.hpaned1]));
   9.102  			w9.Position = 0;
   9.103  			// Internal child IBBoard.WarFoundry.GUI.GTK.FrmPreferences.ActionArea
   9.104  			global::Gtk.HButtonBox w10 = this.ActionArea;
   9.105 @@ -96,40 +96,39 @@
   9.106  			w10.BorderWidth = ((uint)(5));
   9.107  			w10.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
   9.108  			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
   9.109 -			this.bttnCancel = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
   9.110 +			this.bttnCancel = new global::IBBoard.GtkSharp.Translatable.TranslatableButton ();
   9.111  			this.bttnCancel.CanDefault = true;
   9.112  			this.bttnCancel.CanFocus = true;
   9.113  			this.bttnCancel.Name = "bttnCancel";
   9.114  			this.bttnCancel.UseStock = true;
   9.115  			this.bttnCancel.UseUnderline = true;
   9.116  			this.bttnCancel.Label = "gtk-cancel";
   9.117 -			this.AddActionWidget(this.bttnCancel, -6);
   9.118 -			global::Gtk.ButtonBox.ButtonBoxChild w11 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w10[this.bttnCancel]));
   9.119 +			this.AddActionWidget (this.bttnCancel, -6);
   9.120 +			global::Gtk.ButtonBox.ButtonBoxChild w11 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w10 [this.bttnCancel]));
   9.121  			w11.Expand = false;
   9.122  			w11.Fill = false;
   9.123  			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
   9.124 -			this.bttnOkay = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
   9.125 +			this.bttnOkay = new global::IBBoard.GtkSharp.Translatable.TranslatableButton ();
   9.126  			this.bttnOkay.CanDefault = true;
   9.127  			this.bttnOkay.CanFocus = true;
   9.128  			this.bttnOkay.Name = "bttnOkay";
   9.129  			this.bttnOkay.UseStock = true;
   9.130  			this.bttnOkay.UseUnderline = true;
   9.131  			this.bttnOkay.Label = "gtk-ok";
   9.132 -			this.AddActionWidget(this.bttnOkay, -5);
   9.133 -			global::Gtk.ButtonBox.ButtonBoxChild w12 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w10[this.bttnOkay]));
   9.134 +			this.AddActionWidget (this.bttnOkay, -5);
   9.135 +			global::Gtk.ButtonBox.ButtonBoxChild w12 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w10 [this.bttnOkay]));
   9.136  			w12.Position = 1;
   9.137  			w12.Expand = false;
   9.138  			w12.Fill = false;
   9.139 -			if ((this.Child != null))
   9.140 -			{
   9.141 -				this.Child.ShowAll();
   9.142 +			if ((this.Child != null)) {
   9.143 +				this.Child.ShowAll ();
   9.144  			}
   9.145  			this.DefaultWidth = 400;
   9.146  			this.DefaultHeight = 300;
   9.147 -			this.Show();
   9.148 -			this.languageList.Changed += new global::System.EventHandler(this.languageListChanged);
   9.149 -			this.bttnCancel.Clicked += new global::System.EventHandler(this.bttnCancelClicked);
   9.150 -			this.bttnOkay.Clicked += new global::System.EventHandler(this.bttnOkayClicked);
   9.151 +			this.Show ();
   9.152 +			this.languageList.Changed += new global::System.EventHandler (this.languageListChanged);
   9.153 +			this.bttnCancel.Clicked += new global::System.EventHandler (this.bttnCancelClicked);
   9.154 +			this.bttnOkay.Clicked += new global::System.EventHandler (this.bttnOkayClicked);
   9.155  		}
   9.156  	}
   9.157  }
    10.1 --- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmReplaceEquipment.cs	Tue Oct 25 20:32:47 2011 +0100
    10.2 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmReplaceEquipment.cs	Sat Nov 12 19:53:26 2011 +0000
    10.3 @@ -20,13 +20,13 @@
    10.4  		private global::IBBoard.GtkSharp.Translatable.TranslatableLabel lblItem;
    10.5  		private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnCancel;
    10.6  		private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnOkay;
    10.7 -
    10.8 -		protected virtual void Build()
    10.9 +		
   10.10 +		protected virtual void Build ()
   10.11  		{
   10.12 -			global::Stetic.Gui.Initialize(this);
   10.13 +			global::Stetic.Gui.Initialize (this);
   10.14  			// Widget IBBoard.WarFoundry.GUI.GTK.FrmReplaceEquipment
   10.15  			this.Name = "IBBoard.WarFoundry.GUI.GTK.FrmReplaceEquipment";
   10.16 -			this.Title = global::Mono.Unix.Catalog.GetString("Add equipment");
   10.17 +			this.Title = global::Mono.Unix.Catalog.GetString ("Add equipment");
   10.18  			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
   10.19  			this.Modal = true;
   10.20  			this.SkipPagerHint = true;
   10.21 @@ -36,51 +36,51 @@
   10.22  			w1.Name = "dialog1_VBox";
   10.23  			w1.BorderWidth = ((uint)(2));
   10.24  			// Container child dialog1_VBox.Gtk.Box+BoxChild
   10.25 -			this.table1 = new global::Gtk.Table(((uint)(2)), ((uint)(2)), false);
   10.26 +			this.table1 = new global::Gtk.Table (((uint)(2)), ((uint)(2)), false);
   10.27  			this.table1.Name = "table1";
   10.28  			this.table1.RowSpacing = ((uint)(6));
   10.29  			this.table1.ColumnSpacing = ((uint)(6));
   10.30  			// Container child table1.Gtk.Table+TableChild
   10.31 -			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow();
   10.32 +			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow ();
   10.33  			this.GtkScrolledWindow.Name = "GtkScrolledWindow";
   10.34  			this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));
   10.35  			// Container child GtkScrolledWindow.Gtk.Container+ContainerChild
   10.36 -			this.lstEquipment = new global::Gtk.TreeView();
   10.37 +			this.lstEquipment = new global::Gtk.TreeView ();
   10.38  			this.lstEquipment.CanFocus = true;
   10.39  			this.lstEquipment.Name = "lstEquipment";
   10.40  			this.lstEquipment.HeadersVisible = false;
   10.41 -			this.GtkScrolledWindow.Add(this.lstEquipment);
   10.42 -			this.table1.Add(this.GtkScrolledWindow);
   10.43 -			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1[this.GtkScrolledWindow]));
   10.44 +			this.GtkScrolledWindow.Add (this.lstEquipment);
   10.45 +			this.table1.Add (this.GtkScrolledWindow);
   10.46 +			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.GtkScrolledWindow]));
   10.47  			w3.LeftAttach = ((uint)(1));
   10.48  			w3.RightAttach = ((uint)(2));
   10.49  			w3.YOptions = ((global::Gtk.AttachOptions)(4));
   10.50  			// Container child table1.Gtk.Table+TableChild
   10.51 -			this.hbox2 = new global::Gtk.HBox();
   10.52 +			this.hbox2 = new global::Gtk.HBox ();
   10.53  			this.hbox2.Name = "hbox2";
   10.54  			this.hbox2.Spacing = 6;
   10.55  			// Container child hbox2.Gtk.Box+BoxChild
   10.56 -			this.table2 = new global::Gtk.Table(((uint)(3)), ((uint)(3)), false);
   10.57 +			this.table2 = new global::Gtk.Table (((uint)(3)), ((uint)(3)), false);
   10.58  			this.table2.Name = "table2";
   10.59  			this.table2.RowSpacing = ((uint)(6));
   10.60  			this.table2.ColumnSpacing = ((uint)(6));
   10.61  			// Container child table2.Gtk.Table+TableChild
   10.62 -			this.lblEquipAll = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
   10.63 +			this.lblEquipAll = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel ();
   10.64  			this.lblEquipAll.Name = "lblEquipAll";
   10.65 -			this.lblEquipAll.LabelProp = global::Mono.Unix.Catalog.GetString("equip all");
   10.66 -			this.table2.Add(this.lblEquipAll);
   10.67 -			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table2[this.lblEquipAll]));
   10.68 +			this.lblEquipAll.LabelProp = global::Mono.Unix.Catalog.GetString ("equip all");
   10.69 +			this.table2.Add (this.lblEquipAll);
   10.70 +			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table2 [this.lblEquipAll]));
   10.71  			w4.TopAttach = ((uint)(2));
   10.72  			w4.BottomAttach = ((uint)(3));
   10.73  			w4.LeftAttach = ((uint)(1));
   10.74  			w4.RightAttach = ((uint)(2));
   10.75  			w4.YOptions = ((global::Gtk.AttachOptions)(4));
   10.76  			// Container child table2.Gtk.Table+TableChild
   10.77 -			this.lblPercent = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
   10.78 +			this.lblPercent = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel ();
   10.79  			this.lblPercent.Name = "lblPercent";
   10.80 -			this.lblPercent.LabelProp = global::Mono.Unix.Catalog.GetString("%");
   10.81 -			this.table2.Add(this.lblPercent);
   10.82 -			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table2[this.lblPercent]));
   10.83 +			this.lblPercent.LabelProp = global::Mono.Unix.Catalog.GetString ("%");
   10.84 +			this.table2.Add (this.lblPercent);
   10.85 +			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table2 [this.lblPercent]));
   10.86  			w5.TopAttach = ((uint)(1));
   10.87  			w5.BottomAttach = ((uint)(2));
   10.88  			w5.LeftAttach = ((uint)(2));
   10.89 @@ -88,28 +88,28 @@
   10.90  			w5.XOptions = ((global::Gtk.AttachOptions)(4));
   10.91  			w5.YOptions = ((global::Gtk.AttachOptions)(4));
   10.92  			// Container child table2.Gtk.Table+TableChild
   10.93 -			this.numericAmount = new global::Gtk.SpinButton(0, 100, 1);
   10.94 +			this.numericAmount = new global::Gtk.SpinButton (0, 100, 1);
   10.95  			this.numericAmount.CanFocus = true;
   10.96  			this.numericAmount.Name = "numericAmount";
   10.97  			this.numericAmount.Adjustment.PageIncrement = 10;
   10.98  			this.numericAmount.ClimbRate = 1;
   10.99  			this.numericAmount.Numeric = true;
  10.100 -			this.table2.Add(this.numericAmount);
  10.101 -			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table2[this.numericAmount]));
  10.102 +			this.table2.Add (this.numericAmount);
  10.103 +			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table2 [this.numericAmount]));
  10.104  			w6.LeftAttach = ((uint)(1));
  10.105  			w6.RightAttach = ((uint)(2));
  10.106  			w6.XOptions = ((global::Gtk.AttachOptions)(0));
  10.107  			w6.YOptions = ((global::Gtk.AttachOptions)(4));
  10.108  			// Container child table2.Gtk.Table+TableChild
  10.109 -			this.percentageAmount = new global::Gtk.SpinButton(0, 100, 1);
  10.110 +			this.percentageAmount = new global::Gtk.SpinButton (0, 100, 1);
  10.111  			this.percentageAmount.CanFocus = true;
  10.112  			this.percentageAmount.Name = "percentageAmount";
  10.113  			this.percentageAmount.Adjustment.PageIncrement = 10;
  10.114  			this.percentageAmount.ClimbRate = 1;
  10.115  			this.percentageAmount.Digits = ((uint)(1));
  10.116  			this.percentageAmount.Numeric = true;
  10.117 -			this.table2.Add(this.percentageAmount);
  10.118 -			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table2[this.percentageAmount]));
  10.119 +			this.table2.Add (this.percentageAmount);
  10.120 +			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table2 [this.percentageAmount]));
  10.121  			w7.TopAttach = ((uint)(1));
  10.122  			w7.BottomAttach = ((uint)(2));
  10.123  			w7.LeftAttach = ((uint)(1));
  10.124 @@ -117,74 +117,74 @@
  10.125  			w7.XOptions = ((global::Gtk.AttachOptions)(0));
  10.126  			w7.YOptions = ((global::Gtk.AttachOptions)(4));
  10.127  			// Container child table2.Gtk.Table+TableChild
  10.128 -			this.rbEquipAll = new global::Gtk.RadioButton("");
  10.129 +			this.rbEquipAll = new global::Gtk.RadioButton ("");
  10.130  			this.rbEquipAll.CanFocus = true;
  10.131  			this.rbEquipAll.Name = "rbEquipAll";
  10.132  			this.rbEquipAll.DrawIndicator = true;
  10.133  			this.rbEquipAll.UseUnderline = true;
  10.134 -			this.rbEquipAll.Group = new global::GLib.SList(global::System.IntPtr.Zero);
  10.135 -			this.table2.Add(this.rbEquipAll);
  10.136 -			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table2[this.rbEquipAll]));
  10.137 +			this.rbEquipAll.Group = new global::GLib.SList (global::System.IntPtr.Zero);
  10.138 +			this.table2.Add (this.rbEquipAll);
  10.139 +			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table2 [this.rbEquipAll]));
  10.140  			w8.TopAttach = ((uint)(2));
  10.141  			w8.BottomAttach = ((uint)(3));
  10.142  			w8.XOptions = ((global::Gtk.AttachOptions)(4));
  10.143  			w8.YOptions = ((global::Gtk.AttachOptions)(4));
  10.144  			// Container child table2.Gtk.Table+TableChild
  10.145 -			this.rbEquipNumeric = new global::Gtk.RadioButton("");
  10.146 +			this.rbEquipNumeric = new global::Gtk.RadioButton ("");
  10.147  			this.rbEquipNumeric.CanFocus = true;
  10.148  			this.rbEquipNumeric.Name = "rbEquipNumeric";
  10.149  			this.rbEquipNumeric.DrawIndicator = true;
  10.150  			this.rbEquipNumeric.UseUnderline = true;
  10.151  			this.rbEquipNumeric.Group = this.rbEquipAll.Group;
  10.152 -			this.table2.Add(this.rbEquipNumeric);
  10.153 -			global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table2[this.rbEquipNumeric]));
  10.154 +			this.table2.Add (this.rbEquipNumeric);
  10.155 +			global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table2 [this.rbEquipNumeric]));
  10.156  			w9.XOptions = ((global::Gtk.AttachOptions)(4));
  10.157  			w9.YOptions = ((global::Gtk.AttachOptions)(4));
  10.158  			// Container child table2.Gtk.Table+TableChild
  10.159 -			this.rbEquipPercent = new global::Gtk.RadioButton("");
  10.160 +			this.rbEquipPercent = new global::Gtk.RadioButton ("");
  10.161  			this.rbEquipPercent.CanFocus = true;
  10.162  			this.rbEquipPercent.Name = "rbEquipPercent";
  10.163  			this.rbEquipPercent.DrawIndicator = true;
  10.164  			this.rbEquipPercent.UseUnderline = true;
  10.165  			this.rbEquipPercent.Group = this.rbEquipAll.Group;
  10.166 -			this.table2.Add(this.rbEquipPercent);
  10.167 -			global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table2[this.rbEquipPercent]));
  10.168 +			this.table2.Add (this.rbEquipPercent);
  10.169 +			global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table2 [this.rbEquipPercent]));
  10.170  			w10.TopAttach = ((uint)(1));
  10.171  			w10.BottomAttach = ((uint)(2));
  10.172  			w10.XOptions = ((global::Gtk.AttachOptions)(4));
  10.173  			w10.YOptions = ((global::Gtk.AttachOptions)(4));
  10.174 -			this.hbox2.Add(this.table2);
  10.175 -			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.table2]));
  10.176 +			this.hbox2.Add (this.table2);
  10.177 +			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.table2]));
  10.178  			w11.Position = 0;
  10.179  			w11.Expand = false;
  10.180  			w11.Fill = false;
  10.181 -			this.table1.Add(this.hbox2);
  10.182 -			global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1[this.hbox2]));
  10.183 +			this.table1.Add (this.hbox2);
  10.184 +			global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1 [this.hbox2]));
  10.185  			w12.TopAttach = ((uint)(1));
  10.186  			w12.BottomAttach = ((uint)(2));
  10.187  			w12.LeftAttach = ((uint)(1));
  10.188  			w12.RightAttach = ((uint)(2));
  10.189  			w12.YOptions = ((global::Gtk.AttachOptions)(4));
  10.190  			// Container child table1.Gtk.Table+TableChild
  10.191 -			this.lblAmount = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
  10.192 +			this.lblAmount = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel ();
  10.193  			this.lblAmount.Name = "lblAmount";
  10.194 -			this.lblAmount.LabelProp = global::Mono.Unix.Catalog.GetString("amount:");
  10.195 -			this.table1.Add(this.lblAmount);
  10.196 -			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1[this.lblAmount]));
  10.197 +			this.lblAmount.LabelProp = global::Mono.Unix.Catalog.GetString ("amount:");
  10.198 +			this.table1.Add (this.lblAmount);
  10.199 +			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1 [this.lblAmount]));
  10.200  			w13.TopAttach = ((uint)(1));
  10.201  			w13.BottomAttach = ((uint)(2));
  10.202  			w13.XOptions = ((global::Gtk.AttachOptions)(4));
  10.203  			w13.YOptions = ((global::Gtk.AttachOptions)(4));
  10.204  			// Container child table1.Gtk.Table+TableChild
  10.205 -			this.lblItem = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
  10.206 +			this.lblItem = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel ();
  10.207  			this.lblItem.Name = "lblItem";
  10.208 -			this.lblItem.LabelProp = global::Mono.Unix.Catalog.GetString("equipment");
  10.209 -			this.table1.Add(this.lblItem);
  10.210 -			global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1[this.lblItem]));
  10.211 +			this.lblItem.LabelProp = global::Mono.Unix.Catalog.GetString ("equipment");
  10.212 +			this.table1.Add (this.lblItem);
  10.213 +			global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1 [this.lblItem]));
  10.214  			w14.XOptions = ((global::Gtk.AttachOptions)(4));
  10.215  			w14.YOptions = ((global::Gtk.AttachOptions)(4));
  10.216 -			w1.Add(this.table1);
  10.217 -			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(w1[this.table1]));
  10.218 +			w1.Add (this.table1);
  10.219 +			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(w1 [this.table1]));
  10.220  			w15.Position = 0;
  10.221  			w15.Expand = false;
  10.222  			w15.Fill = false;
  10.223 @@ -195,42 +195,41 @@
  10.224  			w16.BorderWidth = ((uint)(5));
  10.225  			w16.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
  10.226  			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
  10.227 -			this.bttnCancel = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
  10.228 +			this.bttnCancel = new global::IBBoard.GtkSharp.Translatable.TranslatableButton ();
  10.229  			this.bttnCancel.CanDefault = true;
  10.230  			this.bttnCancel.CanFocus = true;
  10.231  			this.bttnCancel.Name = "bttnCancel";
  10.232  			this.bttnCancel.UseStock = true;
  10.233  			this.bttnCancel.UseUnderline = true;
  10.234  			this.bttnCancel.Label = "gtk-cancel";
  10.235 -			this.AddActionWidget(this.bttnCancel, -6);
  10.236 -			global::Gtk.ButtonBox.ButtonBoxChild w17 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16[this.bttnCancel]));
  10.237 +			this.AddActionWidget (this.bttnCancel, -6);
  10.238 +			global::Gtk.ButtonBox.ButtonBoxChild w17 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16 [this.bttnCancel]));
  10.239  			w17.Expand = false;
  10.240  			w17.Fill = false;
  10.241  			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
  10.242 -			this.bttnOkay = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
  10.243 +			this.bttnOkay = new global::IBBoard.GtkSharp.Translatable.TranslatableButton ();
  10.244  			this.bttnOkay.CanDefault = true;
  10.245  			this.bttnOkay.CanFocus = true;
  10.246  			this.bttnOkay.Name = "bttnOkay";
  10.247  			this.bttnOkay.UseStock = true;
  10.248  			this.bttnOkay.UseUnderline = true;
  10.249  			this.bttnOkay.Label = "gtk-ok";
  10.250 -			this.AddActionWidget(this.bttnOkay, -5);
  10.251 -			global::Gtk.ButtonBox.ButtonBoxChild w18 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16[this.bttnOkay]));
  10.252 +			this.AddActionWidget (this.bttnOkay, -5);
  10.253 +			global::Gtk.ButtonBox.ButtonBoxChild w18 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16 [this.bttnOkay]));
  10.254  			w18.Position = 1;
  10.255  			w18.Expand = false;
  10.256  			w18.Fill = false;
  10.257 -			if ((this.Child != null))
  10.258 -			{
  10.259 -				this.Child.ShowAll();
  10.260 +			if ((this.Child != null)) {
  10.261 +				this.Child.ShowAll ();
  10.262  			}
  10.263  			this.DefaultWidth = 400;
  10.264  			this.DefaultHeight = 300;
  10.265 -			this.Show();
  10.266 -			this.rbEquipNumeric.Clicked += new global::System.EventHandler(this.RadioButtonClicked);
  10.267 -			this.percentageAmount.ValueChanged += new global::System.EventHandler(this.SpinButtonValueChanged);
  10.268 -			this.numericAmount.ValueChanged += new global::System.EventHandler(this.SpinButtonValueChanged);
  10.269 -			this.bttnCancel.Clicked += new global::System.EventHandler(this.CancelButtonClicked);
  10.270 -			this.bttnOkay.Clicked += new global::System.EventHandler(this.OkayButtonClicked);
  10.271 +			this.Show ();
  10.272 +			this.rbEquipNumeric.Clicked += new global::System.EventHandler (this.RadioButtonClicked);
  10.273 +			this.percentageAmount.ValueChanged += new global::System.EventHandler (this.SpinButtonValueChanged);
  10.274 +			this.numericAmount.ValueChanged += new global::System.EventHandler (this.SpinButtonValueChanged);
  10.275 +			this.bttnCancel.Clicked += new global::System.EventHandler (this.CancelButtonClicked);
  10.276 +			this.bttnOkay.Clicked += new global::System.EventHandler (this.OkayButtonClicked);
  10.277  		}
  10.278  	}
  10.279  }
    11.1 --- a/gtk-gui/generated.cs	Tue Oct 25 20:32:47 2011 +0100
    11.2 +++ b/gtk-gui/generated.cs	Sat Nov 12 19:53:26 2011 +0000
    11.3 @@ -5,123 +5,109 @@
    11.4  	internal class Gui
    11.5  	{
    11.6  		private static bool initialized;
    11.7 -
    11.8 -		internal static void Initialize(Gtk.Widget iconRenderer)
    11.9 +		
   11.10 +		internal static void Initialize (Gtk.Widget iconRenderer)
   11.11  		{
   11.12 -			if ((Stetic.Gui.initialized == false))
   11.13 -			{
   11.14 +			if ((Stetic.Gui.initialized == false)) {
   11.15  				Stetic.Gui.initialized = true;
   11.16  			}
   11.17  		}
   11.18  	}
   11.19 -
   11.20 +	
   11.21  	internal class IconLoader
   11.22  	{
   11.23 -		public static Gdk.Pixbuf LoadIcon(Gtk.Widget widget, string name, Gtk.IconSize size)
   11.24 +		public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size)
   11.25  		{
   11.26 -			Gdk.Pixbuf res = widget.RenderIcon(name, size, null);
   11.27 -			if ((res != null))
   11.28 -			{
   11.29 +			Gdk.Pixbuf res = widget.RenderIcon (name, size, null);
   11.30 +			if ((res != null)) {
   11.31  				return res;
   11.32 -			}
   11.33 -			else
   11.34 -			{
   11.35 +			} else {
   11.36  				int sz;
   11.37  				int sy;
   11.38 -				global::Gtk.Icon.SizeLookup(size, out  sz, out  sy);
   11.39 -				try
   11.40 -				{
   11.41 -					return Gtk.IconTheme.Default.LoadIcon(name, sz, 0);
   11.42 -				}
   11.43 -				catch (System.Exception)
   11.44 -				{
   11.45 -					if ((name != "gtk-missing-image"))
   11.46 -					{
   11.47 -						return Stetic.IconLoader.LoadIcon(widget, "gtk-missing-image", size);
   11.48 -					}
   11.49 -					else
   11.50 -					{
   11.51 -						Gdk.Pixmap pmap = new Gdk.Pixmap(Gdk.Screen.Default.RootWindow, sz, sz);
   11.52 -						Gdk.GC gc = new Gdk.GC(pmap);
   11.53 -						gc.RgbFgColor = new Gdk.Color(255, 255, 255);
   11.54 -						pmap.DrawRectangle(gc, true, 0, 0, sz, sz);
   11.55 -						gc.RgbFgColor = new Gdk.Color(0, 0, 0);
   11.56 -						pmap.DrawRectangle(gc, false, 0, 0, (sz - 1), (sz - 1));
   11.57 -						gc.SetLineAttributes(3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
   11.58 -						gc.RgbFgColor = new Gdk.Color(255, 0, 0);
   11.59 -						pmap.DrawLine(gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4)));
   11.60 -						pmap.DrawLine(gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)));
   11.61 -						return Gdk.Pixbuf.FromDrawable(pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);
   11.62 +				global::Gtk.Icon.SizeLookup (size, out  sz, out  sy);
   11.63 +				try {
   11.64 +					return Gtk.IconTheme.Default.LoadIcon (name, sz, 0);
   11.65 +				} catch (System.Exception) {
   11.66 +					if ((name != "gtk-missing-image")) {
   11.67 +						return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size);
   11.68 +					} else {
   11.69 +						Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz);
   11.70 +						Gdk.GC gc = new Gdk.GC (pmap);
   11.71 +						gc.RgbFgColor = new Gdk.Color (255, 255, 255);
   11.72 +						pmap.DrawRectangle (gc, true, 0, 0, sz, sz);
   11.73 +						gc.RgbFgColor = new Gdk.Color (0, 0, 0);
   11.74 +						pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1));
   11.75 +						gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
   11.76 +						gc.RgbFgColor = new Gdk.Color (255, 0, 0);
   11.77 +						pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4)));
   11.78 +						pmap.DrawLine (gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)));
   11.79 +						return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);
   11.80  					}
   11.81  				}
   11.82  			}
   11.83  		}
   11.84  	}
   11.85 -
   11.86 +	
   11.87  	internal class BinContainer
   11.88  	{
   11.89  		private Gtk.Widget child;
   11.90  		private Gtk.UIManager uimanager;
   11.91 -
   11.92 -		public static BinContainer Attach(Gtk.Bin bin)
   11.93 +		
   11.94 +		public static BinContainer Attach (Gtk.Bin bin)
   11.95  		{
   11.96 -			BinContainer bc = new BinContainer();
   11.97 -			bin.SizeRequested += new Gtk.SizeRequestedHandler(bc.OnSizeRequested);
   11.98 -			bin.SizeAllocated += new Gtk.SizeAllocatedHandler(bc.OnSizeAllocated);
   11.99 -			bin.Added += new Gtk.AddedHandler(bc.OnAdded);
  11.100 +			BinContainer bc = new BinContainer ();
  11.101 +			bin.SizeRequested += new Gtk.SizeRequestedHandler (bc.OnSizeRequested);
  11.102 +			bin.SizeAllocated += new Gtk.SizeAllocatedHandler (bc.OnSizeAllocated);
  11.103 +			bin.Added += new Gtk.AddedHandler (bc.OnAdded);
  11.104  			return bc;
  11.105  		}
  11.106 -
  11.107 -		private void OnSizeRequested(object sender, Gtk.SizeRequestedArgs args)
  11.108 +		
  11.109 +		private void OnSizeRequested (object sender, Gtk.SizeRequestedArgs args)
  11.110  		{
  11.111 -			if ((this.child != null))
  11.112 -			{
  11.113 -				args.Requisition = this.child.SizeRequest();
  11.114 +			if ((this.child != null)) {
  11.115 +				args.Requisition = this.child.SizeRequest ();
  11.116  			}
  11.117  		}
  11.118 -
  11.119 -		private void OnSizeAllocated(object sender, Gtk.SizeAllocatedArgs args)
  11.120 +		
  11.121 +		private void OnSizeAllocated (object sender, Gtk.SizeAllocatedArgs args)
  11.122  		{
  11.123 -			if ((this.child != null))
  11.124 -			{
  11.125 +			if ((this.child != null)) {
  11.126  				this.child.Allocation = args.Allocation;
  11.127  			}
  11.128  		}
  11.129 -
  11.130 -		private void OnAdded(object sender, Gtk.AddedArgs args)
  11.131 +		
  11.132 +		private void OnAdded (object sender, Gtk.AddedArgs args)
  11.133  		{
  11.134  			this.child = args.Widget;
  11.135  		}
  11.136 -
  11.137 -		public void SetUiManager(Gtk.UIManager uim)
  11.138 +		
  11.139 +		public void SetUiManager (Gtk.UIManager uim)
  11.140  		{
  11.141  			this.uimanager = uim;
  11.142 -			this.child.Realized += new System.EventHandler(this.OnRealized);
  11.143 +			this.child.Realized += new System.EventHandler (this.OnRealized);
  11.144  		}
  11.145 -
  11.146 -		private void OnRealized(object sender, System.EventArgs args)
  11.147 +		
  11.148 +		private void OnRealized (object sender, System.EventArgs args)
  11.149  		{
  11.150 -			if ((this.uimanager != null))
  11.151 -			{
  11.152 +			if ((this.uimanager != null)) {
  11.153  				Gtk.Widget w;
  11.154  				w = this.child.Toplevel;
  11.155 -				if (((w != null) && typeof(Gtk.Window).IsInstanceOfType(w)))
  11.156 -				{
  11.157 -					((Gtk.Window)(w)).AddAccelGroup(this.uimanager.AccelGroup);
  11.158 +				if (((w != null) && typeof(Gtk.Window).IsInstanceOfType (w))) {
  11.159 +					((Gtk.Window)(w)).AddAccelGroup (this.uimanager.AccelGroup);
  11.160  					this.uimanager = null;
  11.161  				}
  11.162  			}
  11.163  		}
  11.164  	}
  11.165 -
  11.166 +	
  11.167  	internal class ActionGroups
  11.168  	{
  11.169 -		public static Gtk.ActionGroup GetActionGroup(System.Type type)
  11.170 +		public static Gtk.ActionGroup GetActionGroup (System.Type type)
  11.171  		{
  11.172 -			return Stetic.ActionGroups.GetActionGroup(type.FullName);
  11.173 +			return Stetic.ActionGroups.GetActionGroup (type.FullName);
  11.174  		}
  11.175 -
  11.176 -		public static Gtk.ActionGroup GetActionGroup(string name)
  11.177 +		
  11.178 +		public static Gtk.ActionGroup GetActionGroup (string name)
  11.179  		{
  11.180  			return null;
  11.181  		}