changeset 136:560eb34acd17

* Make UnitDisplayWidget expand boxes so that they're useful * Commit auto-generated code changes from previous menu changes
author IBBoard <dev@ibboard.co.uk>
date Tue, 11 Oct 2011 20:21:10 +0100
parents fda46380dd68
children 5b92d2be69d8
files gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmMainWindow.cs gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewArmy.cs gtk-gui/IBBoard.WarFoundry.GUI.GTK.Widgets.UnitDisplayWidget.cs gtk-gui/gui.stetic
diffstat 4 files changed, 292 insertions(+), 302 deletions(-) [+]
line wrap: on
line diff
--- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmMainWindow.cs	Sun Oct 09 21:03:09 2011 +0100
+++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmMainWindow.cs	Tue Oct 11 20:21:10 2011 +0100
@@ -29,7 +29,7 @@
 		private global::Gtk.Action miExportArmyAs;
 		private global::Gtk.Action miExportArmyAsBasicHTML;
 		private global::Gtk.Action miPreferences;
-		private global::Gtk.Action transformedXmlAction;
+		private global::Gtk.Action miExportArmyAsTransformedXml;
 		private global::Gtk.VBox vbox1;
 		private global::Gtk.MenuBar menubar1;
 		private global::Gtk.Toolbar toolbar;
@@ -38,188 +38,189 @@
 		private global::Gtk.Notebook unitsNotebook;
 		private global::Gtk.Statusbar statusbar1;
 		private global::Gtk.Label lblTotalPoints;
-
-		protected virtual void Build()
+		
+		protected virtual void Build ()
 		{
-			global::Stetic.Gui.Initialize(this);
+			global::Stetic.Gui.Initialize (this);
 			// Widget IBBoard.WarFoundry.GUI.GTK.FrmMainWindow
-			this.UIManager = new global::Gtk.UIManager();
-			global::Gtk.ActionGroup w1 = new global::Gtk.ActionGroup("Default");
-			this.menuFile = new global::Gtk.Action("menuFile", global::Mono.Unix.Catalog.GetString("File"), null, null);
-			this.menuFile.ShortLabel = global::Mono.Unix.Catalog.GetString("File");
-			w1.Add(this.menuFile, null);
-			this.miNewArmy = new global::Gtk.Action("miNewArmy", global::Mono.Unix.Catalog.GetString("Create army"), null, "gtk-new");
-			this.miNewArmy.ShortLabel = global::Mono.Unix.Catalog.GetString("Create army");
-			w1.Add(this.miNewArmy, null);
-			this.miOpenArmy = new global::Gtk.Action("miOpenArmy", global::Mono.Unix.Catalog.GetString("Open army"), null, "gtk-open");
-			this.miOpenArmy.ShortLabel = global::Mono.Unix.Catalog.GetString("Open army");
-			w1.Add(this.miOpenArmy, null);
-			this.miSaveArmy = new global::Gtk.Action("miSaveArmy", global::Mono.Unix.Catalog.GetString("Save army"), null, "gtk-save");
+			this.UIManager = new global::Gtk.UIManager ();
+			global::Gtk.ActionGroup w1 = new global::Gtk.ActionGroup ("Default");
+			this.menuFile = new global::Gtk.Action ("menuFile", global::Mono.Unix.Catalog.GetString ("File"), null, null);
+			this.menuFile.ShortLabel = global::Mono.Unix.Catalog.GetString ("File");
+			w1.Add (this.menuFile, null);
+			this.miNewArmy = new global::Gtk.Action ("miNewArmy", global::Mono.Unix.Catalog.GetString ("Create army"), null, "gtk-new");
+			this.miNewArmy.ShortLabel = global::Mono.Unix.Catalog.GetString ("Create army");
+			w1.Add (this.miNewArmy, null);
+			this.miOpenArmy = new global::Gtk.Action ("miOpenArmy", global::Mono.Unix.Catalog.GetString ("Open army"), null, "gtk-open");
+			this.miOpenArmy.ShortLabel = global::Mono.Unix.Catalog.GetString ("Open army");
+			w1.Add (this.miOpenArmy, null);
+			this.miSaveArmy = new global::Gtk.Action ("miSaveArmy", global::Mono.Unix.Catalog.GetString ("Save army"), null, "gtk-save");
 			this.miSaveArmy.Sensitive = false;
-			this.miSaveArmy.ShortLabel = global::Mono.Unix.Catalog.GetString("Save army");
-			w1.Add(this.miSaveArmy, null);
-			this.miSaveArmyAs = new global::Gtk.Action("miSaveArmyAs", global::Mono.Unix.Catalog.GetString("Save army as"), null, "gtk-save-as");
+			this.miSaveArmy.ShortLabel = global::Mono.Unix.Catalog.GetString ("Save army");
+			w1.Add (this.miSaveArmy, null);
+			this.miSaveArmyAs = new global::Gtk.Action ("miSaveArmyAs", global::Mono.Unix.Catalog.GetString ("Save army as"), null, "gtk-save-as");
 			this.miSaveArmyAs.Sensitive = false;
-			this.miSaveArmyAs.ShortLabel = global::Mono.Unix.Catalog.GetString("Save army as");
-			w1.Add(this.miSaveArmyAs, null);
-			this.miCloseArmy = new global::Gtk.Action("miCloseArmy", global::Mono.Unix.Catalog.GetString("Close army"), null, "gtk-close");
+			this.miSaveArmyAs.ShortLabel = global::Mono.Unix.Catalog.GetString ("Save army as");
+			w1.Add (this.miSaveArmyAs, null);
+			this.miCloseArmy = new global::Gtk.Action ("miCloseArmy", global::Mono.Unix.Catalog.GetString ("Close army"), null, "gtk-close");
 			this.miCloseArmy.Sensitive = false;
-			this.miCloseArmy.ShortLabel = global::Mono.Unix.Catalog.GetString("Close army");
-			w1.Add(this.miCloseArmy, null);
-			this.miReloadFiles = new global::Gtk.Action("miReloadFiles", global::Mono.Unix.Catalog.GetString("Reload files"), null, "gtk-refresh");
-			this.miReloadFiles.ShortLabel = global::Mono.Unix.Catalog.GetString("Reload files");
-			w1.Add(this.miReloadFiles, null);
-			this.miExit = new global::Gtk.Action("miExit", global::Mono.Unix.Catalog.GetString("Exit"), null, "gtk-quit");
-			this.miExit.ShortLabel = global::Mono.Unix.Catalog.GetString("Exit");
-			w1.Add(this.miExit, null);
-			this.menuEdit = new global::Gtk.Action("menuEdit", global::Mono.Unix.Catalog.GetString("Edit"), null, null);
-			this.menuEdit.ShortLabel = global::Mono.Unix.Catalog.GetString("Edit");
-			w1.Add(this.menuEdit, null);
-			this.miUndo = new global::Gtk.Action("miUndo", global::Mono.Unix.Catalog.GetString("Undo"), null, "gtk-undo");
+			this.miCloseArmy.ShortLabel = global::Mono.Unix.Catalog.GetString ("Close army");
+			w1.Add (this.miCloseArmy, null);
+			this.miReloadFiles = new global::Gtk.Action ("miReloadFiles", global::Mono.Unix.Catalog.GetString ("Reload files"), null, "gtk-refresh");
+			this.miReloadFiles.ShortLabel = global::Mono.Unix.Catalog.GetString ("Reload files");
+			w1.Add (this.miReloadFiles, null);
+			this.miExit = new global::Gtk.Action ("miExit", global::Mono.Unix.Catalog.GetString ("Exit"), null, "gtk-quit");
+			this.miExit.ShortLabel = global::Mono.Unix.Catalog.GetString ("Exit");
+			w1.Add (this.miExit, null);
+			this.menuEdit = new global::Gtk.Action ("menuEdit", global::Mono.Unix.Catalog.GetString ("Edit"), null, null);
+			this.menuEdit.ShortLabel = global::Mono.Unix.Catalog.GetString ("Edit");
+			w1.Add (this.menuEdit, null);
+			this.miUndo = new global::Gtk.Action ("miUndo", global::Mono.Unix.Catalog.GetString ("Undo"), null, "gtk-undo");
 			this.miUndo.Sensitive = false;
-			this.miUndo.ShortLabel = global::Mono.Unix.Catalog.GetString("Undo");
-			w1.Add(this.miUndo, null);
-			this.miRedo = new global::Gtk.Action("miRedo", global::Mono.Unix.Catalog.GetString("Redo"), null, "gtk-redo");
+			this.miUndo.ShortLabel = global::Mono.Unix.Catalog.GetString ("Undo");
+			w1.Add (this.miUndo, null);
+			this.miRedo = new global::Gtk.Action ("miRedo", global::Mono.Unix.Catalog.GetString ("Redo"), null, "gtk-redo");
 			this.miRedo.Sensitive = false;
-			this.miRedo.ShortLabel = global::Mono.Unix.Catalog.GetString("Redo");
-			w1.Add(this.miRedo, null);
-			this.menuHelp = new global::Gtk.Action("menuHelp", global::Mono.Unix.Catalog.GetString("Help"), null, null);
-			this.menuHelp.ShortLabel = global::Mono.Unix.Catalog.GetString("Help");
-			w1.Add(this.menuHelp, null);
-			this.miAbout = new global::Gtk.Action("miAbout", global::Mono.Unix.Catalog.GetString("About"), null, "gtk-about");
-			this.miAbout.ShortLabel = global::Mono.Unix.Catalog.GetString("About");
-			w1.Add(this.miAbout, null);
-			this.miDebugInformation = new global::Gtk.Action("miDebugInformation", global::Mono.Unix.Catalog.GetString("Debug Information"), null, null);
-			this.miDebugInformation.ShortLabel = global::Mono.Unix.Catalog.GetString("Debug Information");
-			w1.Add(this.miDebugInformation, null);
-			this.bttnNewArmy = new global::Gtk.Action("bttnNewArmy", null, null, "gtk-new");
-			w1.Add(this.bttnNewArmy, null);
-			this.bttnOpenArmy = new global::Gtk.Action("bttnOpenArmy", null, null, "gtk-open");
-			w1.Add(this.bttnOpenArmy, null);
-			this.bttnSaveArmy = new global::Gtk.Action("bttnSaveArmy", null, null, "gtk-save");
+			this.miRedo.ShortLabel = global::Mono.Unix.Catalog.GetString ("Redo");
+			w1.Add (this.miRedo, null);
+			this.menuHelp = new global::Gtk.Action ("menuHelp", global::Mono.Unix.Catalog.GetString ("Help"), null, null);
+			this.menuHelp.ShortLabel = global::Mono.Unix.Catalog.GetString ("Help");
+			w1.Add (this.menuHelp, null);
+			this.miAbout = new global::Gtk.Action ("miAbout", global::Mono.Unix.Catalog.GetString ("About"), null, "gtk-about");
+			this.miAbout.ShortLabel = global::Mono.Unix.Catalog.GetString ("About");
+			w1.Add (this.miAbout, null);
+			this.miDebugInformation = new global::Gtk.Action ("miDebugInformation", global::Mono.Unix.Catalog.GetString ("Debug Information"), null, null);
+			this.miDebugInformation.ShortLabel = global::Mono.Unix.Catalog.GetString ("Debug Information");
+			w1.Add (this.miDebugInformation, null);
+			this.bttnNewArmy = new global::Gtk.Action ("bttnNewArmy", null, null, "gtk-new");
+			w1.Add (this.bttnNewArmy, null);
+			this.bttnOpenArmy = new global::Gtk.Action ("bttnOpenArmy", null, null, "gtk-open");
+			w1.Add (this.bttnOpenArmy, null);
+			this.bttnSaveArmy = new global::Gtk.Action ("bttnSaveArmy", null, null, "gtk-save");
 			this.bttnSaveArmy.Sensitive = false;
-			w1.Add(this.bttnSaveArmy, null);
-			this.bttnUndo = new global::Gtk.Action("bttnUndo", null, null, "gtk-undo");
+			w1.Add (this.bttnSaveArmy, null);
+			this.bttnUndo = new global::Gtk.Action ("bttnUndo", null, null, "gtk-undo");
 			this.bttnUndo.Sensitive = false;
-			w1.Add(this.bttnUndo, null);
-			this.bttnRedo = new global::Gtk.Action("bttnRedo", null, null, "gtk-redo");
+			w1.Add (this.bttnUndo, null);
+			this.bttnRedo = new global::Gtk.Action ("bttnRedo", null, null, "gtk-redo");
 			this.bttnRedo.Sensitive = false;
-			w1.Add(this.bttnRedo, null);
-			this.goDown = new global::Gtk.Action("goDown", null, null, null);
-			w1.Add(this.goDown, null);
-			this.add = new global::Gtk.Action("add", null, null, "gtk-add");
-			w1.Add(this.add, null);
-			this.miExportArmyAs = new global::Gtk.Action("miExportArmyAs", global::Mono.Unix.Catalog.GetString("Export army as..."), null, "gtk-convert");
+			w1.Add (this.bttnRedo, null);
+			this.goDown = new global::Gtk.Action ("goDown", null, null, null);
+			w1.Add (this.goDown, null);
+			this.add = new global::Gtk.Action ("add", null, null, "gtk-add");
+			w1.Add (this.add, null);
+			this.miExportArmyAs = new global::Gtk.Action ("miExportArmyAs", global::Mono.Unix.Catalog.GetString ("Export army as..."), null, "gtk-convert");
 			this.miExportArmyAs.Sensitive = false;
-			this.miExportArmyAs.ShortLabel = global::Mono.Unix.Catalog.GetString("Export army as...");
-			w1.Add(this.miExportArmyAs, null);
-			this.miExportArmyAsBasicHTML = new global::Gtk.Action("miExportArmyAsBasicHTML", global::Mono.Unix.Catalog.GetString("Basic HTML"), null, null);
-			this.miExportArmyAsBasicHTML.ShortLabel = global::Mono.Unix.Catalog.GetString("Basic HTML");
-			w1.Add(this.miExportArmyAsBasicHTML, null);
-			this.miPreferences = new global::Gtk.Action("miPreferences", global::Mono.Unix.Catalog.GetString("preferences"), null, "gtk-preferences");
-			this.miPreferences.ShortLabel = global::Mono.Unix.Catalog.GetString("preferences");
-			w1.Add(this.miPreferences, null);
-			this.transformedXmlAction = new global::Gtk.Action ("transformedXmlAction", global::Mono.Unix.Catalog.GetString ("transformed xml"), null, null);
-			this.transformedXmlAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("transformed xml");
-			w1.Add (this.transformedXmlAction, null);
-			this.UIManager.InsertActionGroup(w1, 0);
-			this.AddAccelGroup(this.UIManager.AccelGroup);
+			this.miExportArmyAs.ShortLabel = global::Mono.Unix.Catalog.GetString ("Export army as...");
+			w1.Add (this.miExportArmyAs, null);
+			this.miExportArmyAsBasicHTML = new global::Gtk.Action ("miExportArmyAsBasicHTML", global::Mono.Unix.Catalog.GetString ("Basic HTML"), null, null);
+			this.miExportArmyAsBasicHTML.ShortLabel = global::Mono.Unix.Catalog.GetString ("Basic HTML");
+			w1.Add (this.miExportArmyAsBasicHTML, null);
+			this.miPreferences = new global::Gtk.Action ("miPreferences", global::Mono.Unix.Catalog.GetString ("preferences"), null, "gtk-preferences");
+			this.miPreferences.ShortLabel = global::Mono.Unix.Catalog.GetString ("preferences");
+			w1.Add (this.miPreferences, null);
+			this.miExportArmyAsTransformedXml = new global::Gtk.Action ("miExportArmyAsTransformedXml", global::Mono.Unix.Catalog.GetString ("transformed xml"), null, null);
+			this.miExportArmyAsTransformedXml.ShortLabel = global::Mono.Unix.Catalog.GetString ("transformed xml");
+			w1.Add (this.miExportArmyAsTransformedXml, null);
+			this.UIManager.InsertActionGroup (w1, 0);
+			this.AddAccelGroup (this.UIManager.AccelGroup);
 			this.Name = "IBBoard.WarFoundry.GUI.GTK.FrmMainWindow";
-			this.Title = global::Mono.Unix.Catalog.GetString("MainWindow");
-			this.Icon = global::Gdk.Pixbuf.LoadFromResource("App.ico");
+			this.Title = global::Mono.Unix.Catalog.GetString ("MainWindow");
+			this.Icon = global::Gdk.Pixbuf.LoadFromResource ("App.ico");
 			// Container child IBBoard.WarFoundry.GUI.GTK.FrmMainWindow.Gtk.Container+ContainerChild
-			this.vbox1 = new global::Gtk.VBox();
+			this.vbox1 = new global::Gtk.VBox ();
 			this.vbox1.Name = "vbox1";
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.UIManager.AddUiFromString("<ui><menubar name='menubar1'><menu name='menuFile' action='menuFile'><menuitem name='miNewArmy' action='miNewArmy'/><menuitem name='miOpenArmy' action='miOpenArmy'/><menuitem name='miSaveArmy' action='miSaveArmy'/><menuitem name='miSaveArmyAs' action='miSaveArmyAs'/><menu name='miExportArmyAs' action='miExportArmyAs'><menuitem name='miExportArmyAsBasicHTML' action='miExportArmyAsBasicHTML'/></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='miPreferences' action='miPreferences'/></menu><menu name='menuHelp' action='menuHelp'><menuitem name='miAbout' action='miAbout'/></menu></menubar></ui>");
-			this.menubar1 = ((global::Gtk.MenuBar)(this.UIManager.GetWidget("/menubar1")));
+			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='miPreferences' action='miPreferences'/></menu><menu name='menuHelp' action='menuHelp'><menuitem name='miAbout' action='miAbout'/></menu></menubar></ui>");
+			this.menubar1 = ((global::Gtk.MenuBar)(this.UIManager.GetWidget ("/menubar1")));
 			this.menubar1.Name = "menubar1";
-			this.vbox1.Add(this.menubar1);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.menubar1]));
+			this.vbox1.Add (this.menubar1);
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.menubar1]));
 			w2.Position = 0;
 			w2.Expand = false;
 			w2.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.UIManager.AddUiFromString("<ui><toolbar name='toolbar'><toolitem name='bttnNewArmy' action='bttnNewArmy'/><toolitem name='bttnOpenArmy' action='bttnOpenArmy'/><toolitem name='bttnSaveArmy' action='bttnSaveArmy'/><separator/><toolitem name='bttnUndo' action='bttnUndo'/><toolitem name='bttnRedo' action='bttnRedo'/><separator/></toolbar></ui>");
-			this.toolbar = ((global::Gtk.Toolbar)(this.UIManager.GetWidget("/toolbar")));
+			this.UIManager.AddUiFromString ("<ui><toolbar name='toolbar'><toolitem name='bttnNewArmy' action='bttnNewArmy'/><toolitem name='bttnOpenArmy' action='bttnOpenArmy'/><toolitem name='bttnSaveArmy' action='bttnSaveArmy'/><separator/><toolitem name='bttnUndo' action='bttnUndo'/><toolitem name='bttnRedo' action='bttnRedo'/><separator/></toolbar></ui>");
+			this.toolbar = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar")));
 			this.toolbar.HeightRequest = 36;
 			this.toolbar.Name = "toolbar";
 			this.toolbar.ShowArrow = false;
 			this.toolbar.ToolbarStyle = ((global::Gtk.ToolbarStyle)(0));
 			this.toolbar.IconSize = ((global::Gtk.IconSize)(3));
-			this.vbox1.Add(this.toolbar);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.toolbar]));
+			this.vbox1.Add (this.toolbar);
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.toolbar]));
 			w3.Position = 1;
 			w3.Expand = false;
 			w3.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.hpaned2 = new global::Gtk.HPaned();
+			this.hpaned2 = new global::Gtk.HPaned ();
 			this.hpaned2.CanFocus = true;
 			this.hpaned2.Name = "hpaned2";
 			this.hpaned2.Position = 178;
 			// Container child hpaned2.Gtk.Paned+PanedChild
-			this.treeUnits = new global::Gtk.TreeView();
+			this.treeUnits = new global::Gtk.TreeView ();
 			this.treeUnits.CanFocus = true;
 			this.treeUnits.Name = "treeUnits";
-			this.hpaned2.Add(this.treeUnits);
-			global::Gtk.Paned.PanedChild w4 = ((global::Gtk.Paned.PanedChild)(this.hpaned2[this.treeUnits]));
+			this.hpaned2.Add (this.treeUnits);
+			global::Gtk.Paned.PanedChild w4 = ((global::Gtk.Paned.PanedChild)(this.hpaned2 [this.treeUnits]));
 			w4.Resize = false;
 			// Container child hpaned2.Gtk.Paned+PanedChild
-			this.unitsNotebook = new global::Gtk.Notebook();
+			this.unitsNotebook = new global::Gtk.Notebook ();
 			this.unitsNotebook.CanFocus = true;
 			this.unitsNotebook.Name = "unitsNotebook";
 			this.unitsNotebook.CurrentPage = -1;
 			this.unitsNotebook.Scrollable = true;
-			this.hpaned2.Add(this.unitsNotebook);
-			this.vbox1.Add(this.hpaned2);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.hpaned2]));
+			this.hpaned2.Add (this.unitsNotebook);
+			global::Gtk.Paned.PanedChild w5 = ((global::Gtk.Paned.PanedChild)(this.hpaned2 [this.unitsNotebook]));
+			w5.Shrink = false;
+			this.vbox1.Add (this.hpaned2);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hpaned2]));
 			w6.Position = 2;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.statusbar1 = new global::Gtk.Statusbar();
+			this.statusbar1 = new global::Gtk.Statusbar ();
 			this.statusbar1.Name = "statusbar1";
 			this.statusbar1.Spacing = 2;
 			// Container child statusbar1.Gtk.Box+BoxChild
-			this.lblTotalPoints = new global::Gtk.Label();
+			this.lblTotalPoints = new global::Gtk.Label ();
 			this.lblTotalPoints.Name = "lblTotalPoints";
-			this.statusbar1.Add(this.lblTotalPoints);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.statusbar1[this.lblTotalPoints]));
+			this.statusbar1.Add (this.lblTotalPoints);
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.statusbar1 [this.lblTotalPoints]));
 			w7.Position = 2;
 			w7.Expand = false;
 			w7.Fill = false;
-			this.vbox1.Add(this.statusbar1);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.statusbar1]));
+			this.vbox1.Add (this.statusbar1);
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.statusbar1]));
 			w8.Position = 3;
 			w8.Expand = false;
 			w8.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.DefaultWidth = 832;
 			this.DefaultHeight = 659;
-			this.hpaned2.Hide();
-			this.Show();
-			this.miNewArmy.Activated += new global::System.EventHandler(this.OnCreateArmyActivated);
-			this.miOpenArmy.Activated += new global::System.EventHandler(this.OnOpenArmyActivated);
-			this.miSaveArmy.Activated += new global::System.EventHandler(this.OnSaveArmyActivated);
-			this.miSaveArmyAs.Activated += new global::System.EventHandler(this.OnSaveArmyAsActivated);
-			this.miCloseArmy.Activated += new global::System.EventHandler(this.OnCloseArmyActivated);
-			this.miReloadFiles.Activated += new global::System.EventHandler(this.OnReloadFilesActivated);
-			this.miExit.Activated += new global::System.EventHandler(this.OnExitActivated);
-			this.miAbout.Activated += new global::System.EventHandler(this.HelpAboutActivated);
-			this.bttnNewArmy.Activated += new global::System.EventHandler(this.newTBButtonActivated);
-			this.bttnOpenArmy.Activated += new global::System.EventHandler(this.openTBButtonActivated);
-			this.bttnSaveArmy.Activated += new global::System.EventHandler(this.saveTBButtonActivated);
-			this.bttnUndo.Activated += new global::System.EventHandler(this.undoTBButtonActivated);
-			this.bttnRedo.Activated += new global::System.EventHandler(this.redoTBButtonActivated);
-			this.miExportArmyAsBasicHTML.Activated += new global::System.EventHandler(this.OnMiExportAsBasicHtmlActivated);
-			this.miPreferences.Activated += new global::System.EventHandler(this.miPreferencesClicked);
-			this.transformedXmlAction.Activated += new global::System.EventHandler (this.OnTransformedXmlActionActivated);
-			this.treeUnits.RowActivated += new global::Gtk.RowActivatedHandler(this.ArmyRowActivated);
-			this.treeUnits.PopupMenu += new global::Gtk.PopupMenuHandler(this.OnTreeUnitsPopupMenu);
-			this.treeUnits.ButtonPressEvent += new global::Gtk.ButtonPressEventHandler(this.UnitTreeButtonPressed);
-			this.unitsNotebook.Removed += new global::Gtk.RemovedHandler(this.NotebookPageRemoved);
+			this.hpaned2.Hide ();
+			this.Show ();
+			this.miNewArmy.Activated += new global::System.EventHandler (this.OnCreateArmyActivated);
+			this.miOpenArmy.Activated += new global::System.EventHandler (this.OnOpenArmyActivated);
+			this.miSaveArmy.Activated += new global::System.EventHandler (this.OnSaveArmyActivated);
+			this.miSaveArmyAs.Activated += new global::System.EventHandler (this.OnSaveArmyAsActivated);
+			this.miCloseArmy.Activated += new global::System.EventHandler (this.OnCloseArmyActivated);
+			this.miReloadFiles.Activated += new global::System.EventHandler (this.OnReloadFilesActivated);
+			this.miExit.Activated += new global::System.EventHandler (this.OnExitActivated);
+			this.miAbout.Activated += new global::System.EventHandler (this.HelpAboutActivated);
+			this.bttnNewArmy.Activated += new global::System.EventHandler (this.newTBButtonActivated);
+			this.bttnOpenArmy.Activated += new global::System.EventHandler (this.openTBButtonActivated);
+			this.bttnSaveArmy.Activated += new global::System.EventHandler (this.saveTBButtonActivated);
+			this.bttnUndo.Activated += new global::System.EventHandler (this.undoTBButtonActivated);
+			this.bttnRedo.Activated += new global::System.EventHandler (this.redoTBButtonActivated);
+			this.miExportArmyAsBasicHTML.Activated += new global::System.EventHandler (this.OnMiExportAsBasicHtmlActivated);
+			this.miPreferences.Activated += new global::System.EventHandler (this.miPreferencesClicked);
+			this.miExportArmyAsTransformedXml.Activated += new global::System.EventHandler (this.OnTransformedXmlActionActivated);
+			this.treeUnits.RowActivated += new global::Gtk.RowActivatedHandler (this.ArmyRowActivated);
+			this.treeUnits.PopupMenu += new global::Gtk.PopupMenuHandler (this.OnTreeUnitsPopupMenu);
+			this.treeUnits.ButtonPressEvent += new global::Gtk.ButtonPressEventHandler (this.UnitTreeButtonPressed);
+			this.unitsNotebook.Removed += new global::Gtk.RemovedHandler (this.NotebookPageRemoved);
 		}
 	}
 }
--- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewArmy.cs	Sun Oct 09 21:03:09 2011 +0100
+++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewArmy.cs	Tue Oct 11 20:21:10 2011 +0100
@@ -17,15 +17,15 @@
 		private global::Gtk.Entry txtArmyName;
 		private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnCancel;
 		private global::IBBoard.GtkSharp.Translatable.TranslatableButton bttnCreate;
-
-		protected virtual void Build()
+		
+		protected virtual void Build ()
 		{
-			global::Stetic.Gui.Initialize(this);
+			global::Stetic.Gui.Initialize (this);
 			// Widget IBBoard.WarFoundry.GUI.GTK.FrmNewArmy
 			this.Events = ((global::Gdk.EventMask)(256));
 			this.Name = "IBBoard.WarFoundry.GUI.GTK.FrmNewArmy";
-			this.Title = global::Mono.Unix.Catalog.GetString("Create new army");
-			this.Icon = global::Stetic.IconLoader.LoadIcon(this, "gtk-new", global::Gtk.IconSize.Menu);
+			this.Title = global::Mono.Unix.Catalog.GetString ("Create new army");
+			this.Icon = global::Stetic.IconLoader.LoadIcon (this, "gtk-new", global::Gtk.IconSize.Menu);
 			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
 			this.SkipPagerHint = true;
 			this.SkipTaskbarHint = true;
@@ -36,24 +36,24 @@
 			w1.Name = "dialog_VBox";
 			w1.BorderWidth = ((uint)(2));
 			// Container child dialog_VBox.Gtk.Box+BoxChild
-			this.table1 = new global::Gtk.Table(((uint)(4)), ((uint)(2)), false);
+			this.table1 = new global::Gtk.Table (((uint)(4)), ((uint)(2)), false);
 			this.table1.Name = "table1";
 			this.table1.RowSpacing = ((uint)(6));
 			this.table1.ColumnSpacing = ((uint)(6));
 			// Container child table1.Gtk.Table+TableChild
-			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow();
+			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow ();
 			this.GtkScrolledWindow.Name = "GtkScrolledWindow";
 			this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));
 			// Container child GtkScrolledWindow.Gtk.Container+ContainerChild
-			this.lstRaces = new global::Gtk.TreeView();
+			this.lstRaces = new global::Gtk.TreeView ();
 			this.lstRaces.HeightRequest = 150;
 			this.lstRaces.CanFocus = true;
 			this.lstRaces.Name = "lstRaces";
 			this.lstRaces.HeadersVisible = false;
 			this.lstRaces.RulesHint = true;
-			this.GtkScrolledWindow.Add(this.lstRaces);
-			this.table1.Add(this.GtkScrolledWindow);
-			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1[this.GtkScrolledWindow]));
+			this.GtkScrolledWindow.Add (this.lstRaces);
+			this.table1.Add (this.GtkScrolledWindow);
+			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.GtkScrolledWindow]));
 			w3.TopAttach = ((uint)(1));
 			w3.BottomAttach = ((uint)(2));
 			w3.LeftAttach = ((uint)(1));
@@ -61,10 +61,10 @@
 			w3.XOptions = ((global::Gtk.AttachOptions)(4));
 			w3.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.hbox2 = new global::Gtk.HBox();
+			this.hbox2 = new global::Gtk.HBox ();
 			this.hbox2.Name = "hbox2";
 			// Container child hbox2.Gtk.Box+BoxChild
-			this.sbPointsValue = new global::Gtk.SpinButton(0, 2000000000, 100);
+			this.sbPointsValue = new global::Gtk.SpinButton (0, 2000000000, 100);
 			this.sbPointsValue.WidthRequest = 150;
 			this.sbPointsValue.CanFocus = true;
 			this.sbPointsValue.Name = "sbPointsValue";
@@ -72,13 +72,13 @@
 			this.sbPointsValue.ClimbRate = 100;
 			this.sbPointsValue.Numeric = true;
 			this.sbPointsValue.Value = 1000;
-			this.hbox2.Add(this.sbPointsValue);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.sbPointsValue]));
+			this.hbox2.Add (this.sbPointsValue);
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.sbPointsValue]));
 			w4.Position = 0;
 			w4.Expand = false;
 			w4.Fill = false;
-			this.table1.Add(this.hbox2);
-			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1[this.hbox2]));
+			this.table1.Add (this.hbox2);
+			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1 [this.hbox2]));
 			w5.TopAttach = ((uint)(3));
 			w5.BottomAttach = ((uint)(4));
 			w5.LeftAttach = ((uint)(1));
@@ -86,67 +86,67 @@
 			w5.XOptions = ((global::Gtk.AttachOptions)(4));
 			w5.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.lblArmyName = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
+			this.lblArmyName = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel ();
 			this.lblArmyName.Name = "lblArmyName";
-			this.lblArmyName.LabelProp = global::Mono.Unix.Catalog.GetString("army name");
-			this.table1.Add(this.lblArmyName);
-			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1[this.lblArmyName]));
+			this.lblArmyName.LabelProp = global::Mono.Unix.Catalog.GetString ("army name");
+			this.table1.Add (this.lblArmyName);
+			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1 [this.lblArmyName]));
 			w6.TopAttach = ((uint)(2));
 			w6.BottomAttach = ((uint)(3));
 			w6.XOptions = ((global::Gtk.AttachOptions)(4));
 			w6.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.lblArmySize = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
+			this.lblArmySize = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel ();
 			this.lblArmySize.Name = "lblArmySize";
-			this.lblArmySize.LabelProp = global::Mono.Unix.Catalog.GetString("points value");
-			this.table1.Add(this.lblArmySize);
-			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1[this.lblArmySize]));
+			this.lblArmySize.LabelProp = global::Mono.Unix.Catalog.GetString ("points value");
+			this.table1.Add (this.lblArmySize);
+			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1 [this.lblArmySize]));
 			w7.TopAttach = ((uint)(3));
 			w7.BottomAttach = ((uint)(4));
 			w7.XOptions = ((global::Gtk.AttachOptions)(4));
 			w7.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.lblGameSystem = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
+			this.lblGameSystem = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel ();
 			this.lblGameSystem.Name = "lblGameSystem";
-			this.lblGameSystem.LabelProp = global::Mono.Unix.Catalog.GetString("game system");
-			this.table1.Add(this.lblGameSystem);
-			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table1[this.lblGameSystem]));
+			this.lblGameSystem.LabelProp = global::Mono.Unix.Catalog.GetString ("game system");
+			this.table1.Add (this.lblGameSystem);
+			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table1 [this.lblGameSystem]));
 			w8.XOptions = ((global::Gtk.AttachOptions)(4));
 			w8.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.lblRaceList = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel();
+			this.lblRaceList = new global::IBBoard.GtkSharp.Translatable.TranslatableLabel ();
 			this.lblRaceList.Name = "lblRaceList";
-			this.lblRaceList.LabelProp = global::Mono.Unix.Catalog.GetString("race");
-			this.table1.Add(this.lblRaceList);
-			global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table1[this.lblRaceList]));
+			this.lblRaceList.LabelProp = global::Mono.Unix.Catalog.GetString ("race");
+			this.table1.Add (this.lblRaceList);
+			global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table1 [this.lblRaceList]));
 			w9.TopAttach = ((uint)(1));
 			w9.BottomAttach = ((uint)(2));
 			w9.XOptions = ((global::Gtk.AttachOptions)(4));
 			w9.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.systemCombo = global::Gtk.ComboBoxEntry.NewText();
+			this.systemCombo = global::Gtk.ComboBoxEntry.NewText ();
 			this.systemCombo.Name = "systemCombo";
-			this.table1.Add(this.systemCombo);
-			global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table1[this.systemCombo]));
+			this.table1.Add (this.systemCombo);
+			global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table1 [this.systemCombo]));
 			w10.LeftAttach = ((uint)(1));
 			w10.RightAttach = ((uint)(2));
 			w10.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
-			this.txtArmyName = new global::Gtk.Entry();
+			this.txtArmyName = new global::Gtk.Entry ();
 			this.txtArmyName.CanFocus = true;
 			this.txtArmyName.Name = "txtArmyName";
 			this.txtArmyName.IsEditable = true;
 			this.txtArmyName.InvisibleChar = '•';
-			this.table1.Add(this.txtArmyName);
-			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1[this.txtArmyName]));
+			this.table1.Add (this.txtArmyName);
+			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1 [this.txtArmyName]));
 			w11.TopAttach = ((uint)(2));
 			w11.BottomAttach = ((uint)(3));
 			w11.LeftAttach = ((uint)(1));
 			w11.RightAttach = ((uint)(2));
 			w11.XOptions = ((global::Gtk.AttachOptions)(4));
 			w11.YOptions = ((global::Gtk.AttachOptions)(4));
-			w1.Add(this.table1);
-			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(w1[this.table1]));
+			w1.Add (this.table1);
+			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(w1 [this.table1]));
 			w12.Position = 0;
 			w12.Expand = false;
 			w12.Fill = false;
@@ -160,18 +160,18 @@
 			w13.BorderWidth = ((uint)(5));
 			w13.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
 			// Container child WarFoundrySharp.FrmNewArmy_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.bttnCancel = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
+			this.bttnCancel = new global::IBBoard.GtkSharp.Translatable.TranslatableButton ();
 			this.bttnCancel.CanFocus = true;
 			this.bttnCancel.Name = "bttnCancel";
 			this.bttnCancel.UseStock = true;
 			this.bttnCancel.UseUnderline = true;
 			this.bttnCancel.Label = "gtk-cancel";
-			this.AddActionWidget(this.bttnCancel, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w14 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w13[this.bttnCancel]));
+			this.AddActionWidget (this.bttnCancel, -6);
+			global::Gtk.ButtonBox.ButtonBoxChild w14 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w13 [this.bttnCancel]));
 			w14.Expand = false;
 			w14.Fill = false;
 			// Container child WarFoundrySharp.FrmNewArmy_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-			this.bttnCreate = new global::IBBoard.GtkSharp.Translatable.TranslatableButton();
+			this.bttnCreate = new global::IBBoard.GtkSharp.Translatable.TranslatableButton ();
 			this.bttnCreate.Sensitive = false;
 			this.bttnCreate.CanDefault = true;
 			this.bttnCreate.CanFocus = true;
@@ -179,25 +179,24 @@
 			this.bttnCreate.UseStock = true;
 			this.bttnCreate.UseUnderline = true;
 			this.bttnCreate.Label = "gtk-ok";
-			this.AddActionWidget(this.bttnCreate, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w15 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w13[this.bttnCreate]));
+			this.AddActionWidget (this.bttnCreate, -5);
+			global::Gtk.ButtonBox.ButtonBoxChild w15 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w13 [this.bttnCreate]));
 			w15.Position = 1;
 			w15.Expand = false;
 			w15.Fill = false;
-			if ((this.Child != null))
-			{
-				this.Child.ShowAll();
+			if ((this.Child != null)) {
+				this.Child.ShowAll ();
 			}
 			this.DefaultWidth = 370;
 			this.DefaultHeight = 348;
-			this.Show();
-			this.txtArmyName.Changed += new global::System.EventHandler(this.OnTextChanged);
-			this.systemCombo.Changed += new global::System.EventHandler(this.OnSystemComboChanged);
-			this.sbPointsValue.ChangeValue += new global::Gtk.ChangeValueHandler(this.OnSpinChangeValue);
-			this.sbPointsValue.ValueChanged += new global::System.EventHandler(this.OnSpinValueChanged);
-			this.sbPointsValue.Changed += new global::System.EventHandler(this.OnSpinValueChanged);
-			this.bttnCancel.Clicked += new global::System.EventHandler(this.OnCancelClicked);
-			this.bttnCreate.Clicked += new global::System.EventHandler(this.OnCreateClicked);
+			this.Show ();
+			this.txtArmyName.Changed += new global::System.EventHandler (this.OnTextChanged);
+			this.systemCombo.Changed += new global::System.EventHandler (this.OnSystemComboChanged);
+			this.sbPointsValue.ChangeValue += new global::Gtk.ChangeValueHandler (this.OnSpinChangeValue);
+			this.sbPointsValue.ValueChanged += new global::System.EventHandler (this.OnSpinValueChanged);
+			this.sbPointsValue.Changed += new global::System.EventHandler (this.OnSpinValueChanged);
+			this.bttnCancel.Clicked += new global::System.EventHandler (this.OnCancelClicked);
+			this.bttnCreate.Clicked += new global::System.EventHandler (this.OnCreateClicked);
 		}
 	}
 }
--- 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);
 		}
 	}
 }
--- a/gtk-gui/gui.stetic	Sun Oct 09 21:03:09 2011 +0100
+++ b/gtk-gui/gui.stetic	Tue Oct 11 20:21:10 2011 +0100
@@ -10,7 +10,7 @@
   </import>
   <widget class="Gtk.Window" id="IBBoard.WarFoundry.GUI.GTK.FrmMainWindow" design-size="832 659">
     <action-group name="Default">
-      <action id="FileAction">
+      <action id="menuFile">
         <property name="Type">Action</property>
         <property name="Label" translatable="yes">File</property>
         <property name="ShortLabel" translatable="yes">File</property>
@@ -182,7 +182,7 @@
           <widget class="Gtk.MenuBar" id="menubar1">
             <property name="MemberName" />
             <node name="menubar1" type="Menubar">
-              <node type="Menu" action="FileAction">
+              <node type="Menu" action="menuFile">
                 <node type="Menuitem" action="miNewArmy" />
                 <node type="Menuitem" action="miOpenArmy" />
                 <node type="Menuitem" action="miSaveArmy" />
@@ -265,6 +265,9 @@
                 <property name="Scrollable">True</property>
                 <signal name="Removed" handler="NotebookPageRemoved" />
               </widget>
+              <packing>
+                <property name="Shrink">False</property>
+              </packing>
             </child>
           </widget>
           <packing>
@@ -702,7 +705,7 @@
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Bin" id="IBBoard.WarFoundry.GUI.GTK.Widgets.UnitDisplayWidget" design-size="649 458">
+  <widget class="Gtk.Bin" id="IBBoard.WarFoundry.GUI.GTK.Widgets.UnitDisplayWidget" design-size="649 406">
     <property name="MemberName" />
     <child>
       <widget class="Gtk.VBox" id="vbox1">
@@ -756,6 +759,7 @@
         <child>
           <widget class="Gtk.ScrolledWindow" id="statsScrollPanel">
             <property name="MemberName" />
+            <property name="HeightRequest">115</property>
             <property name="CanFocus">True</property>
             <property name="ShadowType">In</property>
             <child>
@@ -776,7 +780,8 @@
           </widget>
           <packing>
             <property name="Position">1</property>
-            <property name="AutoSize">True</property>
+            <property name="AutoSize">False</property>
+            <property name="Expand">False</property>
           </packing>
         </child>
         <child>
@@ -817,12 +822,11 @@
                   <packing>
                     <property name="LeftAttach">1</property>
                     <property name="RightAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="YOptions">Fill</property>
+                    <property name="AutoSize">False</property>
                     <property name="XExpand">True</property>
                     <property name="XFill">True</property>
                     <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
+                    <property name="YExpand">True</property>
                     <property name="YFill">True</property>
                     <property name="YShrink">False</property>
                   </packing>
@@ -846,12 +850,11 @@
                     <property name="BottomAttach">3</property>
                     <property name="LeftAttach">1</property>
                     <property name="RightAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="YOptions">Fill</property>
+                    <property name="AutoSize">False</property>
                     <property name="XExpand">True</property>
                     <property name="XFill">True</property>
                     <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
+                    <property name="YExpand">True</property>
                     <property name="YFill">True</property>
                     <property name="YShrink">False</property>
                   </packing>
@@ -874,12 +877,11 @@
                     <property name="BottomAttach">2</property>
                     <property name="LeftAttach">1</property>
                     <property name="RightAttach">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="YOptions">Fill</property>
+                    <property name="AutoSize">False</property>
                     <property name="XExpand">True</property>
                     <property name="XFill">True</property>
                     <property name="XShrink">False</property>
-                    <property name="YExpand">False</property>
+                    <property name="YExpand">True</property>
                     <property name="YFill">True</property>
                     <property name="YShrink">False</property>
                   </packing>
@@ -942,7 +944,7 @@
               </widget>
               <packing>
                 <property name="Position">0</property>
-                <property name="AutoSize">True</property>
+                <property name="AutoSize">False</property>
               </packing>
             </child>
             <child>
@@ -1027,17 +1029,9 @@
           </widget>
           <packing>
             <property name="Position">3</property>
-            <property name="AutoSize">True</property>
-            <property name="Expand">False</property>
-            <property name="Fill">False</property>
+            <property name="AutoSize">False</property>
           </packing>
         </child>
-        <child>
-          <placeholder />
-        </child>
-        <child>
-          <placeholder />
-        </child>
       </widget>
     </child>
   </widget>