changeset 40:0bd9c85d3c5d

Re #86: Complete initial GTK# UI * Add sln to make solution loading easier * Commit rebuild UI files
author IBBoard <dev@ibboard.co.uk>
date Sat, 07 Aug 2010 19:56:05 +0000
parents 146b7a893a01
children a32b6bb7f1eb
files IBBoard.WarFoundry.GUI.GTK.sln gtk-gui/IBBoard.WarFoundry.GTK.FrmMainWindow.cs gtk-gui/IBBoard.WarFoundry.GTK.FrmNewArmy.cs gtk-gui/IBBoard.WarFoundry.GTK.FrmNewUnit.cs gtk-gui/IBBoard.WarFoundry.GTK.Widgets.UnitDisplayWidget.cs gtk-gui/generated.cs
diffstat 6 files changed, 1051 insertions(+), 994 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/IBBoard.WarFoundry.GUI.GTK.sln	Sat Aug 07 19:56:05 2010 +0000
@@ -0,0 +1,68 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBBoard.WarFoundry.GUI.GTK", "IBBoard.WarFoundry.GUI.GTK.csproj", "{4B435E40-7FA2-41C5-96F6-5735396D2D5F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBBoard", "..\IBBoard\IBBoard.csproj", "{5DFD64F6-FC2B-4B4F-B92E-483BAC468105}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBBoard.WarFoundry.API", "..\IBBoard.WarFoundry.API\IBBoard.WarFoundry.API.csproj", "{951E6C7A-7FBA-4F68-9D9E-F48618BB9626}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBBoard.GtkSharp", "..\IBBoard.GtkSharp\IBBoard.GtkSharp.csproj", "{06605A63-E433-42FE-93CF-0DA6630A7DF5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBBoard.WarFoundry.Plugin.Rollcall", "..\IBBoard.WarFoundry.Plugin.Rollcall\IBBoard.WarFoundry.Plugin.Rollcall.csproj", "{182E4A7C-7CFB-4337-A9AD-AB2DCA054A53}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBBoard.Ini", "..\IBBoard.Ini\IBBoard.Ini.csproj", "{3BBDF326-7128-406C-85DF-EF049633E602}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBBoard.Ini.Tests", "..\IBBoard.Ini.Tests\IBBoard.Ini.Tests.csproj", "{47FA6D87-4A97-4019-880B-CD713B8D4C15}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBBoard.WarFoundry.API.Tests", "..\IBBoard.WarFoundry.API.Tests\IBBoard.WarFoundry.API.Tests.csproj", "{B20E808D-878E-4F6D-B1E3-84A9A49905CB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBBoard.Tests", "..\IBBoard.Tests\IBBoard.Tests.csproj", "{4160F7B6-4CFA-41FC-B5D7-5C9AE06FEBA7}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x86 = Debug|x86
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{06605A63-E433-42FE-93CF-0DA6630A7DF5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{06605A63-E433-42FE-93CF-0DA6630A7DF5}.Debug|x86.Build.0 = Debug|Any CPU
+		{06605A63-E433-42FE-93CF-0DA6630A7DF5}.Release|x86.ActiveCfg = Release|Any CPU
+		{06605A63-E433-42FE-93CF-0DA6630A7DF5}.Release|x86.Build.0 = Release|Any CPU
+		{182E4A7C-7CFB-4337-A9AD-AB2DCA054A53}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{182E4A7C-7CFB-4337-A9AD-AB2DCA054A53}.Debug|x86.Build.0 = Debug|Any CPU
+		{182E4A7C-7CFB-4337-A9AD-AB2DCA054A53}.Release|x86.ActiveCfg = Release|Any CPU
+		{182E4A7C-7CFB-4337-A9AD-AB2DCA054A53}.Release|x86.Build.0 = Release|Any CPU
+		{3BBDF326-7128-406C-85DF-EF049633E602}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3BBDF326-7128-406C-85DF-EF049633E602}.Debug|x86.Build.0 = Debug|Any CPU
+		{3BBDF326-7128-406C-85DF-EF049633E602}.Release|x86.ActiveCfg = Release|Any CPU
+		{3BBDF326-7128-406C-85DF-EF049633E602}.Release|x86.Build.0 = Release|Any CPU
+		{4160F7B6-4CFA-41FC-B5D7-5C9AE06FEBA7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4160F7B6-4CFA-41FC-B5D7-5C9AE06FEBA7}.Debug|x86.Build.0 = Debug|Any CPU
+		{4160F7B6-4CFA-41FC-B5D7-5C9AE06FEBA7}.Release|x86.ActiveCfg = Release|Any CPU
+		{4160F7B6-4CFA-41FC-B5D7-5C9AE06FEBA7}.Release|x86.Build.0 = Release|Any CPU
+		{47FA6D87-4A97-4019-880B-CD713B8D4C15}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{47FA6D87-4A97-4019-880B-CD713B8D4C15}.Debug|x86.Build.0 = Debug|Any CPU
+		{47FA6D87-4A97-4019-880B-CD713B8D4C15}.Release|x86.ActiveCfg = Release|Any CPU
+		{47FA6D87-4A97-4019-880B-CD713B8D4C15}.Release|x86.Build.0 = Release|Any CPU
+		{4B435E40-7FA2-41C5-96F6-5735396D2D5F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4B435E40-7FA2-41C5-96F6-5735396D2D5F}.Debug|x86.Build.0 = Debug|Any CPU
+		{4B435E40-7FA2-41C5-96F6-5735396D2D5F}.Release|x86.ActiveCfg = Release|Any CPU
+		{4B435E40-7FA2-41C5-96F6-5735396D2D5F}.Release|x86.Build.0 = Release|Any CPU
+		{5DFD64F6-FC2B-4B4F-B92E-483BAC468105}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5DFD64F6-FC2B-4B4F-B92E-483BAC468105}.Debug|x86.Build.0 = Debug|Any CPU
+		{5DFD64F6-FC2B-4B4F-B92E-483BAC468105}.Release|x86.ActiveCfg = Release|Any CPU
+		{5DFD64F6-FC2B-4B4F-B92E-483BAC468105}.Release|x86.Build.0 = Release|Any CPU
+		{951E6C7A-7FBA-4F68-9D9E-F48618BB9626}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{951E6C7A-7FBA-4F68-9D9E-F48618BB9626}.Debug|x86.Build.0 = Debug|Any CPU
+		{951E6C7A-7FBA-4F68-9D9E-F48618BB9626}.Release|x86.ActiveCfg = Release|Any CPU
+		{951E6C7A-7FBA-4F68-9D9E-F48618BB9626}.Release|x86.Build.0 = Release|Any CPU
+		{B20E808D-878E-4F6D-B1E3-84A9A49905CB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B20E808D-878E-4F6D-B1E3-84A9A49905CB}.Debug|x86.Build.0 = Debug|Any CPU
+		{B20E808D-878E-4F6D-B1E3-84A9A49905CB}.Release|x86.ActiveCfg = Release|Any CPU
+		{B20E808D-878E-4F6D-B1E3-84A9A49905CB}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = IBBoard.WarFoundry.GUI.GTK.csproj
+	EndGlobalSection
+EndGlobal
--- a/gtk-gui/IBBoard.WarFoundry.GTK.FrmMainWindow.cs	Sun Jan 31 20:46:06 2010 +0000
+++ b/gtk-gui/IBBoard.WarFoundry.GTK.FrmMainWindow.cs	Sat Aug 07 19:56:05 2010 +0000
@@ -1,240 +1,233 @@
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
+
+// This file has been generated by the GUI designer. Do not modify.
+namespace IBBoard.WarFoundry.GTK
+{
+	public partial class FrmMainWindow
+	{
+		private global::Gtk.UIManager UIManager;
+
+		private global::Gtk.Action menuFile;
+
+		private global::Gtk.Action miCreateArmy;
+
+		private global::Gtk.Action miOpenArmy;
+
+		private global::Gtk.Action miSaveArmy;
+
+		private global::Gtk.Action miSaveArmyAs;
+
+		private global::Gtk.Action miCloseArmy;
+
+		private global::Gtk.Action miReloadFiles;
+
+		private global::Gtk.Action miExit;
+
+		private global::Gtk.Action menuEdit;
+
+		private global::Gtk.Action miUndo;
+
+		private global::Gtk.Action miRedo;
+
+		private global::Gtk.Action menuHelp;
+
+		private global::Gtk.Action miAbout;
+
+		private global::Gtk.Action miDebugInformation;
+
+		private global::Gtk.Action newArmyButton;
+
+		private global::Gtk.Action openArmyButton;
+
+		private global::Gtk.Action saveArmyButton;
+
+		private global::Gtk.Action undoActionButton;
+
+		private global::Gtk.Action redoActionButton;
+
+		private global::Gtk.Action goDown;
+
+		private global::Gtk.Action @add;
+
+		private global::Gtk.Action miExportArmy;
+
+		private global::Gtk.Action miExportAsBasicHtml;
+
+		private global::Gtk.VBox vbox1;
+
+		private global::Gtk.MenuBar menubar1;
+
+		private global::Gtk.Toolbar toolbar;
+
+		private global::Gtk.HPaned hpaned2;
+
+		private global::Gtk.TreeView treeUnits;
+
+		private global::Gtk.Notebook unitsNotebook;
+
+		private global::Gtk.Statusbar statusbar1;
 
-namespace IBBoard.WarFoundry.GTK {
-    
-    
-    public partial class FrmMainWindow {
-        
-        private Gtk.UIManager UIManager;
-        
-        private Gtk.Action menuFile;
-        
-        private Gtk.Action miCreateArmy;
-        
-        private Gtk.Action miOpenArmy;
-        
-        private Gtk.Action miSaveArmy;
-        
-        private Gtk.Action miSaveArmyAs;
-        
-        private Gtk.Action miCloseArmy;
-        
-        private Gtk.Action miReloadFiles;
-        
-        private Gtk.Action miExit;
-        
-        private Gtk.Action menuEdit;
-        
-        private Gtk.Action miUndo;
-        
-        private Gtk.Action miRedo;
-        
-        private Gtk.Action menuHelp;
-        
-        private Gtk.Action miAbout;
-        
-        private Gtk.Action miDebugInformation;
-        
-        private Gtk.Action newArmyButton;
-        
-        private Gtk.Action openArmyButton;
-        
-        private Gtk.Action saveArmyButton;
-        
-        private Gtk.Action undoActionButton;
-        
-        private Gtk.Action redoActionButton;
-        
-        private Gtk.Action goDown;
-        
-        private Gtk.Action add;
-        
-        private Gtk.Action miExportArmy;
-        
-        private Gtk.Action miExportAsBasicHtml;
-        
-        private Gtk.VBox vbox1;
-        
-        private Gtk.MenuBar menubar1;
-        
-        private Gtk.Toolbar toolbar;
-        
-        private Gtk.HPaned hpaned2;
-        
-        private Gtk.TreeView treeUnits;
-        
-        private Gtk.Notebook unitsNotebook;
-        
-        private Gtk.Statusbar statusbar1;
-        
-        protected virtual void Build() {
-            Stetic.Gui.Initialize(this);
-            // Widget IBBoard.WarFoundry.GTK.FrmMainWindow
-            this.UIManager = new Gtk.UIManager();
-            Gtk.ActionGroup w1 = new Gtk.ActionGroup("Default");
-            this.menuFile = new Gtk.Action("menuFile", Mono.Unix.Catalog.GetString("File"), null, null);
-            this.menuFile.ShortLabel = Mono.Unix.Catalog.GetString("File");
-            w1.Add(this.menuFile, null);
-            this.miCreateArmy = new Gtk.Action("miCreateArmy", Mono.Unix.Catalog.GetString("Create army"), null, "gtk-new");
-            this.miCreateArmy.ShortLabel = Mono.Unix.Catalog.GetString("Create army");
-            w1.Add(this.miCreateArmy, null);
-            this.miOpenArmy = new Gtk.Action("miOpenArmy", Mono.Unix.Catalog.GetString("Open army"), null, "gtk-open");
-            this.miOpenArmy.ShortLabel = Mono.Unix.Catalog.GetString("Open army");
-            w1.Add(this.miOpenArmy, null);
-            this.miSaveArmy = new Gtk.Action("miSaveArmy", Mono.Unix.Catalog.GetString("Save army"), null, "gtk-save");
-            this.miSaveArmy.Sensitive = false;
-            this.miSaveArmy.ShortLabel = Mono.Unix.Catalog.GetString("Save army");
-            w1.Add(this.miSaveArmy, null);
-            this.miSaveArmyAs = new Gtk.Action("miSaveArmyAs", Mono.Unix.Catalog.GetString("Save army as"), null, "gtk-save-as");
-            this.miSaveArmyAs.Sensitive = false;
-            this.miSaveArmyAs.ShortLabel = Mono.Unix.Catalog.GetString("Save army as");
-            w1.Add(this.miSaveArmyAs, null);
-            this.miCloseArmy = new Gtk.Action("miCloseArmy", Mono.Unix.Catalog.GetString("Close army"), null, "gtk-close");
-            this.miCloseArmy.Sensitive = false;
-            this.miCloseArmy.ShortLabel = Mono.Unix.Catalog.GetString("Close army");
-            w1.Add(this.miCloseArmy, null);
-            this.miReloadFiles = new Gtk.Action("miReloadFiles", Mono.Unix.Catalog.GetString("Reload files"), null, "gtk-refresh");
-            this.miReloadFiles.Sensitive = false;
-            this.miReloadFiles.ShortLabel = Mono.Unix.Catalog.GetString("Reload files");
-            w1.Add(this.miReloadFiles, null);
-            this.miExit = new Gtk.Action("miExit", Mono.Unix.Catalog.GetString("Exit"), null, "gtk-quit");
-            this.miExit.ShortLabel = Mono.Unix.Catalog.GetString("Exit");
-            w1.Add(this.miExit, null);
-            this.menuEdit = new Gtk.Action("menuEdit", Mono.Unix.Catalog.GetString("Edit"), null, null);
-            this.menuEdit.ShortLabel = Mono.Unix.Catalog.GetString("Edit");
-            w1.Add(this.menuEdit, null);
-            this.miUndo = new Gtk.Action("miUndo", Mono.Unix.Catalog.GetString("Undo"), null, "gtk-undo");
-            this.miUndo.Sensitive = false;
-            this.miUndo.ShortLabel = Mono.Unix.Catalog.GetString("Undo");
-            w1.Add(this.miUndo, null);
-            this.miRedo = new Gtk.Action("miRedo", Mono.Unix.Catalog.GetString("Redo"), null, "gtk-redo");
-            this.miRedo.Sensitive = false;
-            this.miRedo.ShortLabel = Mono.Unix.Catalog.GetString("Redo");
-            w1.Add(this.miRedo, null);
-            this.menuHelp = new Gtk.Action("menuHelp", Mono.Unix.Catalog.GetString("Help"), null, null);
-            this.menuHelp.ShortLabel = Mono.Unix.Catalog.GetString("Help");
-            w1.Add(this.menuHelp, null);
-            this.miAbout = new Gtk.Action("miAbout", Mono.Unix.Catalog.GetString("About"), null, "gtk-about");
-            this.miAbout.ShortLabel = Mono.Unix.Catalog.GetString("About");
-            w1.Add(this.miAbout, null);
-            this.miDebugInformation = new Gtk.Action("miDebugInformation", Mono.Unix.Catalog.GetString("Debug Information"), null, null);
-            this.miDebugInformation.ShortLabel = Mono.Unix.Catalog.GetString("Debug Information");
-            w1.Add(this.miDebugInformation, null);
-            this.newArmyButton = new Gtk.Action("newArmyButton", null, null, "gtk-new");
-            w1.Add(this.newArmyButton, null);
-            this.openArmyButton = new Gtk.Action("openArmyButton", null, null, "gtk-open");
-            w1.Add(this.openArmyButton, null);
-            this.saveArmyButton = new Gtk.Action("saveArmyButton", null, null, "gtk-save");
-            this.saveArmyButton.Sensitive = false;
-            w1.Add(this.saveArmyButton, null);
-            this.undoActionButton = new Gtk.Action("undoActionButton", null, null, "gtk-undo");
-            this.undoActionButton.Sensitive = false;
-            w1.Add(this.undoActionButton, null);
-            this.redoActionButton = new Gtk.Action("redoActionButton", null, null, "gtk-redo");
-            this.redoActionButton.Sensitive = false;
-            w1.Add(this.redoActionButton, null);
-            this.goDown = new Gtk.Action("goDown", null, null, null);
-            w1.Add(this.goDown, null);
-            this.add = new Gtk.Action("add", null, null, "gtk-add");
-            w1.Add(this.add, null);
-            this.miExportArmy = new Gtk.Action("miExportArmy", Mono.Unix.Catalog.GetString("Export army as..."), null, "gtk-convert");
-            this.miExportArmy.Sensitive = false;
-            this.miExportArmy.ShortLabel = Mono.Unix.Catalog.GetString("Export army");
-            w1.Add(this.miExportArmy, null);
-            this.miExportAsBasicHtml = new Gtk.Action("miExportAsBasicHtml", Mono.Unix.Catalog.GetString("Basic HTML"), null, null);
-            this.miExportAsBasicHtml.ShortLabel = Mono.Unix.Catalog.GetString("Basic HTML");
-            w1.Add(this.miExportAsBasicHtml, null);
-            this.UIManager.InsertActionGroup(w1, 0);
-            this.AddAccelGroup(this.UIManager.AccelGroup);
-            this.Name = "IBBoard.WarFoundry.GTK.FrmMainWindow";
-            this.Title = Mono.Unix.Catalog.GetString("MainWindow");
-            this.Icon = Gdk.Pixbuf.LoadFromResource("App.ico");
-            // Container child IBBoard.WarFoundry.GTK.FrmMainWindow.Gtk.Container+ContainerChild
-            this.vbox1 = new 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='miCreateArmy' action='miCreateArmy'/><menuitem name='miOpenArmy' action='miOpenArmy'/><menuitem name='miSaveArmy' action='miSaveArmy'/><menuitem name='miSaveArmyAs' action='miSaveArmyAs'/><menu name='miExportArmy' action='miExportArmy'><menuitem name='miExportAsBasicHtml' action='miExportAsBasicHtml'/></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'/></menu><menu name='menuHelp' action='menuHelp'><menuitem name='miAbout' action='miAbout'/><menuitem name='miDebugInformation' action='miDebugInformation'/></menu></menubar></ui>");
-            this.menubar1 = ((Gtk.MenuBar)(this.UIManager.GetWidget("/menubar1")));
-            this.menubar1.Name = "menubar1";
-            this.vbox1.Add(this.menubar1);
-            Gtk.Box.BoxChild w2 = ((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='newArmyButton' action='newArmyButton'/><toolitem name='openArmyButton' action='openArmyButton'/><toolitem name='saveArmyButton' action='saveArmyButton'/><separator/><toolitem name='undoActionButton' action='undoActionButton'/><toolitem name='redoActionButton' action='redoActionButton'/><separator/></toolbar></ui>");
-            this.toolbar = ((Gtk.Toolbar)(this.UIManager.GetWidget("/toolbar")));
-            this.toolbar.HeightRequest = 36;
-            this.toolbar.Name = "toolbar";
-            this.toolbar.ShowArrow = false;
-            this.toolbar.ToolbarStyle = ((Gtk.ToolbarStyle)(0));
-            this.toolbar.IconSize = ((Gtk.IconSize)(3));
-            this.vbox1.Add(this.toolbar);
-            Gtk.Box.BoxChild w3 = ((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 Gtk.HPaned();
-            this.hpaned2.CanFocus = true;
-            this.hpaned2.Name = "hpaned2";
-            this.hpaned2.Position = 178;
-            // Container child hpaned2.Gtk.Paned+PanedChild
-            this.treeUnits = new Gtk.TreeView();
-            this.treeUnits.CanFocus = true;
-            this.treeUnits.Name = "treeUnits";
-            this.hpaned2.Add(this.treeUnits);
-            Gtk.Paned.PanedChild w4 = ((Gtk.Paned.PanedChild)(this.hpaned2[this.treeUnits]));
-            w4.Resize = false;
-            // Container child hpaned2.Gtk.Paned+PanedChild
-            this.unitsNotebook = new Gtk.Notebook();
-            this.unitsNotebook.CanFocus = true;
-            this.unitsNotebook.Name = "unitsNotebook";
-            this.unitsNotebook.CurrentPage = -1;
-            this.hpaned2.Add(this.unitsNotebook);
-            this.vbox1.Add(this.hpaned2);
-            Gtk.Box.BoxChild w6 = ((Gtk.Box.BoxChild)(this.vbox1[this.hpaned2]));
-            w6.Position = 2;
-            // Container child vbox1.Gtk.Box+BoxChild
-            this.statusbar1 = new Gtk.Statusbar();
-            this.statusbar1.Name = "statusbar1";
-            this.statusbar1.Spacing = 2;
-            this.vbox1.Add(this.statusbar1);
-            Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.vbox1[this.statusbar1]));
-            w7.Position = 3;
-            w7.Expand = false;
-            w7.Fill = false;
-            this.Add(this.vbox1);
-            if ((this.Child != null)) {
-                this.Child.ShowAll();
-            }
-            this.DefaultWidth = 832;
-            this.DefaultHeight = 659;
-            this.Show();
-            this.miCreateArmy.Activated += new System.EventHandler(this.OnCreateArmyActivated);
-            this.miOpenArmy.Activated += new System.EventHandler(this.OnOpenArmyActivated);
-            this.miSaveArmy.Activated += new System.EventHandler(this.OnSaveArmyActivated);
-            this.miSaveArmyAs.Activated += new System.EventHandler(this.OnSaveArmyAsActivated);
-            this.miCloseArmy.Activated += new System.EventHandler(this.OnCloseArmyActivated);
-            this.miReloadFiles.Activated += new System.EventHandler(this.OnReloadFilesActivated);
-            this.miExit.Activated += new System.EventHandler(this.OnExitActivated);
-            this.newArmyButton.Activated += new System.EventHandler(this.newTBButtonActivated);
-            this.openArmyButton.Activated += new System.EventHandler(this.openTBButtonActivated);
-            this.saveArmyButton.Activated += new System.EventHandler(this.saveTBButtonActivated);
-            this.undoActionButton.Activated += new System.EventHandler(this.undoTBButtonActivated);
-            this.redoActionButton.Activated += new System.EventHandler(this.redoTBButtonActivated);
-            this.miExportAsBasicHtml.Activated += new System.EventHandler(this.OnMiExportAsBasicHtmlActivated);
-            this.treeUnits.RowActivated += new Gtk.RowActivatedHandler(this.ArmyRowActivated);
-            this.treeUnits.PopupMenu += new Gtk.PopupMenuHandler(this.OnTreeUnitsPopupMenu);
-            this.treeUnits.ButtonPressEvent += new Gtk.ButtonPressEventHandler(this.UnitTreeButtonPressed);
-        }
-    }
+		protected virtual void Build()
+		{
+			global::Stetic.Gui.Initialize(this);
+			// Widget IBBoard.WarFoundry.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.miCreateArmy = new global::Gtk.Action("miCreateArmy", global::Mono.Unix.Catalog.GetString("Create army"), null, "gtk-new");
+			this.miCreateArmy.ShortLabel = global::Mono.Unix.Catalog.GetString("Create army");
+			w1.Add(this.miCreateArmy, 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.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.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.Sensitive = false;
+			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.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.newArmyButton = new global::Gtk.Action("newArmyButton", null, null, "gtk-new");
+			w1.Add(this.newArmyButton, null);
+			this.openArmyButton = new global::Gtk.Action("openArmyButton", null, null, "gtk-open");
+			w1.Add(this.openArmyButton, null);
+			this.saveArmyButton = new global::Gtk.Action("saveArmyButton", null, null, "gtk-save");
+			this.saveArmyButton.Sensitive = false;
+			w1.Add(this.saveArmyButton, null);
+			this.undoActionButton = new global::Gtk.Action("undoActionButton", null, null, "gtk-undo");
+			this.undoActionButton.Sensitive = false;
+			w1.Add(this.undoActionButton, null);
+			this.redoActionButton = new global::Gtk.Action("redoActionButton", null, null, "gtk-redo");
+			this.redoActionButton.Sensitive = false;
+			w1.Add(this.redoActionButton, 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.miExportArmy = new global::Gtk.Action("miExportArmy", global::Mono.Unix.Catalog.GetString("Export army as..."), null, "gtk-convert");
+			this.miExportArmy.Sensitive = false;
+			this.miExportArmy.ShortLabel = global::Mono.Unix.Catalog.GetString("Export army");
+			w1.Add(this.miExportArmy, null);
+			this.miExportAsBasicHtml = new global::Gtk.Action("miExportAsBasicHtml", global::Mono.Unix.Catalog.GetString("Basic HTML"), null, null);
+			this.miExportAsBasicHtml.ShortLabel = global::Mono.Unix.Catalog.GetString("Basic HTML");
+			w1.Add(this.miExportAsBasicHtml, null);
+			this.UIManager.InsertActionGroup(w1, 0);
+			this.AddAccelGroup(this.UIManager.AccelGroup);
+			this.Name = "IBBoard.WarFoundry.GTK.FrmMainWindow";
+			this.Title = global::Mono.Unix.Catalog.GetString("MainWindow");
+			this.Icon = global::Gdk.Pixbuf.LoadFromResource("App.ico");
+			// Container child IBBoard.WarFoundry.GTK.FrmMainWindow.Gtk.Container+ContainerChild
+			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='miCreateArmy' action='miCreateArmy'/><menuitem name='miOpenArmy' action='miOpenArmy'/><menuitem name='miSaveArmy' action='miSaveArmy'/><menuitem name='miSaveArmyAs' action='miSaveArmyAs'/><menu name='miExportArmy' action='miExportArmy'><menuitem name='miExportAsBasicHtml' action='miExportAsBasicHtml'/></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'/></menu><menu name='menuHelp' action='menuHelp'><menuitem name='miAbout' action='miAbout'/><menuitem name='miDebugInformation' action='miDebugInformation'/></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]));
+			w2.Position = 0;
+			w2.Expand = false;
+			w2.Fill = false;
+			// Container child vbox1.Gtk.Box+BoxChild
+			this.UIManager.AddUiFromString("<ui><toolbar name='toolbar'><toolitem name='newArmyButton' action='newArmyButton'/><toolitem name='openArmyButton' action='openArmyButton'/><toolitem name='saveArmyButton' action='saveArmyButton'/><separator/><toolitem name='undoActionButton' action='undoActionButton'/><toolitem name='redoActionButton' action='redoActionButton'/><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]));
+			w3.Position = 1;
+			w3.Expand = false;
+			w3.Fill = false;
+			// Container child vbox1.Gtk.Box+BoxChild
+			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.CanFocus = true;
+			this.treeUnits.Name = "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.CanFocus = true;
+			this.unitsNotebook.Name = "unitsNotebook";
+			this.unitsNotebook.CurrentPage = -1;
+			this.hpaned2.Add(this.unitsNotebook);
+			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.Name = "statusbar1";
+			this.statusbar1.Spacing = 2;
+			this.vbox1.Add(this.statusbar1);
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.statusbar1]));
+			w7.Position = 3;
+			w7.Expand = false;
+			w7.Fill = false;
+			this.Add(this.vbox1);
+			if ((this.Child != null))
+			{
+				this.Child.ShowAll();
+			}
+			this.DefaultWidth = 832;
+			this.DefaultHeight = 659;
+			this.Show();
+			this.miCreateArmy.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.newArmyButton.Activated += new global::System.EventHandler(this.newTBButtonActivated);
+			this.openArmyButton.Activated += new global::System.EventHandler(this.openTBButtonActivated);
+			this.saveArmyButton.Activated += new global::System.EventHandler(this.saveTBButtonActivated);
+			this.undoActionButton.Activated += new global::System.EventHandler(this.undoTBButtonActivated);
+			this.redoActionButton.Activated += new global::System.EventHandler(this.redoTBButtonActivated);
+			this.miExportAsBasicHtml.Activated += new global::System.EventHandler(this.OnMiExportAsBasicHtmlActivated);
+			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);
+		}
+	}
 }
--- a/gtk-gui/IBBoard.WarFoundry.GTK.FrmNewArmy.cs	Sun Jan 31 20:46:06 2010 +0000
+++ b/gtk-gui/IBBoard.WarFoundry.GTK.FrmNewArmy.cs	Sat Aug 07 19:56:05 2010 +0000
@@ -1,236 +1,229 @@
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
+
+// This file has been generated by the GUI designer. Do not modify.
+namespace IBBoard.WarFoundry.GTK
+{
+	public partial class FrmNewArmy
+	{
+		private global::Gtk.Table table1;
+
+		private global::Gtk.ScrolledWindow GtkScrolledWindow;
+
+		private global::Gtk.TreeView lstRaces;
+
+		private global::Gtk.HBox hbox2;
+
+		private global::Gtk.SpinButton sbPointsValue;
+
+		private global::Gtk.Label label1;
+
+		private global::Gtk.Label label2;
+
+		private global::Gtk.Label label3;
+
+		private global::Gtk.Label label4;
+
+		private global::Gtk.ComboBoxEntry systemCombo;
+
+		private global::Gtk.Entry txtArmyName;
+
+		private global::Gtk.Button bttnCancel;
+
+		private global::Gtk.Button bttnCreate;
 
-namespace IBBoard.WarFoundry.GTK {
-    
-    
-    public partial class FrmNewArmy {
-        
-        private Gtk.Table table1;
-        
-        private Gtk.ScrolledWindow GtkScrolledWindow;
-        
-        private Gtk.TreeView lstRaces;
-        
-        private Gtk.HBox hbox2;
-        
-        private Gtk.SpinButton sbPointsValue;
-        
-        private Gtk.Label label1;
-        
-        private Gtk.Label label2;
-        
-        private Gtk.Label label3;
-        
-        private Gtk.Label label4;
-        
-        private Gtk.ComboBoxEntry systemCombo;
-        
-        private Gtk.Entry txtArmyName;
-        
-        private Gtk.Button bttnCancel;
-        
-        private Gtk.Button bttnCreate;
-        
-        protected virtual void Build() {
-            Stetic.Gui.Initialize(this);
-            // Widget IBBoard.WarFoundry.GTK.FrmNewArmy
-            this.Events = ((Gdk.EventMask)(256));
-            this.Name = "IBBoard.WarFoundry.GTK.FrmNewArmy";
-            this.Title = Mono.Unix.Catalog.GetString("Create new army");
-            this.Icon = Stetic.IconLoader.LoadIcon(this, "gtk-new", Gtk.IconSize.Menu, 16);
-            this.WindowPosition = ((Gtk.WindowPosition)(4));
-            this.SkipPagerHint = true;
-            this.SkipTaskbarHint = true;
-            // Internal child IBBoard.WarFoundry.GTK.FrmNewArmy.VBox
-            Gtk.VBox w1 = this.VBox;
-            w1.CanFocus = true;
-            w1.Events = ((Gdk.EventMask)(256));
-            w1.Name = "dialog_VBox";
-            w1.BorderWidth = ((uint)(2));
-            // Container child dialog_VBox.Gtk.Box+BoxChild
-            this.table1 = new 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 Gtk.ScrolledWindow();
-            this.GtkScrolledWindow.Name = "GtkScrolledWindow";
-            this.GtkScrolledWindow.ShadowType = ((Gtk.ShadowType)(1));
-            // Container child GtkScrolledWindow.Gtk.Container+ContainerChild
-            this.lstRaces = new 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);
-            Gtk.Table.TableChild w3 = ((Gtk.Table.TableChild)(this.table1[this.GtkScrolledWindow]));
-            w3.TopAttach = ((uint)(1));
-            w3.BottomAttach = ((uint)(2));
-            w3.LeftAttach = ((uint)(1));
-            w3.RightAttach = ((uint)(2));
-            w3.XOptions = ((Gtk.AttachOptions)(4));
-            w3.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child table1.Gtk.Table+TableChild
-            this.hbox2 = new Gtk.HBox();
-            this.hbox2.Name = "hbox2";
-            // Container child hbox2.Gtk.Box+BoxChild
-            this.sbPointsValue = new Gtk.SpinButton(0, 2000000000, 100);
-            this.sbPointsValue.WidthRequest = 150;
-            this.sbPointsValue.CanFocus = true;
-            this.sbPointsValue.Name = "sbPointsValue";
-            this.sbPointsValue.Adjustment.PageIncrement = 1000;
-            this.sbPointsValue.ClimbRate = 100;
-            this.sbPointsValue.Numeric = true;
-            this.sbPointsValue.Value = 1000;
-            this.hbox2.Add(this.sbPointsValue);
-            Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.hbox2[this.sbPointsValue]));
-            w4.Position = 0;
-            w4.Expand = false;
-            w4.Fill = false;
-            this.table1.Add(this.hbox2);
-            Gtk.Table.TableChild w5 = ((Gtk.Table.TableChild)(this.table1[this.hbox2]));
-            w5.TopAttach = ((uint)(3));
-            w5.BottomAttach = ((uint)(4));
-            w5.LeftAttach = ((uint)(1));
-            w5.RightAttach = ((uint)(2));
-            w5.XOptions = ((Gtk.AttachOptions)(4));
-            w5.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child table1.Gtk.Table+TableChild
-            this.label1 = new Gtk.Label();
-            this.label1.Name = "label1";
-            this.label1.LabelProp = Mono.Unix.Catalog.GetString("Race");
-            this.table1.Add(this.label1);
-            Gtk.Table.TableChild w6 = ((Gtk.Table.TableChild)(this.table1[this.label1]));
-            w6.TopAttach = ((uint)(1));
-            w6.BottomAttach = ((uint)(2));
-            w6.XOptions = ((Gtk.AttachOptions)(4));
-            w6.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child table1.Gtk.Table+TableChild
-            this.label2 = new Gtk.Label();
-            this.label2.Name = "label2";
-            this.label2.LabelProp = Mono.Unix.Catalog.GetString("Army name");
-            this.table1.Add(this.label2);
-            Gtk.Table.TableChild w7 = ((Gtk.Table.TableChild)(this.table1[this.label2]));
-            w7.TopAttach = ((uint)(2));
-            w7.BottomAttach = ((uint)(3));
-            w7.XOptions = ((Gtk.AttachOptions)(4));
-            w7.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child table1.Gtk.Table+TableChild
-            this.label3 = new Gtk.Label();
-            this.label3.Name = "label3";
-            this.label3.LabelProp = Mono.Unix.Catalog.GetString("Points value");
-            this.table1.Add(this.label3);
-            Gtk.Table.TableChild w8 = ((Gtk.Table.TableChild)(this.table1[this.label3]));
-            w8.TopAttach = ((uint)(3));
-            w8.BottomAttach = ((uint)(4));
-            w8.XOptions = ((Gtk.AttachOptions)(4));
-            w8.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child table1.Gtk.Table+TableChild
-            this.label4 = new Gtk.Label();
-            this.label4.Name = "label4";
-            this.label4.LabelProp = Mono.Unix.Catalog.GetString("game system");
-            this.table1.Add(this.label4);
-            Gtk.Table.TableChild w9 = ((Gtk.Table.TableChild)(this.table1[this.label4]));
-            w9.XOptions = ((Gtk.AttachOptions)(4));
-            w9.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child table1.Gtk.Table+TableChild
-            this.systemCombo = Gtk.ComboBoxEntry.NewText();
-            this.systemCombo.Name = "systemCombo";
-            this.table1.Add(this.systemCombo);
-            Gtk.Table.TableChild w10 = ((Gtk.Table.TableChild)(this.table1[this.systemCombo]));
-            w10.LeftAttach = ((uint)(1));
-            w10.RightAttach = ((uint)(2));
-            w10.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child table1.Gtk.Table+TableChild
-            this.txtArmyName = new Gtk.Entry();
-            this.txtArmyName.CanFocus = true;
-            this.txtArmyName.Name = "txtArmyName";
-            this.txtArmyName.IsEditable = true;
-            this.txtArmyName.InvisibleChar = '•';
-            this.table1.Add(this.txtArmyName);
-            Gtk.Table.TableChild w11 = ((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 = ((Gtk.AttachOptions)(4));
-            w11.YOptions = ((Gtk.AttachOptions)(4));
-            w1.Add(this.table1);
-            Gtk.Box.BoxChild w12 = ((Gtk.Box.BoxChild)(w1[this.table1]));
-            w12.Position = 0;
-            w12.Expand = false;
-            w12.Fill = false;
-            w12.Padding = ((uint)(6));
-            // Internal child IBBoard.WarFoundry.GTK.FrmNewArmy.ActionArea
-            Gtk.HButtonBox w13 = this.ActionArea;
-            w13.CanFocus = true;
-            w13.Events = ((Gdk.EventMask)(256));
-            w13.Name = "WarFoundrySharp.FrmNewArmy_ActionArea";
-            w13.Spacing = 6;
-            w13.BorderWidth = ((uint)(5));
-            w13.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));
-            // Container child WarFoundrySharp.FrmNewArmy_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-            this.bttnCancel = new Gtk.Button();
-            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);
-            Gtk.ButtonBox.ButtonBoxChild w14 = ((Gtk.ButtonBox.ButtonBoxChild)(w13[this.bttnCancel]));
-            w14.Expand = false;
-            w14.Fill = false;
-            // Container child WarFoundrySharp.FrmNewArmy_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-            this.bttnCreate = new Gtk.Button();
-            this.bttnCreate.Sensitive = false;
-            this.bttnCreate.CanDefault = true;
-            this.bttnCreate.CanFocus = true;
-            this.bttnCreate.Name = "bttnCreate";
-            this.bttnCreate.UseUnderline = true;
-            // Container child bttnCreate.Gtk.Container+ContainerChild
-            Gtk.Alignment w15 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
-            // Container child GtkAlignment.Gtk.Container+ContainerChild
-            Gtk.HBox w16 = new Gtk.HBox();
-            w16.Spacing = 2;
-            // Container child GtkHBox.Gtk.Container+ContainerChild
-            Gtk.Image w17 = new Gtk.Image();
-            w17.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-ok", Gtk.IconSize.Menu, 16);
-            w16.Add(w17);
-            // Container child GtkHBox.Gtk.Container+ContainerChild
-            Gtk.Label w19 = new Gtk.Label();
-            w19.LabelProp = Mono.Unix.Catalog.GetString("C_reate");
-            w19.UseUnderline = true;
-            w16.Add(w19);
-            w15.Add(w16);
-            this.bttnCreate.Add(w15);
-            this.AddActionWidget(this.bttnCreate, -5);
-            Gtk.ButtonBox.ButtonBoxChild w23 = ((Gtk.ButtonBox.ButtonBoxChild)(w13[this.bttnCreate]));
-            w23.Position = 1;
-            w23.Expand = false;
-            w23.Fill = false;
-            if ((this.Child != null)) {
-                this.Child.ShowAll();
-            }
-            this.DefaultWidth = 370;
-            this.DefaultHeight = 348;
-            this.Show();
-            this.txtArmyName.Changed += new System.EventHandler(this.OnTextChanged);
-            this.systemCombo.Changed += new System.EventHandler(this.OnSystemComboChanged);
-            this.sbPointsValue.ChangeValue += new Gtk.ChangeValueHandler(this.OnSpinChangeValue);
-            this.sbPointsValue.ValueChanged += new System.EventHandler(this.OnSpinValueChanged);
-            this.sbPointsValue.Changed += new System.EventHandler(this.OnSpinValueChanged);
-            this.bttnCancel.Clicked += new System.EventHandler(this.OnCancelClicked);
-            this.bttnCreate.Clicked += new System.EventHandler(this.OnCreateClicked);
-        }
-    }
+		protected virtual void Build()
+		{
+			global::Stetic.Gui.Initialize(this);
+			// Widget IBBoard.WarFoundry.GTK.FrmNewArmy
+			this.Events = ((global::Gdk.EventMask)(256));
+			this.Name = "IBBoard.WarFoundry.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.WindowPosition = ((global::Gtk.WindowPosition)(4));
+			this.SkipPagerHint = true;
+			this.SkipTaskbarHint = true;
+			// Internal child IBBoard.WarFoundry.GTK.FrmNewArmy.VBox
+			global::Gtk.VBox w1 = this.VBox;
+			w1.CanFocus = true;
+			w1.Events = ((global::Gdk.EventMask)(256));
+			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.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.Name = "GtkScrolledWindow";
+			this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));
+			// Container child GtkScrolledWindow.Gtk.Container+ContainerChild
+			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]));
+			w3.TopAttach = ((uint)(1));
+			w3.BottomAttach = ((uint)(2));
+			w3.LeftAttach = ((uint)(1));
+			w3.RightAttach = ((uint)(2));
+			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.Name = "hbox2";
+			// Container child hbox2.Gtk.Box+BoxChild
+			this.sbPointsValue = new global::Gtk.SpinButton(0, 2000000000, 100);
+			this.sbPointsValue.WidthRequest = 150;
+			this.sbPointsValue.CanFocus = true;
+			this.sbPointsValue.Name = "sbPointsValue";
+			this.sbPointsValue.Adjustment.PageIncrement = 1000;
+			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]));
+			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]));
+			w5.TopAttach = ((uint)(3));
+			w5.BottomAttach = ((uint)(4));
+			w5.LeftAttach = ((uint)(1));
+			w5.RightAttach = ((uint)(2));
+			w5.XOptions = ((global::Gtk.AttachOptions)(4));
+			w5.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table1.Gtk.Table+TableChild
+			this.label1 = new global::Gtk.Label();
+			this.label1.Name = "label1";
+			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("Race");
+			this.table1.Add(this.label1);
+			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1[this.label1]));
+			w6.TopAttach = ((uint)(1));
+			w6.BottomAttach = ((uint)(2));
+			w6.XOptions = ((global::Gtk.AttachOptions)(4));
+			w6.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table1.Gtk.Table+TableChild
+			this.label2 = new global::Gtk.Label();
+			this.label2.Name = "label2";
+			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString("Army name");
+			this.table1.Add(this.label2);
+			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1[this.label2]));
+			w7.TopAttach = ((uint)(2));
+			w7.BottomAttach = ((uint)(3));
+			w7.XOptions = ((global::Gtk.AttachOptions)(4));
+			w7.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table1.Gtk.Table+TableChild
+			this.label3 = new global::Gtk.Label();
+			this.label3.Name = "label3";
+			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString("Points value");
+			this.table1.Add(this.label3);
+			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table1[this.label3]));
+			w8.TopAttach = ((uint)(3));
+			w8.BottomAttach = ((uint)(4));
+			w8.XOptions = ((global::Gtk.AttachOptions)(4));
+			w8.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table1.Gtk.Table+TableChild
+			this.label4 = new global::Gtk.Label();
+			this.label4.Name = "label4";
+			this.label4.LabelProp = global::Mono.Unix.Catalog.GetString("game system");
+			this.table1.Add(this.label4);
+			global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table1[this.label4]));
+			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.Name = "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.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]));
+			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]));
+			w12.Position = 0;
+			w12.Expand = false;
+			w12.Fill = false;
+			w12.Padding = ((uint)(6));
+			// Internal child IBBoard.WarFoundry.GTK.FrmNewArmy.ActionArea
+			global::Gtk.HButtonBox w13 = this.ActionArea;
+			w13.CanFocus = true;
+			w13.Events = ((global::Gdk.EventMask)(256));
+			w13.Name = "WarFoundrySharp.FrmNewArmy_ActionArea";
+			w13.Spacing = 6;
+			w13.BorderWidth = ((uint)(5));
+			w13.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
+			// Container child WarFoundrySharp.FrmNewArmy_ActionArea.Gtk.ButtonBox+ButtonBoxChild
+			this.bttnCancel = new global::Gtk.Button();
+			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]));
+			w14.Expand = false;
+			w14.Fill = false;
+			// Container child WarFoundrySharp.FrmNewArmy_ActionArea.Gtk.ButtonBox+ButtonBoxChild
+			this.bttnCreate = new global::Gtk.Button();
+			this.bttnCreate.Sensitive = false;
+			this.bttnCreate.CanDefault = true;
+			this.bttnCreate.CanFocus = true;
+			this.bttnCreate.Name = "bttnCreate";
+			this.bttnCreate.UseUnderline = true;
+			// Container child bttnCreate.Gtk.Container+ContainerChild
+			global::Gtk.Alignment w15 = new global::Gtk.Alignment(0.5f, 0.5f, 0f, 0f);
+			// Container child GtkAlignment.Gtk.Container+ContainerChild
+			global::Gtk.HBox w16 = new global::Gtk.HBox();
+			w16.Spacing = 2;
+			// Container child GtkHBox.Gtk.Container+ContainerChild
+			global::Gtk.Image w17 = new global::Gtk.Image();
+			w17.Pixbuf = global::Stetic.IconLoader.LoadIcon(this, "gtk-ok", global::Gtk.IconSize.Menu);
+			w16.Add(w17);
+			// Container child GtkHBox.Gtk.Container+ContainerChild
+			global::Gtk.Label w19 = new global::Gtk.Label();
+			w19.LabelProp = global::Mono.Unix.Catalog.GetString("C_reate");
+			w19.UseUnderline = true;
+			w16.Add(w19);
+			w15.Add(w16);
+			this.bttnCreate.Add(w15);
+			this.AddActionWidget(this.bttnCreate, -5);
+			global::Gtk.ButtonBox.ButtonBoxChild w23 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w13[this.bttnCreate]));
+			w23.Position = 1;
+			w23.Expand = false;
+			w23.Fill = false;
+			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);
+		}
+	}
 }
--- a/gtk-gui/IBBoard.WarFoundry.GTK.FrmNewUnit.cs	Sun Jan 31 20:46:06 2010 +0000
+++ b/gtk-gui/IBBoard.WarFoundry.GTK.FrmNewUnit.cs	Sat Aug 07 19:56:05 2010 +0000
@@ -1,140 +1,133 @@
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
+
+// This file has been generated by the GUI designer. Do not modify.
+namespace IBBoard.WarFoundry.GTK
+{
+	public partial class FrmNewUnit
+	{
+		private global::Gtk.VBox vbox2;
+
+		private global::Gtk.HBox hbox1;
+
+		private global::Gtk.Label label1;
+
+		private global::Gtk.ScrolledWindow GtkScrolledWindow;
+
+		private global::Gtk.TreeView lstUnitTypes;
+
+		private global::Gtk.Label lblNewUnitWarning;
+
+		private global::Gtk.Button buttonCancel;
+
+		private global::Gtk.Button buttonOk;
 
-namespace IBBoard.WarFoundry.GTK {
-    
-    
-    public partial class FrmNewUnit {
-        
-        private Gtk.VBox vbox2;
-        
-        private Gtk.HBox hbox1;
-        
-        private Gtk.Label label1;
-        
-        private Gtk.ScrolledWindow GtkScrolledWindow;
-        
-        private Gtk.TreeView lstUnitTypes;
-        
-        private Gtk.Label lblNewUnitWarning;
-        
-        private Gtk.Button buttonCancel;
-        
-        private Gtk.Button buttonOk;
-        
-        protected virtual void Build() {
-            Stetic.Gui.Initialize(this);
-            // Widget IBBoard.WarFoundry.GTK.FrmNewUnit
-            this.Name = "IBBoard.WarFoundry.GTK.FrmNewUnit";
-            this.Title = Mono.Unix.Catalog.GetString("Add new unit");
-            this.Icon = Stetic.IconLoader.LoadIcon(this, "gtk-new", Gtk.IconSize.Menu, 16);
-            this.WindowPosition = ((Gtk.WindowPosition)(4));
-            this.Modal = true;
-            this.SkipPagerHint = true;
-            this.SkipTaskbarHint = true;
-            // Internal child IBBoard.WarFoundry.GTK.FrmNewUnit.VBox
-            Gtk.VBox w1 = this.VBox;
-            w1.Name = "dialog1_VBox";
-            w1.BorderWidth = ((uint)(2));
-            // Container child dialog1_VBox.Gtk.Box+BoxChild
-            this.vbox2 = new Gtk.VBox();
-            this.vbox2.Name = "vbox2";
-            this.vbox2.Spacing = 6;
-            // Container child vbox2.Gtk.Box+BoxChild
-            this.hbox1 = new Gtk.HBox();
-            this.hbox1.Name = "hbox1";
-            this.hbox1.Spacing = 6;
-            // Container child hbox1.Gtk.Box+BoxChild
-            this.label1 = new Gtk.Label();
-            this.label1.Name = "label1";
-            this.label1.LabelProp = Mono.Unix.Catalog.GetString("Unit Type:");
-            this.hbox1.Add(this.label1);
-            Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.hbox1[this.label1]));
-            w2.Position = 0;
-            w2.Expand = false;
-            w2.Fill = false;
-            // Container child hbox1.Gtk.Box+BoxChild
-            this.GtkScrolledWindow = new Gtk.ScrolledWindow();
-            this.GtkScrolledWindow.Name = "GtkScrolledWindow";
-            this.GtkScrolledWindow.ShadowType = ((Gtk.ShadowType)(1));
-            // Container child GtkScrolledWindow.Gtk.Container+ContainerChild
-            this.lstUnitTypes = new Gtk.TreeView();
-            this.lstUnitTypes.HeightRequest = 150;
-            this.lstUnitTypes.CanFocus = true;
-            this.lstUnitTypes.Name = "lstUnitTypes";
-            this.lstUnitTypes.HeadersVisible = false;
-            this.GtkScrolledWindow.Add(this.lstUnitTypes);
-            this.hbox1.Add(this.GtkScrolledWindow);
-            Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.hbox1[this.GtkScrolledWindow]));
-            w4.Position = 1;
-            this.vbox2.Add(this.hbox1);
-            Gtk.Box.BoxChild w5 = ((Gtk.Box.BoxChild)(this.vbox2[this.hbox1]));
-            w5.Position = 0;
-            w5.Expand = false;
-            w5.Fill = false;
-            // Container child vbox2.Gtk.Box+BoxChild
-            this.lblNewUnitWarning = new Gtk.Label();
-            this.lblNewUnitWarning.Name = "lblNewUnitWarning";
-            this.lblNewUnitWarning.Xalign = 0F;
-            this.lblNewUnitWarning.Yalign = 0F;
-            this.vbox2.Add(this.lblNewUnitWarning);
-            Gtk.Box.BoxChild w6 = ((Gtk.Box.BoxChild)(this.vbox2[this.lblNewUnitWarning]));
-            w6.Position = 1;
-            w6.Expand = false;
-            w6.Fill = false;
-            w1.Add(this.vbox2);
-            Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(w1[this.vbox2]));
-            w7.Position = 0;
-            w7.Expand = false;
-            w7.Fill = false;
-            // Internal child IBBoard.WarFoundry.GTK.FrmNewUnit.ActionArea
-            Gtk.HButtonBox w8 = this.ActionArea;
-            w8.Name = "dialog1_ActionArea";
-            w8.Spacing = 6;
-            w8.BorderWidth = ((uint)(5));
-            w8.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));
-            // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-            this.buttonCancel = new Gtk.Button();
-            this.buttonCancel.CanDefault = true;
-            this.buttonCancel.CanFocus = true;
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.UseStock = true;
-            this.buttonCancel.UseUnderline = true;
-            this.buttonCancel.Label = "gtk-cancel";
-            this.AddActionWidget(this.buttonCancel, -6);
-            Gtk.ButtonBox.ButtonBoxChild w9 = ((Gtk.ButtonBox.ButtonBoxChild)(w8[this.buttonCancel]));
-            w9.Expand = false;
-            w9.Fill = false;
-            // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-            this.buttonOk = new Gtk.Button();
-            this.buttonOk.Sensitive = false;
-            this.buttonOk.CanDefault = true;
-            this.buttonOk.CanFocus = true;
-            this.buttonOk.Name = "buttonOk";
-            this.buttonOk.UseStock = true;
-            this.buttonOk.UseUnderline = true;
-            this.buttonOk.Label = "gtk-ok";
-            this.AddActionWidget(this.buttonOk, -5);
-            Gtk.ButtonBox.ButtonBoxChild w10 = ((Gtk.ButtonBox.ButtonBoxChild)(w8[this.buttonOk]));
-            w10.Position = 1;
-            w10.Expand = false;
-            w10.Fill = false;
-            if ((this.Child != null)) {
-                this.Child.ShowAll();
-            }
-            this.DefaultWidth = 400;
-            this.DefaultHeight = 318;
-            this.Show();
-            this.lstUnitTypes.RowActivated += new Gtk.RowActivatedHandler(this.OnRowActivated);
-            this.buttonCancel.Activated += new System.EventHandler(this.OnButtonCancelActivated);
-            this.buttonOk.Clicked += new System.EventHandler(this.OnButtonOkClicked);
-        }
-    }
+		protected virtual void Build()
+		{
+			global::Stetic.Gui.Initialize(this);
+			// Widget IBBoard.WarFoundry.GTK.FrmNewUnit
+			this.Name = "IBBoard.WarFoundry.GTK.FrmNewUnit";
+			this.Title = global::Mono.Unix.Catalog.GetString("Add new unit");
+			this.Icon = global::Stetic.IconLoader.LoadIcon(this, "gtk-new", global::Gtk.IconSize.Menu);
+			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
+			this.Modal = true;
+			this.SkipPagerHint = true;
+			this.SkipTaskbarHint = true;
+			// Internal child IBBoard.WarFoundry.GTK.FrmNewUnit.VBox
+			global::Gtk.VBox w1 = this.VBox;
+			w1.Name = "dialog1_VBox";
+			w1.BorderWidth = ((uint)(2));
+			// Container child dialog1_VBox.Gtk.Box+BoxChild
+			this.vbox2 = new global::Gtk.VBox();
+			this.vbox2.Name = "vbox2";
+			this.vbox2.Spacing = 6;
+			// Container child vbox2.Gtk.Box+BoxChild
+			this.hbox1 = new global::Gtk.HBox();
+			this.hbox1.Name = "hbox1";
+			this.hbox1.Spacing = 6;
+			// Container child hbox1.Gtk.Box+BoxChild
+			this.label1 = new global::Gtk.Label();
+			this.label1.Name = "label1";
+			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("Unit Type:");
+			this.hbox1.Add(this.label1);
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.label1]));
+			w2.Position = 0;
+			w2.Expand = false;
+			w2.Fill = false;
+			// Container child hbox1.Gtk.Box+BoxChild
+			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow();
+			this.GtkScrolledWindow.Name = "GtkScrolledWindow";
+			this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));
+			// Container child GtkScrolledWindow.Gtk.Container+ContainerChild
+			this.lstUnitTypes = new global::Gtk.TreeView();
+			this.lstUnitTypes.HeightRequest = 150;
+			this.lstUnitTypes.CanFocus = true;
+			this.lstUnitTypes.Name = "lstUnitTypes";
+			this.lstUnitTypes.HeadersVisible = false;
+			this.GtkScrolledWindow.Add(this.lstUnitTypes);
+			this.hbox1.Add(this.GtkScrolledWindow);
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.GtkScrolledWindow]));
+			w4.Position = 1;
+			this.vbox2.Add(this.hbox1);
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.hbox1]));
+			w5.Position = 0;
+			w5.Expand = false;
+			w5.Fill = false;
+			// Container child vbox2.Gtk.Box+BoxChild
+			this.lblNewUnitWarning = new global::Gtk.Label();
+			this.lblNewUnitWarning.Name = "lblNewUnitWarning";
+			this.lblNewUnitWarning.Xalign = 0f;
+			this.lblNewUnitWarning.Yalign = 0f;
+			this.vbox2.Add(this.lblNewUnitWarning);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.lblNewUnitWarning]));
+			w6.Position = 1;
+			w6.Expand = false;
+			w6.Fill = false;
+			w1.Add(this.vbox2);
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(w1[this.vbox2]));
+			w7.Position = 0;
+			w7.Expand = false;
+			w7.Fill = false;
+			// Internal child IBBoard.WarFoundry.GTK.FrmNewUnit.ActionArea
+			global::Gtk.HButtonBox w8 = this.ActionArea;
+			w8.Name = "dialog1_ActionArea";
+			w8.Spacing = 6;
+			w8.BorderWidth = ((uint)(5));
+			w8.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
+			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
+			this.buttonCancel = new global::Gtk.Button();
+			this.buttonCancel.CanDefault = true;
+			this.buttonCancel.CanFocus = true;
+			this.buttonCancel.Name = "buttonCancel";
+			this.buttonCancel.UseStock = true;
+			this.buttonCancel.UseUnderline = true;
+			this.buttonCancel.Label = "gtk-cancel";
+			this.AddActionWidget(this.buttonCancel, -6);
+			global::Gtk.ButtonBox.ButtonBoxChild w9 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w8[this.buttonCancel]));
+			w9.Expand = false;
+			w9.Fill = false;
+			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
+			this.buttonOk = new global::Gtk.Button();
+			this.buttonOk.Sensitive = false;
+			this.buttonOk.CanDefault = true;
+			this.buttonOk.CanFocus = true;
+			this.buttonOk.Name = "buttonOk";
+			this.buttonOk.UseStock = true;
+			this.buttonOk.UseUnderline = true;
+			this.buttonOk.Label = "gtk-ok";
+			this.AddActionWidget(this.buttonOk, -5);
+			global::Gtk.ButtonBox.ButtonBoxChild w10 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w8[this.buttonOk]));
+			w10.Position = 1;
+			w10.Expand = false;
+			w10.Fill = false;
+			if ((this.Child != null))
+			{
+				this.Child.ShowAll();
+			}
+			this.DefaultWidth = 400;
+			this.DefaultHeight = 318;
+			this.Show();
+			this.lstUnitTypes.RowActivated += new global::Gtk.RowActivatedHandler(this.OnRowActivated);
+			this.buttonCancel.Activated += new global::System.EventHandler(this.OnButtonCancelActivated);
+			this.buttonOk.Clicked += new global::System.EventHandler(this.OnButtonOkClicked);
+		}
+	}
 }
--- a/gtk-gui/IBBoard.WarFoundry.GTK.Widgets.UnitDisplayWidget.cs	Sun Jan 31 20:46:06 2010 +0000
+++ b/gtk-gui/IBBoard.WarFoundry.GTK.Widgets.UnitDisplayWidget.cs	Sat Aug 07 19:56:05 2010 +0000
@@ -1,273 +1,266 @@
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
+
+// This file has been generated by the GUI designer. Do not modify.
+namespace IBBoard.WarFoundry.GTK.Widgets
+{
+	public partial class UnitDisplayWidget
+	{
+		private global::Gtk.VBox vbox1;
+
+		private global::Gtk.HBox hbox1;
+
+		private global::Gtk.Entry unitName;
+
+		private global::Gtk.SpinButton unitSize;
+
+		private global::Gtk.ScrolledWindow GtkScrolledWindow;
+
+		private global::Gtk.NodeView unitStats;
+
+		private global::Gtk.HSeparator hseparator1;
+
+		private global::Gtk.Table table1;
+
+		private global::Gtk.ScrolledWindow GtkScrolledWindow1;
+
+		private global::Gtk.NodeView optionalEquipment;
+
+		private global::Gtk.ScrolledWindow GtkScrolledWindow2;
+
+		private global::Gtk.NodeView requiredEquipment;
+
+		private global::Gtk.Label optionalEquipmentLabel;
+
+		private global::Gtk.Label requiredEquipmentLabel;
+
+		private global::Gtk.VBox vbox2;
+
+		private global::Gtk.Button bttnReplaceRequired;
+
+		private global::Gtk.Button bttnEditRequired;
+
+		private global::Gtk.VBox vbox3;
+
+		private global::Gtk.Button bttnAddOptional;
+
+		private global::Gtk.Button bttnEditOptional;
+
+		private global::Gtk.Button bttnRemove;
+
+		private global::Gtk.HBox hbox2;
 
-namespace IBBoard.WarFoundry.GTK.Widgets {
-    
-    
-    public partial class UnitDisplayWidget {
-        
-        private Gtk.VBox vbox1;
-        
-        private Gtk.HBox hbox1;
-        
-        private Gtk.Entry unitName;
-        
-        private Gtk.SpinButton unitSize;
-        
-        private Gtk.ScrolledWindow GtkScrolledWindow;
-        
-        private Gtk.NodeView unitStats;
-        
-        private Gtk.HSeparator hseparator1;
-        
-        private Gtk.Table table1;
-        
-        private Gtk.ScrolledWindow GtkScrolledWindow1;
-        
-        private Gtk.NodeView optionalEquipment;
-        
-        private Gtk.ScrolledWindow GtkScrolledWindow2;
-        
-        private Gtk.NodeView requiredEquipment;
-        
-        private Gtk.Label optionalEquipmentLabel;
-        
-        private Gtk.Label requiredEquipmentLabel;
-        
-        private Gtk.VBox vbox2;
-        
-        private Gtk.Button bttnReplaceRequired;
-        
-        private Gtk.Button bttnEditRequired;
-        
-        private Gtk.VBox vbox3;
-        
-        private Gtk.Button bttnAddOptional;
-        
-        private Gtk.Button bttnEditOptional;
-        
-        private Gtk.Button bttnRemove;
-        
-        private Gtk.HBox hbox2;
-        
-        protected virtual void Build() {
-            Stetic.Gui.Initialize(this);
-            // Widget IBBoard.WarFoundry.GTK.Widgets.UnitDisplayWidget
-            Stetic.BinContainer.Attach(this);
-            this.Name = "IBBoard.WarFoundry.GTK.Widgets.UnitDisplayWidget";
-            // Container child IBBoard.WarFoundry.GTK.Widgets.UnitDisplayWidget.Gtk.Container+ContainerChild
-            this.vbox1 = new Gtk.VBox();
-            this.vbox1.Name = "vbox1";
-            this.vbox1.Spacing = 6;
-            // Container child vbox1.Gtk.Box+BoxChild
-            this.hbox1 = new Gtk.HBox();
-            this.hbox1.Name = "hbox1";
-            this.hbox1.Spacing = 6;
-            // Container child hbox1.Gtk.Box+BoxChild
-            this.unitName = new Gtk.Entry();
-            this.unitName.CanFocus = true;
-            this.unitName.Name = "unitName";
-            this.unitName.IsEditable = true;
-            this.unitName.InvisibleChar = '•';
-            this.hbox1.Add(this.unitName);
-            Gtk.Box.BoxChild w1 = ((Gtk.Box.BoxChild)(this.hbox1[this.unitName]));
-            w1.Position = 0;
-            // Container child hbox1.Gtk.Box+BoxChild
-            this.unitSize = new 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);
-            Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.hbox1[this.unitSize]));
-            w2.Position = 1;
-            w2.Expand = false;
-            w2.Fill = false;
-            this.vbox1.Add(this.hbox1);
-            Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.vbox1[this.hbox1]));
-            w3.Position = 0;
-            w3.Expand = false;
-            w3.Fill = false;
-            // Container child vbox1.Gtk.Box+BoxChild
-            this.GtkScrolledWindow = new Gtk.ScrolledWindow();
-            this.GtkScrolledWindow.Name = "GtkScrolledWindow";
-            this.GtkScrolledWindow.ShadowType = ((Gtk.ShadowType)(1));
-            // Container child GtkScrolledWindow.Gtk.Container+ContainerChild
-            this.unitStats = new Gtk.NodeView();
-            this.unitStats.HeightRequest = 75;
-            this.unitStats.CanFocus = true;
-            this.unitStats.Name = "unitStats";
-            this.GtkScrolledWindow.Add(this.unitStats);
-            this.vbox1.Add(this.GtkScrolledWindow);
-            Gtk.Box.BoxChild w5 = ((Gtk.Box.BoxChild)(this.vbox1[this.GtkScrolledWindow]));
-            w5.Position = 1;
-            // Container child vbox1.Gtk.Box+BoxChild
-            this.hseparator1 = new Gtk.HSeparator();
-            this.hseparator1.Name = "hseparator1";
-            this.vbox1.Add(this.hseparator1);
-            Gtk.Box.BoxChild w6 = ((Gtk.Box.BoxChild)(this.vbox1[this.hseparator1]));
-            w6.Position = 2;
-            w6.Expand = false;
-            w6.Fill = false;
-            // Container child vbox1.Gtk.Box+BoxChild
-            this.table1 = new Gtk.Table(((uint)(2)), ((uint)(3)), false);
-            this.table1.Name = "table1";
-            this.table1.RowSpacing = ((uint)(6));
-            this.table1.ColumnSpacing = ((uint)(6));
-            // Container child table1.Gtk.Table+TableChild
-            this.GtkScrolledWindow1 = new Gtk.ScrolledWindow();
-            this.GtkScrolledWindow1.Name = "GtkScrolledWindow1";
-            this.GtkScrolledWindow1.ShadowType = ((Gtk.ShadowType)(1));
-            // Container child GtkScrolledWindow1.Gtk.Container+ContainerChild
-            this.optionalEquipment = new Gtk.NodeView();
-            this.optionalEquipment.CanFocus = true;
-            this.optionalEquipment.Name = "optionalEquipment";
-            this.GtkScrolledWindow1.Add(this.optionalEquipment);
-            this.table1.Add(this.GtkScrolledWindow1);
-            Gtk.Table.TableChild w8 = ((Gtk.Table.TableChild)(this.table1[this.GtkScrolledWindow1]));
-            w8.TopAttach = ((uint)(1));
-            w8.BottomAttach = ((uint)(2));
-            w8.LeftAttach = ((uint)(1));
-            w8.RightAttach = ((uint)(2));
-            w8.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child table1.Gtk.Table+TableChild
-            this.GtkScrolledWindow2 = new Gtk.ScrolledWindow();
-            this.GtkScrolledWindow2.Name = "GtkScrolledWindow2";
-            this.GtkScrolledWindow2.ShadowType = ((Gtk.ShadowType)(1));
-            // Container child GtkScrolledWindow2.Gtk.Container+ContainerChild
-            this.requiredEquipment = new Gtk.NodeView();
-            this.requiredEquipment.CanFocus = true;
-            this.requiredEquipment.Name = "requiredEquipment";
-            this.GtkScrolledWindow2.Add(this.requiredEquipment);
-            this.table1.Add(this.GtkScrolledWindow2);
-            Gtk.Table.TableChild w10 = ((Gtk.Table.TableChild)(this.table1[this.GtkScrolledWindow2]));
-            w10.LeftAttach = ((uint)(1));
-            w10.RightAttach = ((uint)(2));
-            w10.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child table1.Gtk.Table+TableChild
-            this.optionalEquipmentLabel = new Gtk.Label();
-            this.optionalEquipmentLabel.Name = "optionalEquipmentLabel";
-            this.optionalEquipmentLabel.LabelProp = Mono.Unix.Catalog.GetString("Optional Equipment:");
-            this.table1.Add(this.optionalEquipmentLabel);
-            Gtk.Table.TableChild w11 = ((Gtk.Table.TableChild)(this.table1[this.optionalEquipmentLabel]));
-            w11.TopAttach = ((uint)(1));
-            w11.BottomAttach = ((uint)(2));
-            w11.XOptions = ((Gtk.AttachOptions)(4));
-            w11.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child table1.Gtk.Table+TableChild
-            this.requiredEquipmentLabel = new Gtk.Label();
-            this.requiredEquipmentLabel.Name = "requiredEquipmentLabel";
-            this.requiredEquipmentLabel.LabelProp = Mono.Unix.Catalog.GetString("Required Equipment:");
-            this.table1.Add(this.requiredEquipmentLabel);
-            Gtk.Table.TableChild w12 = ((Gtk.Table.TableChild)(this.table1[this.requiredEquipmentLabel]));
-            w12.XOptions = ((Gtk.AttachOptions)(4));
-            w12.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child table1.Gtk.Table+TableChild
-            this.vbox2 = new Gtk.VBox();
-            this.vbox2.Name = "vbox2";
-            this.vbox2.Spacing = 6;
-            // Container child vbox2.Gtk.Box+BoxChild
-            this.bttnReplaceRequired = new Gtk.Button();
-            this.bttnReplaceRequired.CanFocus = true;
-            this.bttnReplaceRequired.Name = "bttnReplaceRequired";
-            this.bttnReplaceRequired.UseUnderline = true;
-            this.bttnReplaceRequired.Label = Mono.Unix.Catalog.GetString("Replace");
-            this.vbox2.Add(this.bttnReplaceRequired);
-            Gtk.Box.BoxChild w13 = ((Gtk.Box.BoxChild)(this.vbox2[this.bttnReplaceRequired]));
-            w13.Position = 0;
-            w13.Expand = false;
-            w13.Fill = false;
-            // Container child vbox2.Gtk.Box+BoxChild
-            this.bttnEditRequired = new Gtk.Button();
-            this.bttnEditRequired.CanFocus = true;
-            this.bttnEditRequired.Name = "bttnEditRequired";
-            this.bttnEditRequired.UseUnderline = true;
-            this.bttnEditRequired.Label = Mono.Unix.Catalog.GetString("Edit");
-            this.vbox2.Add(this.bttnEditRequired);
-            Gtk.Box.BoxChild w14 = ((Gtk.Box.BoxChild)(this.vbox2[this.bttnEditRequired]));
-            w14.Position = 1;
-            w14.Expand = false;
-            w14.Fill = false;
-            this.table1.Add(this.vbox2);
-            Gtk.Table.TableChild w15 = ((Gtk.Table.TableChild)(this.table1[this.vbox2]));
-            w15.LeftAttach = ((uint)(2));
-            w15.RightAttach = ((uint)(3));
-            w15.XOptions = ((Gtk.AttachOptions)(4));
-            w15.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child table1.Gtk.Table+TableChild
-            this.vbox3 = new Gtk.VBox();
-            this.vbox3.Name = "vbox3";
-            this.vbox3.Spacing = 6;
-            // Container child vbox3.Gtk.Box+BoxChild
-            this.bttnAddOptional = new Gtk.Button();
-            this.bttnAddOptional.CanFocus = true;
-            this.bttnAddOptional.Name = "bttnAddOptional";
-            this.bttnAddOptional.UseUnderline = true;
-            this.bttnAddOptional.Label = Mono.Unix.Catalog.GetString("Add");
-            this.vbox3.Add(this.bttnAddOptional);
-            Gtk.Box.BoxChild w16 = ((Gtk.Box.BoxChild)(this.vbox3[this.bttnAddOptional]));
-            w16.Position = 0;
-            w16.Expand = false;
-            w16.Fill = false;
-            // Container child vbox3.Gtk.Box+BoxChild
-            this.bttnEditOptional = new Gtk.Button();
-            this.bttnEditOptional.CanFocus = true;
-            this.bttnEditOptional.Name = "bttnEditOptional";
-            this.bttnEditOptional.UseUnderline = true;
-            this.bttnEditOptional.Label = Mono.Unix.Catalog.GetString("Edit");
-            this.vbox3.Add(this.bttnEditOptional);
-            Gtk.Box.BoxChild w17 = ((Gtk.Box.BoxChild)(this.vbox3[this.bttnEditOptional]));
-            w17.Position = 1;
-            w17.Expand = false;
-            w17.Fill = false;
-            // Container child vbox3.Gtk.Box+BoxChild
-            this.bttnRemove = new Gtk.Button();
-            this.bttnRemove.CanFocus = true;
-            this.bttnRemove.Name = "bttnRemove";
-            this.bttnRemove.UseUnderline = true;
-            this.bttnRemove.Label = Mono.Unix.Catalog.GetString("Remove");
-            this.vbox3.Add(this.bttnRemove);
-            Gtk.Box.BoxChild w18 = ((Gtk.Box.BoxChild)(this.vbox3[this.bttnRemove]));
-            w18.Position = 2;
-            w18.Expand = false;
-            w18.Fill = false;
-            this.table1.Add(this.vbox3);
-            Gtk.Table.TableChild w19 = ((Gtk.Table.TableChild)(this.table1[this.vbox3]));
-            w19.TopAttach = ((uint)(1));
-            w19.BottomAttach = ((uint)(2));
-            w19.LeftAttach = ((uint)(2));
-            w19.RightAttach = ((uint)(3));
-            w19.XOptions = ((Gtk.AttachOptions)(4));
-            w19.YOptions = ((Gtk.AttachOptions)(4));
-            this.vbox1.Add(this.table1);
-            Gtk.Box.BoxChild w20 = ((Gtk.Box.BoxChild)(this.vbox1[this.table1]));
-            w20.Position = 3;
-            w20.Expand = false;
-            w20.Fill = false;
-            // Container child vbox1.Gtk.Box+BoxChild
-            this.hbox2 = new Gtk.HBox();
-            this.hbox2.Name = "hbox2";
-            this.hbox2.Spacing = 6;
-            this.vbox1.Add(this.hbox2);
-            Gtk.Box.BoxChild w21 = ((Gtk.Box.BoxChild)(this.vbox1[this.hbox2]));
-            w21.Position = 4;
-            this.Add(this.vbox1);
-            if ((this.Child != null)) {
-                this.Child.ShowAll();
-            }
-            this.Show();
-            this.unitName.FocusOutEvent += new Gtk.FocusOutEventHandler(this.OnUnitNameFocusOut);
-            this.unitName.KeyPressEvent += new Gtk.KeyPressEventHandler(this.OnUnitNameKeyPress);
-            this.unitSize.FocusOutEvent += new Gtk.FocusOutEventHandler(this.OnUnitSizeFocusOut);
-            this.unitSize.KeyPressEvent += new Gtk.KeyPressEventHandler(this.OnUnitSizeKeyPress);
-        }
-    }
+		protected virtual void Build()
+		{
+			global::Stetic.Gui.Initialize(this);
+			// Widget IBBoard.WarFoundry.GTK.Widgets.UnitDisplayWidget
+			global::Stetic.BinContainer.Attach(this);
+			this.Name = "IBBoard.WarFoundry.GTK.Widgets.UnitDisplayWidget";
+			// Container child IBBoard.WarFoundry.GTK.Widgets.UnitDisplayWidget.Gtk.Container+ContainerChild
+			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.Name = "hbox1";
+			this.hbox1.Spacing = 6;
+			// Container child hbox1.Gtk.Box+BoxChild
+			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]));
+			w1.Position = 0;
+			// Container child hbox1.Gtk.Box+BoxChild
+			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]));
+			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]));
+			w3.Position = 0;
+			w3.Expand = false;
+			w3.Fill = false;
+			// Container child vbox1.Gtk.Box+BoxChild
+			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow();
+			this.GtkScrolledWindow.Name = "GtkScrolledWindow";
+			this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));
+			// Container child GtkScrolledWindow.Gtk.Container+ContainerChild
+			this.unitStats = new global::Gtk.NodeView();
+			this.unitStats.HeightRequest = 75;
+			this.unitStats.CanFocus = true;
+			this.unitStats.Name = "unitStats";
+			this.GtkScrolledWindow.Add(this.unitStats);
+			this.vbox1.Add(this.GtkScrolledWindow);
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkScrolledWindow]));
+			w5.Position = 1;
+			// Container child vbox1.Gtk.Box+BoxChild
+			this.hseparator1 = new global::Gtk.HSeparator();
+			this.hseparator1.Name = "hseparator1";
+			this.vbox1.Add(this.hseparator1);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.hseparator1]));
+			w6.Position = 2;
+			w6.Expand = false;
+			w6.Fill = false;
+			// Container child vbox1.Gtk.Box+BoxChild
+			this.table1 = new global::Gtk.Table(((uint)(2)), ((uint)(3)), false);
+			this.table1.Name = "table1";
+			this.table1.RowSpacing = ((uint)(6));
+			this.table1.ColumnSpacing = ((uint)(6));
+			// Container child table1.Gtk.Table+TableChild
+			this.GtkScrolledWindow1 = new global::Gtk.ScrolledWindow();
+			this.GtkScrolledWindow1.Name = "GtkScrolledWindow1";
+			this.GtkScrolledWindow1.ShadowType = ((global::Gtk.ShadowType)(1));
+			// Container child GtkScrolledWindow1.Gtk.Container+ContainerChild
+			this.optionalEquipment = new global::Gtk.NodeView();
+			this.optionalEquipment.CanFocus = true;
+			this.optionalEquipment.Name = "optionalEquipment";
+			this.GtkScrolledWindow1.Add(this.optionalEquipment);
+			this.table1.Add(this.GtkScrolledWindow1);
+			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table1[this.GtkScrolledWindow1]));
+			w8.TopAttach = ((uint)(1));
+			w8.BottomAttach = ((uint)(2));
+			w8.LeftAttach = ((uint)(1));
+			w8.RightAttach = ((uint)(2));
+			w8.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table1.Gtk.Table+TableChild
+			this.GtkScrolledWindow2 = new global::Gtk.ScrolledWindow();
+			this.GtkScrolledWindow2.Name = "GtkScrolledWindow2";
+			this.GtkScrolledWindow2.ShadowType = ((global::Gtk.ShadowType)(1));
+			// Container child GtkScrolledWindow2.Gtk.Container+ContainerChild
+			this.requiredEquipment = new global::Gtk.NodeView();
+			this.requiredEquipment.CanFocus = true;
+			this.requiredEquipment.Name = "requiredEquipment";
+			this.GtkScrolledWindow2.Add(this.requiredEquipment);
+			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.optionalEquipmentLabel = new global::Gtk.Label();
+			this.optionalEquipmentLabel.Name = "optionalEquipmentLabel";
+			this.optionalEquipmentLabel.LabelProp = global::Mono.Unix.Catalog.GetString("Optional Equipment:");
+			this.table1.Add(this.optionalEquipmentLabel);
+			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1[this.optionalEquipmentLabel]));
+			w11.TopAttach = ((uint)(1));
+			w11.BottomAttach = ((uint)(2));
+			w11.XOptions = ((global::Gtk.AttachOptions)(4));
+			w11.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table1.Gtk.Table+TableChild
+			this.requiredEquipmentLabel = new global::Gtk.Label();
+			this.requiredEquipmentLabel.Name = "requiredEquipmentLabel";
+			this.requiredEquipmentLabel.LabelProp = global::Mono.Unix.Catalog.GetString("Required Equipment:");
+			this.table1.Add(this.requiredEquipmentLabel);
+			global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1[this.requiredEquipmentLabel]));
+			w12.XOptions = ((global::Gtk.AttachOptions)(4));
+			w12.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table1.Gtk.Table+TableChild
+			this.vbox2 = new global::Gtk.VBox();
+			this.vbox2.Name = "vbox2";
+			this.vbox2.Spacing = 6;
+			// Container child vbox2.Gtk.Box+BoxChild
+			this.bttnReplaceRequired = new global::Gtk.Button();
+			this.bttnReplaceRequired.CanFocus = true;
+			this.bttnReplaceRequired.Name = "bttnReplaceRequired";
+			this.bttnReplaceRequired.UseUnderline = true;
+			this.bttnReplaceRequired.Label = global::Mono.Unix.Catalog.GetString("Replace");
+			this.vbox2.Add(this.bttnReplaceRequired);
+			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.bttnReplaceRequired]));
+			w13.Position = 0;
+			w13.Expand = false;
+			w13.Fill = false;
+			// Container child vbox2.Gtk.Box+BoxChild
+			this.bttnEditRequired = new global::Gtk.Button();
+			this.bttnEditRequired.CanFocus = true;
+			this.bttnEditRequired.Name = "bttnEditRequired";
+			this.bttnEditRequired.UseUnderline = true;
+			this.bttnEditRequired.Label = global::Mono.Unix.Catalog.GetString("Edit");
+			this.vbox2.Add(this.bttnEditRequired);
+			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.bttnEditRequired]));
+			w14.Position = 1;
+			w14.Expand = false;
+			w14.Fill = false;
+			this.table1.Add(this.vbox2);
+			global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table1[this.vbox2]));
+			w15.LeftAttach = ((uint)(2));
+			w15.RightAttach = ((uint)(3));
+			w15.XOptions = ((global::Gtk.AttachOptions)(4));
+			w15.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table1.Gtk.Table+TableChild
+			this.vbox3 = new global::Gtk.VBox();
+			this.vbox3.Name = "vbox3";
+			this.vbox3.Spacing = 6;
+			// Container child vbox3.Gtk.Box+BoxChild
+			this.bttnAddOptional = new global::Gtk.Button();
+			this.bttnAddOptional.CanFocus = true;
+			this.bttnAddOptional.Name = "bttnAddOptional";
+			this.bttnAddOptional.UseUnderline = true;
+			this.bttnAddOptional.Label = global::Mono.Unix.Catalog.GetString("Add");
+			this.vbox3.Add(this.bttnAddOptional);
+			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.bttnAddOptional]));
+			w16.Position = 0;
+			w16.Expand = false;
+			w16.Fill = false;
+			// Container child vbox3.Gtk.Box+BoxChild
+			this.bttnEditOptional = new global::Gtk.Button();
+			this.bttnEditOptional.CanFocus = true;
+			this.bttnEditOptional.Name = "bttnEditOptional";
+			this.bttnEditOptional.UseUnderline = true;
+			this.bttnEditOptional.Label = global::Mono.Unix.Catalog.GetString("Edit");
+			this.vbox3.Add(this.bttnEditOptional);
+			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.bttnEditOptional]));
+			w17.Position = 1;
+			w17.Expand = false;
+			w17.Fill = false;
+			// Container child vbox3.Gtk.Box+BoxChild
+			this.bttnRemove = new global::Gtk.Button();
+			this.bttnRemove.CanFocus = true;
+			this.bttnRemove.Name = "bttnRemove";
+			this.bttnRemove.UseUnderline = true;
+			this.bttnRemove.Label = global::Mono.Unix.Catalog.GetString("Remove");
+			this.vbox3.Add(this.bttnRemove);
+			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.bttnRemove]));
+			w18.Position = 2;
+			w18.Expand = false;
+			w18.Fill = false;
+			this.table1.Add(this.vbox3);
+			global::Gtk.Table.TableChild w19 = ((global::Gtk.Table.TableChild)(this.table1[this.vbox3]));
+			w19.TopAttach = ((uint)(1));
+			w19.BottomAttach = ((uint)(2));
+			w19.LeftAttach = ((uint)(2));
+			w19.RightAttach = ((uint)(3));
+			w19.XOptions = ((global::Gtk.AttachOptions)(4));
+			w19.YOptions = ((global::Gtk.AttachOptions)(4));
+			this.vbox1.Add(this.table1);
+			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.table1]));
+			w20.Position = 3;
+			w20.Expand = false;
+			w20.Fill = false;
+			// Container child vbox1.Gtk.Box+BoxChild
+			this.hbox2 = new global::Gtk.HBox();
+			this.hbox2.Name = "hbox2";
+			this.hbox2.Spacing = 6;
+			this.vbox1.Add(this.hbox2);
+			global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.hbox2]));
+			w21.Position = 4;
+			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);
+		}
+	}
 }
--- a/gtk-gui/generated.cs	Sun Jan 31 20:46:06 2010 +0000
+++ b/gtk-gui/generated.cs	Sat Aug 07 19:56:05 2010 +0000
@@ -1,115 +1,132 @@
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
+
+// This file has been generated by the GUI designer. Do not modify.
+namespace Stetic
+{
+	internal class Gui
+	{
+		private static bool initialized;
+
+		static internal void Initialize(Gtk.Widget iconRenderer)
+		{
+			if ((Stetic.Gui.initialized == false))
+			{
+				Stetic.Gui.initialized = true;
+			}
+		}
+	}
+
+	internal class IconLoader
+	{
+		public static Gdk.Pixbuf LoadIcon(Gtk.Widget widget, string name, Gtk.IconSize size)
+		{
+			Gdk.Pixbuf res = widget.RenderIcon(name, size, null);
+			if ((res != null))
+			{
+				return res;
+			}
+
+			else
+			{
+				int sz;
+				int sy;
+				global::Gtk.Icon.SizeLookup(size, out sz, out sy);
+				try
+				{
+					return Gtk.IconTheme.Default.LoadIcon(name, sz, 0);
+				}
+				catch (System.Exception)
+				{
+					if ((name != "gtk-missing-image"))
+					{
+						return Stetic.IconLoader.LoadIcon(widget, "gtk-missing-image", size);
+					}
+
+					else
+					{
+						Gdk.Pixmap pmap = new Gdk.Pixmap(Gdk.Screen.Default.RootWindow, sz, sz);
+						Gdk.GC gc = new Gdk.GC(pmap);
+						gc.RgbFgColor = new Gdk.Color(255, 255, 255);
+						pmap.DrawRectangle(gc, true, 0, 0, sz, sz);
+						gc.RgbFgColor = new Gdk.Color(0, 0, 0);
+						pmap.DrawRectangle(gc, false, 0, 0, (sz - 1), (sz - 1));
+						gc.SetLineAttributes(3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
+						gc.RgbFgColor = new Gdk.Color(255, 0, 0);
+						pmap.DrawLine(gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4)));
+						pmap.DrawLine(gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)));
+						return Gdk.Pixbuf.FromDrawable(pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);
+					}
+				}
+			}
+		}
+	}
+
+	internal class BinContainer
+	{
+		private Gtk.Widget child;
 
-namespace Stetic {
-    
-    
-    internal class Gui {
-        
-        private static bool initialized;
-        
-        internal static void Initialize(Gtk.Widget iconRenderer) {
-            if ((Stetic.Gui.initialized == false)) {
-                Stetic.Gui.initialized = true;
-            }
-        }
-    }
-    
-    internal class IconLoader {
-        
-        public static Gdk.Pixbuf LoadIcon(Gtk.Widget widget, string name, Gtk.IconSize size, int sz) {
-            Gdk.Pixbuf res = widget.RenderIcon(name, size, null);
-            if ((res != null)) {
-                return res;
-            }
-            else {
-                try {
-                    return Gtk.IconTheme.Default.LoadIcon(name, sz, 0);
-                }
-                catch (System.Exception ) {
-                    if ((name != "gtk-missing-image")) {
-                        return Stetic.IconLoader.LoadIcon(widget, "gtk-missing-image", size, sz);
-                    }
-                    else {
-                        Gdk.Pixmap pmap = new Gdk.Pixmap(Gdk.Screen.Default.RootWindow, sz, sz);
-                        Gdk.GC gc = new Gdk.GC(pmap);
-                        gc.RgbFgColor = new Gdk.Color(255, 255, 255);
-                        pmap.DrawRectangle(gc, true, 0, 0, sz, sz);
-                        gc.RgbFgColor = new Gdk.Color(0, 0, 0);
-                        pmap.DrawRectangle(gc, false, 0, 0, (sz - 1), (sz - 1));
-                        gc.SetLineAttributes(3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
-                        gc.RgbFgColor = new Gdk.Color(255, 0, 0);
-                        pmap.DrawLine(gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4)));
-                        pmap.DrawLine(gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)));
-                        return Gdk.Pixbuf.FromDrawable(pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);
-                    }
-                }
-            }
-        }
-    }
-    
-    internal class BinContainer {
-        
-        private Gtk.Widget child;
-        
-        private Gtk.UIManager uimanager;
-        
-        public static BinContainer Attach(Gtk.Bin bin) {
-            BinContainer bc = new BinContainer();
-            bin.SizeRequested += new Gtk.SizeRequestedHandler(bc.OnSizeRequested);
-            bin.SizeAllocated += new Gtk.SizeAllocatedHandler(bc.OnSizeAllocated);
-            bin.Added += new Gtk.AddedHandler(bc.OnAdded);
-            return bc;
-        }
-        
-        private void OnSizeRequested(object sender, Gtk.SizeRequestedArgs args) {
-            if ((this.child != null)) {
-                args.Requisition = this.child.SizeRequest();
-            }
-        }
-        
-        private void OnSizeAllocated(object sender, Gtk.SizeAllocatedArgs args) {
-            if ((this.child != null)) {
-                this.child.Allocation = args.Allocation;
-            }
-        }
-        
-        private void OnAdded(object sender, Gtk.AddedArgs args) {
-            this.child = args.Widget;
-        }
-        
-        public void SetUiManager(Gtk.UIManager uim) {
-            this.uimanager = uim;
-            this.child.Realized += new System.EventHandler(this.OnRealized);
-        }
-        
-        private void OnRealized(object sender, System.EventArgs args) {
-            if ((this.uimanager != null)) {
-                Gtk.Widget w;
-                w = this.child.Toplevel;
-                if (((w != null) && typeof(Gtk.Window).IsInstanceOfType(w))) {
-                    ((Gtk.Window)(w)).AddAccelGroup(this.uimanager.AccelGroup);
-                    this.uimanager = null;
-                }
-            }
-        }
-    }
-    
-    internal class ActionGroups {
-        
-        public static Gtk.ActionGroup GetActionGroup(System.Type type) {
-            return Stetic.ActionGroups.GetActionGroup(type.FullName);
-        }
-        
-        public static Gtk.ActionGroup GetActionGroup(string name) {
-            return null;
-        }
-    }
+		private Gtk.UIManager uimanager;
+
+		public static BinContainer Attach(Gtk.Bin bin)
+		{
+			BinContainer bc = new BinContainer();
+			bin.SizeRequested += new Gtk.SizeRequestedHandler(bc.OnSizeRequested);
+			bin.SizeAllocated += new Gtk.SizeAllocatedHandler(bc.OnSizeAllocated);
+			bin.Added += new Gtk.AddedHandler(bc.OnAdded);
+			return bc;
+		}
+
+		private void OnSizeRequested(object sender, Gtk.SizeRequestedArgs args)
+		{
+			if ((this.child != null))
+			{
+				args.Requisition = this.child.SizeRequest();
+			}
+		}
+
+		private void OnSizeAllocated(object sender, Gtk.SizeAllocatedArgs args)
+		{
+			if ((this.child != null))
+			{
+				this.child.Allocation = args.Allocation;
+			}
+		}
+
+		private void OnAdded(object sender, Gtk.AddedArgs args)
+		{
+			this.child = args.Widget;
+		}
+
+		public void SetUiManager(Gtk.UIManager uim)
+		{
+			this.uimanager = uim;
+			this.child.Realized += new System.EventHandler(this.OnRealized);
+		}
+
+		private void OnRealized(object sender, System.EventArgs args)
+		{
+			if ((this.uimanager != null))
+			{
+				Gtk.Widget w;
+				w = this.child.Toplevel;
+				if (((w != null) && typeof(Gtk.Window).IsInstanceOfType(w)))
+				{
+					((Gtk.Window)(w)).AddAccelGroup(this.uimanager.AccelGroup);
+					this.uimanager = null;
+				}
+			}
+		}
+	}
+
+	internal class ActionGroups
+	{
+		public static Gtk.ActionGroup GetActionGroup(System.Type type)
+		{
+			return Stetic.ActionGroups.GetActionGroup(type.FullName);
+		}
+
+		public static Gtk.ActionGroup GetActionGroup(string name)
+		{
+			return null;
+		}
+	}
 }