--- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.Widgets.UnitDisplayWidget.cs	Sun Oct 09 21:03:09 2011 +0100
+++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.Widgets.UnitDisplayWidget.cs	Tue Oct 11 20:21:10 2011 +0100
@@ -27,236 +27,232 @@
 		private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnEditWeapon;
 		private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnReplaceWeapon;
 		private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnRemoveWeapon;
-
-		protected virtual void Build()
+		
+		protected virtual void Build ()
 		{
-			global::Stetic.Gui.Initialize(this);
+			global::Stetic.Gui.Initialize (this);
 			// Widget IBBoard.WarFoundry.GUI.GTK.Widgets.UnitDisplayWidget
-			global::Stetic.BinContainer.Attach(this);
+			global::Stetic.BinContainer.Attach (this);
 			this.Name = "IBBoard.WarFoundry.GUI.GTK.Widgets.UnitDisplayWidget";
 			// Container child IBBoard.WarFoundry.GUI.GTK.Widgets.UnitDisplayWidget.Gtk.Container+ContainerChild
-			this.vbox1 = new global::Gtk.VBox();
+			this.vbox1 = new global::Gtk.VBox ();
 			this.vbox1.Name = "vbox1";
 			this.vbox1.Spacing = 6;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.hbox1 = new global::Gtk.HBox();
+			this.hbox1 = new global::Gtk.HBox ();
 			this.hbox1.Name = "hbox1";
 			this.hbox1.Spacing = 6;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.unitName = new global::Gtk.Entry();
+			this.unitName = new global::Gtk.Entry ();
 			this.unitName.CanFocus = true;
 			this.unitName.Name = "unitName";
 			this.unitName.IsEditable = true;
 			this.unitName.InvisibleChar = '•';
-			this.hbox1.Add(this.unitName);
-			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.unitName]));
+			this.hbox1.Add (this.unitName);
+			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.unitName]));
 			w1.Position = 0;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.unitSize = new global::Gtk.SpinButton(0, 100, 1);
+			this.unitSize = new global::Gtk.SpinButton (0, 100, 1);
 			this.unitSize.CanFocus = true;
 			this.unitSize.Name = "unitSize";
 			this.unitSize.Adjustment.PageIncrement = 10;
 			this.unitSize.ClimbRate = 1;
 			this.unitSize.Numeric = true;
-			this.hbox1.Add(this.unitSize);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.unitSize]));
+			this.hbox1.Add (this.unitSize);
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.unitSize]));
 			w2.Position = 1;
 			w2.Expand = false;
 			w2.Fill = false;
-			this.vbox1.Add(this.hbox1);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.hbox1]));
+			this.vbox1.Add (this.hbox1);
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox1]));
 			w3.Position = 0;
 			w3.Expand = false;
 			w3.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.statsScrollPanel = new global::Gtk.ScrolledWindow();
+			this.statsScrollPanel = new global::Gtk.ScrolledWindow ();
+			this.statsScrollPanel.HeightRequest = 115;
 			this.statsScrollPanel.CanFocus = true;
 			this.statsScrollPanel.Name = "statsScrollPanel";
 			this.statsScrollPanel.ShadowType = ((global::Gtk.ShadowType)(1));
 			// Container child statsScrollPanel.Gtk.Container+ContainerChild
-			global::Gtk.Viewport w4 = new global::Gtk.Viewport();
+			global::Gtk.Viewport w4 = new global::Gtk.Viewport ();
 			w4.ShadowType = ((global::Gtk.ShadowType)(0));
 			// Container child GtkViewport.Gtk.Container+ContainerChild
-			this.statsRepeatBox = new global::Gtk.VBox();
+			this.statsRepeatBox = new global::Gtk.VBox ();
 			this.statsRepeatBox.Name = "statsRepeatBox";
 			this.statsRepeatBox.Spacing = 6;
-			w4.Add(this.statsRepeatBox);
-			this.statsScrollPanel.Add(w4);
-			this.vbox1.Add(this.statsScrollPanel);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.statsScrollPanel]));
+			w4.Add (this.statsRepeatBox);
+			this.statsScrollPanel.Add (w4);
+			this.vbox1.Add (this.statsScrollPanel);
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.statsScrollPanel]));
 			w7.Position = 1;
+			w7.Expand = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.hseparator1 = new global::Gtk.HSeparator();
+			this.hseparator1 = new global::Gtk.HSeparator ();
 			this.hseparator1.Name = "hseparator1";
-			this.vbox1.Add(this.hseparator1);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.hseparator1]));
+			this.vbox1.Add (this.hseparator1);
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hseparator1]));
 			w8.Position = 2;
 			w8.Expand = false;
 			w8.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			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.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.GtkScrolledWindow2 = new global::Gtk.ScrolledWindow();
+			this.GtkScrolledWindow2 = new global::Gtk.ScrolledWindow ();
 			this.GtkScrolledWindow2.Name = "GtkScrolledWindow2";
 			this.GtkScrolledWindow2.ShadowType = ((global::Gtk.ShadowType)(1));
 			// Container child GtkScrolledWindow2.Gtk.Container+ContainerChild
-			this.equipmentList = new global::Gtk.NodeView();
+			this.equipmentList = new global::Gtk.NodeView ();
 			this.equipmentList.CanFocus = true;
 			this.equipmentList.Name = "equipmentList";
 			this.equipmentList.HeadersVisible = false;
-			this.GtkScrolledWindow2.Add(this.equipmentList);
-			this.table1.Add(this.GtkScrolledWindow2);
-			global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table1[this.GtkScrolledWindow2]));
+			this.GtkScrolledWindow2.Add (this.equipmentList);
+			this.table1.Add (this.GtkScrolledWindow2);
+			global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table1 [this.GtkScrolledWindow2]));
 			w10.LeftAttach = ((uint)(1));
 			w10.RightAttach = ((uint)(2));
-			w10.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.GtkScrolledWindow3 = new global::Gtk.ScrolledWindow();
+			this.GtkScrolledWindow3 = new global::Gtk.ScrolledWindow ();
 			this.GtkScrolledWindow3.Name = "GtkScrolledWindow3";
 			this.GtkScrolledWindow3.ShadowType = ((global::Gtk.ShadowType)(1));
 			// Container child GtkScrolledWindow3.Gtk.Container+ContainerChild
-			this.notesView = new global::Gtk.TextView();
+			this.notesView = new global::Gtk.TextView ();
 			this.notesView.CanFocus = true;
 			this.notesView.Name = "notesView";
 			this.notesView.Editable = false;
-			this.GtkScrolledWindow3.Add(this.notesView);
-			this.table1.Add(this.GtkScrolledWindow3);
-			global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1[this.GtkScrolledWindow3]));
+			this.GtkScrolledWindow3.Add (this.notesView);
+			this.table1.Add (this.GtkScrolledWindow3);
+			global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1 [this.GtkScrolledWindow3]));
 			w12.TopAttach = ((uint)(2));
 			w12.BottomAttach = ((uint)(3));
 			w12.LeftAttach = ((uint)(1));
 			w12.RightAttach = ((uint)(2));
-			w12.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.GtkScrolledWindow4 = new global::Gtk.ScrolledWindow();
+			this.GtkScrolledWindow4 = new global::Gtk.ScrolledWindow ();
 			this.GtkScrolledWindow4.Name = "GtkScrolledWindow4";
 			this.GtkScrolledWindow4.ShadowType = ((global::Gtk.ShadowType)(1));
 			// Container child GtkScrolledWindow4.Gtk.Container+ContainerChild
-			this.abilitiesList = new global::Gtk.NodeView();
+			this.abilitiesList = new global::Gtk.NodeView ();
 			this.abilitiesList.CanFocus = true;
 			this.abilitiesList.Name = "abilitiesList";
 			this.abilitiesList.HeadersVisible = false;
-			this.GtkScrolledWindow4.Add(this.abilitiesList);
-			this.table1.Add(this.GtkScrolledWindow4);
-			global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1[this.GtkScrolledWindow4]));
+			this.GtkScrolledWindow4.Add (this.abilitiesList);
+			this.table1.Add (this.GtkScrolledWindow4);
+			global::Gtk.Table.TableChild w14 = ((global::Gtk.Table.TableChild)(this.table1 [this.GtkScrolledWindow4]));
 			w14.TopAttach = ((uint)(1));
 			w14.BottomAttach = ((uint)(2));
 			w14.LeftAttach = ((uint)(1));
 			w14.RightAttach = ((uint)(2));
-			w14.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.lblAbilities = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
+			this.lblAbilities = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel ();
 			this.lblAbilities.Name = "lblAbilities";
-			this.lblAbilities.LabelProp = global::Mono.Unix.Catalog.GetString("abilities:");
-			this.table1.Add(this.lblAbilities);
-			global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table1[this.lblAbilities]));
+			this.lblAbilities.LabelProp = global::Mono.Unix.Catalog.GetString ("abilities:");
+			this.table1.Add (this.lblAbilities);
+			global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table1 [this.lblAbilities]));
 			w15.TopAttach = ((uint)(1));
 			w15.BottomAttach = ((uint)(2));
 			w15.XOptions = ((global::Gtk.AttachOptions)(4));
 			w15.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.lblEquip = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
+			this.lblEquip = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel ();
 			this.lblEquip.Name = "lblEquip";
-			this.lblEquip.LabelProp = global::Mono.Unix.Catalog.GetString("equipment:");
-			this.table1.Add(this.lblEquip);
-			global::Gtk.Table.TableChild w16 = ((global::Gtk.Table.TableChild)(this.table1[this.lblEquip]));
+			this.lblEquip.LabelProp = global::Mono.Unix.Catalog.GetString ("equipment:");
+			this.table1.Add (this.lblEquip);
+			global::Gtk.Table.TableChild w16 = ((global::Gtk.Table.TableChild)(this.table1 [this.lblEquip]));
 			w16.XOptions = ((global::Gtk.AttachOptions)(4));
 			w16.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.lblNotes = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
+			this.lblNotes = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel ();
 			this.lblNotes.Name = "lblNotes";
-			this.lblNotes.LabelProp = global::Mono.Unix.Catalog.GetString("notes:");
-			this.table1.Add(this.lblNotes);
-			global::Gtk.Table.TableChild w17 = ((global::Gtk.Table.TableChild)(this.table1[this.lblNotes]));
+			this.lblNotes.LabelProp = global::Mono.Unix.Catalog.GetString ("notes:");
+			this.table1.Add (this.lblNotes);
+			global::Gtk.Table.TableChild w17 = ((global::Gtk.Table.TableChild)(this.table1 [this.lblNotes]));
 			w17.TopAttach = ((uint)(2));
 			w17.BottomAttach = ((uint)(3));
 			w17.XOptions = ((global::Gtk.AttachOptions)(4));
 			w17.YOptions = ((global::Gtk.AttachOptions)(4));
-			this.hbox2.Add(this.table1);
-			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.table1]));
+			this.hbox2.Add (this.table1);
+			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.table1]));
 			w18.Position = 0;
 			// Container child hbox2.Gtk.Box+BoxChild
-			this.vbox3 = new global::Gtk.VBox();
+			this.vbox3 = new global::Gtk.VBox ();
 			this.vbox3.Name = "vbox3";
 			this.vbox3.Spacing = 6;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.bttnAddWeapon = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
+			this.bttnAddWeapon = new global::IBBoard.GtkSharp.Translatable.TranslatableButton ();
 			this.bttnAddWeapon.CanFocus = true;
 			this.bttnAddWeapon.Name = "bttnAddWeapon";
 			this.bttnAddWeapon.UseUnderline = true;
-			this.bttnAddWeapon.Label = global::Mono.Unix.Catalog.GetString("add");
-			this.vbox3.Add(this.bttnAddWeapon);
-			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.bttnAddWeapon]));
+			this.bttnAddWeapon.Label = global::Mono.Unix.Catalog.GetString ("add");
+			this.vbox3.Add (this.bttnAddWeapon);
+			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.bttnAddWeapon]));
 			w19.Position = 0;
 			w19.Expand = false;
 			w19.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.bttnEditWeapon = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
+			this.bttnEditWeapon = new global::IBBoard.GtkSharp.Translatable.TranslatableButton ();
 			this.bttnEditWeapon.Sensitive = false;
 			this.bttnEditWeapon.CanFocus = true;
 			this.bttnEditWeapon.Name = "bttnEditWeapon";
 			this.bttnEditWeapon.UseUnderline = true;
-			this.bttnEditWeapon.Label = global::Mono.Unix.Catalog.GetString("edit");
-			this.vbox3.Add(this.bttnEditWeapon);
-			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.bttnEditWeapon]));
+			this.bttnEditWeapon.Label = global::Mono.Unix.Catalog.GetString ("edit");
+			this.vbox3.Add (this.bttnEditWeapon);
+			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.bttnEditWeapon]));
 			w20.Position = 1;
 			w20.Expand = false;
 			w20.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.bttnReplaceWeapon = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
+			this.bttnReplaceWeapon = new global::IBBoard.GtkSharp.Translatable.TranslatableButton ();
 			this.bttnReplaceWeapon.Sensitive = false;
 			this.bttnReplaceWeapon.CanFocus = true;
 			this.bttnReplaceWeapon.Name = "bttnReplaceWeapon";
 			this.bttnReplaceWeapon.UseUnderline = true;
-			this.bttnReplaceWeapon.Label = global::Mono.Unix.Catalog.GetString("replace");
-			this.vbox3.Add(this.bttnReplaceWeapon);
-			global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.bttnReplaceWeapon]));
+			this.bttnReplaceWeapon.Label = global::Mono.Unix.Catalog.GetString ("replace");
+			this.vbox3.Add (this.bttnReplaceWeapon);
+			global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.bttnReplaceWeapon]));
 			w21.Position = 2;
 			w21.Expand = false;
 			w21.Fill = false;
 			// Container child vbox3.Gtk.Box+BoxChild
-			this.bttnRemoveWeapon = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
+			this.bttnRemoveWeapon = new global::IBBoard.GtkSharp.Translatable.TranslatableButton ();
 			this.bttnRemoveWeapon.Sensitive = false;
 			this.bttnRemoveWeapon.CanFocus = true;
 			this.bttnRemoveWeapon.Name = "bttnRemoveWeapon";
 			this.bttnRemoveWeapon.UseUnderline = true;
-			this.bttnRemoveWeapon.Label = global::Mono.Unix.Catalog.GetString("remove");
-			this.vbox3.Add(this.bttnRemoveWeapon);
-			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.bttnRemoveWeapon]));
+			this.bttnRemoveWeapon.Label = global::Mono.Unix.Catalog.GetString ("remove");
+			this.vbox3.Add (this.bttnRemoveWeapon);
+			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.bttnRemoveWeapon]));
 			w22.Position = 3;
 			w22.Expand = false;
 			w22.Fill = false;
-			this.hbox2.Add(this.vbox3);
-			global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.vbox3]));
+			this.hbox2.Add (this.vbox3);
+			global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.vbox3]));
 			w23.Position = 1;
 			w23.Expand = false;
 			w23.Fill = false;
-			this.vbox1.Add(this.hbox2);
-			global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.hbox2]));
+			this.vbox1.Add (this.hbox2);
+			global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox2]));
 			w24.Position = 3;
-			w24.Expand = false;
-			w24.Fill = false;
-			this.Add(this.vbox1);
-			if ((this.Child != null))
-			{
-				this.Child.ShowAll();
+			this.Add (this.vbox1);
+			if ((this.Child != null)) {
+				this.Child.ShowAll ();
 			}
-			this.Show();
-			this.unitName.FocusOutEvent += new global::Gtk.FocusOutEventHandler(this.OnUnitNameFocusOut);
-			this.unitName.KeyPressEvent += new global::Gtk.KeyPressEventHandler(this.OnUnitNameKeyPress);
-			this.unitSize.FocusOutEvent += new global::Gtk.FocusOutEventHandler(this.OnUnitSizeFocusOut);
-			this.unitSize.KeyPressEvent += new global::Gtk.KeyPressEventHandler(this.OnUnitSizeKeyPress);
-			this.bttnAddWeapon.Clicked += new global::System.EventHandler(this.OnBttnAddEquipmentClicked);
-			this.bttnEditWeapon.Clicked += new global::System.EventHandler(this.HandleEditButtonClicked);
-			this.bttnReplaceWeapon.Clicked += new global::System.EventHandler(this.HandleReplaceButtonClicked);
-			this.bttnRemoveWeapon.Clicked += new global::System.EventHandler(this.HandleRemoveButtonActivated);
+			this.Show ();
+			this.unitName.FocusOutEvent += new global::Gtk.FocusOutEventHandler (this.OnUnitNameFocusOut);
+			this.unitName.KeyPressEvent += new global::Gtk.KeyPressEventHandler (this.OnUnitNameKeyPress);
+			this.unitSize.FocusOutEvent += new global::Gtk.FocusOutEventHandler (this.OnUnitSizeFocusOut);
+			this.unitSize.KeyPressEvent += new global::Gtk.KeyPressEventHandler (this.OnUnitSizeKeyPress);
+			this.bttnAddWeapon.Clicked += new global::System.EventHandler (this.OnBttnAddEquipmentClicked);
+			this.bttnEditWeapon.Clicked += new global::System.EventHandler (this.HandleEditButtonClicked);
+			this.bttnReplaceWeapon.Clicked += new global::System.EventHandler (this.HandleReplaceButtonClicked);
+			this.bttnRemoveWeapon.Clicked += new global::System.EventHandler (this.HandleRemoveButtonActivated);
 		}
 	}
 }