Binary file App-lrg.png has changed

--- a/AssemblyInfo.cs	Sun Jan 31 20:46:06 2010 +0000
+++ b/AssemblyInfo.cs	Mon Jan 17 19:43:47 2011 +0000
@@ -16,7 +16,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("IBBoard.WarFoundry.GTK")]
-[assembly: AssemblyCopyright("IBBoard 2009")]
+[assembly: AssemblyCopyright("IBBoard 2009-2011")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -27,7 +27,7 @@
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
 
-[assembly: AssemblyVersion("1.0.0.*")]
+[assembly: AssemblyVersion("0.0.*")]
 
 // The following attributes specify the key for the sign of your assembly. See the
 // .NET Framework documentation for more information about signing.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/FrmAbout.cs	Mon Jan 17 19:43:47 2011 +0000
@@ -0,0 +1,57 @@
+//  This file (FrmAbout.cs) is a part of the IBBoard.WarFoundry.GUI.GTK project and is copyright 2010 IBBoard
+// 
+//  The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
+
+using System;
+using Gtk;
+using IBBoard.GtkSharp.Translatable;
+using IBBoard.Lang;
+
+namespace IBBoard.WarFoundry.GUI.GTK
+{
+	public partial class FrmAbout : TranslatableDialog
+	{
+		private static FrmAbout frm;
+
+		public static FrmAbout GetForm()
+		{
+			if (frm == null)
+			{
+				frm = new FrmAbout();
+			}
+			
+			return frm;
+		}
+
+		private FrmAbout()
+		{
+			this.Build();
+			Translation.TranslationChanged += Retranslate;
+			Translate();
+		}
+
+		private void Retranslate()
+		{
+			Translate();
+		}
+
+		public override void Dispose()
+		{
+			Translation.TranslationChanged -= Retranslate;
+			base.Dispose();
+		}
+
+		protected virtual void CloseClicked(object sender, System.EventArgs e)
+		{
+			Respond(ResponseType.Close);
+		}
+
+		protected virtual void BttnCreditsClicked(object sender, System.EventArgs e)
+		{
+			FrmAboutCredits credits = new FrmAboutCredits();
+			credits.Run();
+			credits.Hide();
+		}
+	}
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/FrmAboutCredits.cs	Mon Jan 17 19:43:47 2011 +0000
@@ -0,0 +1,31 @@
+//  This file (FrmAboutCredits.cs) is a part of the IBBoard.WarFoundry.GUI.GTK project and is copyright 2010 IBBoard
+// 
+//  The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
+
+using IBBoard.GtkSharp.Translatable;
+using IBBoard.Lang;
+
+namespace IBBoard.WarFoundry.GUI.GTK
+{
+	public partial class FrmAboutCredits : TranslatableDialog
+	{
+		public FrmAboutCredits()
+		{
+			this.Build();
+			Translation.TranslationChanged += Retranslate;
+			Translate();
+		}
+
+		private void Retranslate()
+		{
+			Translate();
+		}
+
+		public override void Dispose()
+		{
+			Translation.TranslationChanged -= Retranslate;
+			base.Dispose();
+		}
+	}
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/FrmAddEquipment.cs	Mon Jan 17 19:43:47 2011 +0000
@@ -0,0 +1,274 @@
+//  This file (FrmAddEquipment.cs) is a part of the IBBoard.WarFoundry.GUI.GTK project and is copyright 2010 IBBoard
+// 
+//  The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
+
+using System;
+using Gtk;
+using IBBoard.GtkSharp;
+using IBBoard.GtkSharp.Translatable;
+using IBBoard.WarFoundry.API.Objects;
+using IBBoard.WarFoundry.GUI.GTK.UIControl.Interfaces;
+using IBBoard.WarFoundry.GUI.GTK.Util;
+using log4net;
+using IBBoard.Lang;
+
+namespace IBBoard.WarFoundry.GUI.GTK
+{
+	public partial class FrmAddEquipment : TranslatableDialog, IAddEquipmentUI
+	{
+		private static ILog log = LogManager.GetLogger(typeof(FrmAddEquipment));
+
+		public event SingleArgMethodInvoker<UnitEquipmentItem> UnitEquipmentItemChoiceChanged;
+		public event MethodInvoker UnitEquipmentAmountTypeChanged;
+		public event MethodInvoker UnitEquipmentAmountChanged;
+
+		private bool isRatioLimited;
+
+		public FrmAddEquipment()
+		{
+			this.Build();
+			lstEquipment.Selection.Changed += OnSelectionChanged;
+			TreeViewColumn equipColumn = new TreeViewColumn();
+			CellRendererText equipCell = new CellRendererText();
+			equipColumn.PackStart(equipCell, true);
+			equipColumn.SetCellDataFunc(equipCell, GtkWarFoundryUtil.RenderWarFoundryObjectName);
+			lstEquipment.AppendColumn(equipColumn);
+			Translation.TranslationChanged += Retranslate;
+			Translate();
+		}
+
+		private void Retranslate()
+		{
+			Translate();
+		}
+
+		public override void Dispose()
+		{
+			Translation.TranslationChanged -= Retranslate;
+			base.Dispose();
+		}
+
+		protected override void Translate()
+		{
+			base.Translate();
+			lstEquipment.Columns[0].Title = Translation.GetTranslation("frmAddEquipmentColumnTitle", "equipment");
+		}
+
+		private void OnUnitEquipmentAmountChanged()
+		{
+			if (UnitEquipmentAmountChanged != null)
+			{
+				UnitEquipmentAmountChanged();
+			}
+		}
+
+		private void OnUnitEquipmentAmountTypeChanged()
+		{
+			if (UnitEquipmentAmountChanged != null)
+			{
+				UnitEquipmentAmountTypeChanged();
+			}
+		}
+
+		protected void OnSelectionChanged(object o, EventArgs e)
+		{
+			if (UnitEquipmentItemChoiceChanged != null)
+			{
+				UnitEquipmentItemChoiceChanged(SelectedUnitEquipmentItem);
+			}
+		}
+
+		public void SetUnitEquipmentItems(UnitEquipmentItem[] items)
+		{
+			ListStore store = new ListStore(typeof(UnitEquipmentItem));
+			
+			foreach (UnitEquipmentItem equipItem in items)
+			{
+				store.AppendValues(equipItem);
+			}
+			
+			lstEquipment.Model = store;
+		}
+
+		public void SetUnitEquipmentLimits(bool isRatioLimit, double minPercent, double maxPercent, int minNumber, int maxNumber)
+		{
+			log.DebugFormat("IsRatio? {0}. Limits: {1}->{2}, {3}%->{4}%", isRatioLimit, minNumber, maxNumber, minPercent, maxPercent);
+			numericAmount.SetRange(minNumber, maxNumber);
+			percentageAmount.SetRange(minPercent, maxPercent);
+			
+			if (isRatioLimit)
+			{
+				if (minPercent == 100)
+				{
+					rbEquipAll.Active = true;
+				}
+				else
+				{
+					rbEquipPercent.Active = true;
+				}
+			}
+			else
+			{
+				rbEquipNumeric.Active = true;
+			}
+			
+			isRatioLimited = isRatioLimit;
+		}
+
+		public void SetUnitEquipmentLimitsEnabled(bool isEnabled)
+		{
+			SetNumericAmountEnabledState(isEnabled);
+			SetPercentageAmountEnabledState(isEnabled);
+		}
+
+		public bool ShowControl()
+		{
+			int result = Run();
+			bool okayClicked = (result == (int)ResponseType.Ok);
+			this.Hide();
+			return okayClicked;
+		}
+
+		protected virtual void CancelButtonClicked(object sender, System.EventArgs e)
+		{
+			log.Debug("Cancel clicked");
+			Respond(ResponseType.Cancel);
+		}	
+
+		protected virtual void OkayButtonClicked(object sender, System.EventArgs e)
+		{
+			log.Debug("Okay clicked");
+			Respond(ResponseType.Ok);
+		}		
+
+		public void SetOkayEnabledState(bool enabled)
+		{
+			bttnOkay.Sensitive = enabled;
+		}
+
+		protected virtual void SpinButtonValueChanged(object sender, System.EventArgs e)
+		{
+			OnUnitEquipmentAmountChanged();
+		}		
+
+		protected virtual void RadioButtonClicked(object sender, System.EventArgs e)
+		{
+			OnUnitEquipmentAmountTypeChanged();
+		}
+
+		public void SetNumericAmountEnabledState(bool enabled)
+		{
+			double minPercent = GetMinPercentage();
+			rbEquipNumeric.Sensitive = enabled && !(isRatioLimited && minPercent == 100);
+			numericAmount.Sensitive = rbEquipNumeric.Sensitive;
+		}		
+
+		public void SetPercentageAmountEnabledState(bool enabled)
+		{
+			if (enabled)
+			{
+				double minPercentage = GetMinPercentage();
+				rbEquipPercent.Sensitive = isRatioLimited && minPercentage != 100;
+				percentageAmount.Sensitive = rbEquipPercent.Sensitive;
+				double maxPercentage = GetMaxPercentage();				
+				rbEquipAll.Sensitive = isRatioLimited && maxPercentage == 100;
+				lblEquipAll.Sensitive = rbEquipAll.Sensitive;
+			}
+			else
+			{
+				rbEquipPercent.Sensitive = false;
+				percentageAmount.Sensitive = false;
+				rbEquipAll.Sensitive = false;
+				lblEquipAll.Sensitive = false;
+			}
+		}
+
+		private double GetMaxPercentage()
+		{
+			double min, max;
+			percentageAmount.GetRange(out min, out max);
+			return max;
+		}
+
+		private double GetMinPercentage()
+		{
+			double min, max;
+			percentageAmount.GetRange(out min, out max);
+			return min;
+		}
+
+		public void ListenToWidgets()
+		{
+			rbEquipAll.Clicked += RadioButtonClicked;
+			rbEquipNumeric.Clicked += RadioButtonClicked;
+			rbEquipPercent.Clicked += RadioButtonClicked;
+			numericAmount.ValueChanged += SpinButtonValueChanged;
+			percentageAmount.ValueChanged += SpinButtonValueChanged;
+			lstEquipment.Selection.Changed += OnSelectionChanged;
+		}
+
+		public void IgnoreWidgets()
+		{
+			rbEquipAll.Clicked -= RadioButtonClicked;
+			rbEquipNumeric.Clicked -= RadioButtonClicked;
+			rbEquipPercent.Clicked -= RadioButtonClicked;
+			numericAmount.ValueChanged -= SpinButtonValueChanged;
+			percentageAmount.ValueChanged -= SpinButtonValueChanged;
+			lstEquipment.Selection.Changed -= OnSelectionChanged;
+		}
+
+		public UnitEquipmentItem SelectedUnitEquipmentItem
+		{
+			get
+			{
+				return (UnitEquipmentItem)TreeUtils.GetSelectedItem(lstEquipment);
+			}
+		}
+
+		public bool IsRatioEquipmentAmount
+		{
+			get
+			{
+				return !rbEquipNumeric.Active;
+			}
+		}
+
+		public int EquipmentNumericAmount
+		{
+			get
+			{
+				return (int)numericAmount.Value;
+			}
+			
+			set
+			{
+				numericAmount.Value = value;
+			}
+		}
+
+		public double EquipmentPercentageAmount
+		{
+			get
+			{
+				double percent;
+				
+				if (rbEquipAll.Active)
+				{
+					percent = 100;
+				}
+				else
+				{
+					percent = percentageAmount.Value;
+				}
+				
+				return percent;
+			}
+			
+			set
+			{
+				percentageAmount.Value = value;
+			}
+		}
+	}
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/FrmEditEquipment.cs	Mon Jan 17 19:43:47 2011 +0000
@@ -0,0 +1,236 @@
+//  This file (FrmEditEquipment.cs) is a part of the IBBoard.WarFoundry.GUI.GTK project and is copyright 2010 IBBoard
+// 
+//  The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
+
+using System;
+using IBBoard.WarFoundry.GUI.GTK.UIControl.Interfaces;
+using IBBoard.WarFoundry.API.Objects;
+using Gtk;
+using IBBoard.WarFoundry.GUI.GTK.Util;
+using IBBoard.GtkSharp;
+using log4net.Repository.Hierarchy;
+using log4net;
+using IBBoard.GtkSharp.Translatable;
+using IBBoard.Lang;
+
+namespace IBBoard.WarFoundry.GUI.GTK
+{
+	public partial class FrmEditEquipment : TranslatableDialog, IEditEquipmentUI
+	{
+		private static ILog log = LogManager.GetLogger(typeof(FrmAddEquipment));
+
+		public event SingleArgMethodInvoker<UnitEquipmentItem> UnitEquipmentItemChoiceChanged;
+		public event MethodInvoker UnitEquipmentAmountTypeChanged;
+		public event MethodInvoker UnitEquipmentAmountChanged;
+
+		private bool isRatioLimited;
+
+		public FrmEditEquipment()
+		{
+			this.Build();
+			Translation.TranslationChanged += Retranslate;
+			Translate();
+		}
+
+		private void Retranslate()
+		{
+			Translate();
+		}
+
+		public override void Dispose()
+		{
+			Translation.TranslationChanged -= Retranslate;
+			base.Dispose();
+		}
+
+		public void ListenToWidgets()
+		{
+			rbEquipAll.Clicked += RadioButtonClicked;
+			rbEquipNumeric.Clicked += RadioButtonClicked;
+			rbEquipPercent.Clicked += RadioButtonClicked;
+			numericAmount.ValueChanged += SpinButtonValueChanged;
+			percentageAmount.ValueChanged += SpinButtonValueChanged;
+		}
+
+		public void IgnoreWidgets()
+		{
+			rbEquipAll.Clicked -= RadioButtonClicked;
+			rbEquipNumeric.Clicked -= RadioButtonClicked;
+			rbEquipPercent.Clicked -= RadioButtonClicked;
+			numericAmount.ValueChanged -= SpinButtonValueChanged;
+			percentageAmount.ValueChanged -= SpinButtonValueChanged;
+		}
+
+		private void OnUnitEquipmentAmountChanged()
+		{
+			if (UnitEquipmentAmountChanged != null)
+			{
+				UnitEquipmentAmountChanged();
+			}
+		}
+
+		private void OnUnitEquipmentAmountTypeChanged()
+		{
+			if (UnitEquipmentAmountChanged != null)
+			{
+				UnitEquipmentAmountTypeChanged();
+			}
+		}
+
+		public void SetUnitEquipmentLimits(bool isRatioLimit, double minPercent, double maxPercent, int minNumber, int maxNumber)
+		{
+			log.DebugFormat("IsRatio? {0}. Limits: {1}->{2}, {3}%->{4}%", isRatioLimit, minNumber, maxNumber, minPercent, maxPercent);
+			numericAmount.SetRange(minNumber, maxNumber);
+			percentageAmount.SetRange(minPercent, maxPercent);			
+			SetEquipmentAmountType(isRatioLimit);
+			isRatioLimited = isRatioLimit;
+		}
+
+		public void SetEquipmentAmountType(bool isRatioAmount)
+		{
+			if (isRatioAmount)
+			{
+				if (percentageAmount.Value == 100)
+				{
+					rbEquipAll.Active = true;
+				}
+				else
+				{
+					rbEquipPercent.Active = true;
+				}
+			}
+			else
+			{
+				rbEquipNumeric.Active = true;
+			}
+		}
+
+		public void SetUnitEquipmentLimitsEnabled(bool isEnabled)
+		{
+			SetNumericAmountEnabledState(isEnabled);
+			SetPercentageAmountEnabledState(isEnabled);
+		}
+
+		public bool ShowControl()
+		{
+			int result = Run();
+			bool okayClicked = (result == (int)ResponseType.Ok);
+			this.Hide();
+			return okayClicked;
+		}
+
+		protected virtual void CancelButtonClicked(object sender, System.EventArgs e)
+		{
+			log.Debug("Cancel clicked");
+			Respond(ResponseType.Cancel);
+		}	
+
+		protected virtual void OkayButtonClicked(object sender, System.EventArgs e)
+		{
+			log.Debug("Okay clicked");
+			Respond(ResponseType.Ok);
+		}		
+
+		public void SetOkayEnabledState(bool enabled)
+		{
+			bttnOkay.Sensitive = enabled;
+		}
+
+		protected virtual void SpinButtonValueChanged(object sender, System.EventArgs e)
+		{
+			OnUnitEquipmentAmountChanged();
+		}		
+
+		protected virtual void RadioButtonClicked(object sender, System.EventArgs e)
+		{
+			OnUnitEquipmentAmountTypeChanged();
+		}
+
+		public void SetNumericAmountEnabledState(bool enabled)
+		{
+			double minPercent = GetMinPercentage();
+			rbEquipNumeric.Sensitive = enabled && !(isRatioLimited && minPercent == 100);
+			numericAmount.Sensitive = rbEquipNumeric.Sensitive;
+		}		
+
+		public void SetPercentageAmountEnabledState(bool enabled)
+		{
+			if (enabled)
+			{
+				double minPercentage = GetMinPercentage();
+				rbEquipPercent.Sensitive = isRatioLimited && minPercentage != 100;
+				percentageAmount.Sensitive = rbEquipPercent.Sensitive;
+				double maxPercentage = GetMaxPercentage();				
+				rbEquipAll.Sensitive = isRatioLimited && maxPercentage == 100;
+				lblEquipAll.Sensitive = rbEquipAll.Sensitive;
+			}
+			else
+			{
+				rbEquipPercent.Sensitive = false;
+				percentageAmount.Sensitive = false;
+				rbEquipAll.Sensitive = false;
+				lblEquipAll.Sensitive = false;
+			}
+		}
+
+		private double GetMaxPercentage()
+		{
+			double min, max;
+			percentageAmount.GetRange(out min, out max);
+			return max;
+		}
+
+		private double GetMinPercentage()
+		{
+			double min, max;
+			percentageAmount.GetRange(out min, out max);
+			return min;
+		}		
+
+		public bool IsRatioEquipmentAmount
+		{
+			get
+			{
+				return !rbEquipNumeric.Active;
+			}
+		}
+
+		public int EquipmentNumericAmount
+		{
+			get
+			{
+				return (int)numericAmount.Value;
+			}
+			
+			set
+			{
+				numericAmount.Value = value;
+			}
+		}
+
+		public double EquipmentPercentageAmount
+		{
+			get
+			{
+				double percent;
+				
+				if (rbEquipAll.Active)
+				{
+					percent = 100;
+				}
+				else
+				{
+					percent = percentageAmount.Value;
+				}
+				
+				return percent;
+			}
+			
+			set
+			{
+				percentageAmount.Value = value;
+			}
+		}
+	}
+}
+

--- a/FrmMainWindow.cs	Sun Jan 31 20:46:06 2010 +0000
+++ b/FrmMainWindow.cs	Mon Jan 17 19:43:47 2011 +0000
@@ -3,69 +3,95 @@
 // The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
 
 using System;
-using System.IO;
 using System.Collections.Generic;
 using System.Configuration;
+using System.IO;
+using GLib;
 using Gtk;
 using IBBoard;
 using IBBoard.Commands;
+using IBBoard.CustomMath;
 using IBBoard.GtkSharp;
+using IBBoard.GtkSharp.Translatable;
 using IBBoard.IO;
 using IBBoard.Lang;
 using IBBoard.Logging;
-using IBBoard.CustomMath;
 using IBBoard.WarFoundry.API;
+using IBBoard.WarFoundry.API.Commands;
 using IBBoard.WarFoundry.API.Exporters;
 using IBBoard.WarFoundry.API.Factories;
 using IBBoard.WarFoundry.API.Factories.Xml;
 using IBBoard.WarFoundry.API.Objects;
-using IBBoard.WarFoundry.API.Commands;
+using IBBoard.WarFoundry.API.Requirements;
 using IBBoard.WarFoundry.API.Savers;
-using IBBoard.WarFoundry.API.Requirements;
-using IBBoard.WarFoundry.GTK.Widgets;
+using IBBoard.WarFoundry.GUI.GTK.Widgets;
 using IBBoard.WarFoundry.Plugin.Rollcall;
 using IBBoard.Xml;
 using log4net;
+using WFObjects = IBBoard.WarFoundry.API.Objects;
+using System.Collections;
 
-namespace IBBoard.WarFoundry.GTK
+namespace IBBoard.WarFoundry.GUI.GTK
 {
-	public partial class FrmMainWindow: Gtk.Window
+	public partial class FrmMainWindow: TranslatableWindowWithActions
 	{
 		private static readonly string AppTitle = "WarFoundry";
 		private const int CATEGORY_BUTTON_SEPARATOR_INDEX = 6;
-
 		private Preferences preferences;
 		private ILog logger = LogManager.GetLogger(typeof(FrmMainWindow));
-
 		private CommandStack commandStack;
-		private Dictionary<ToolButton, Category> categoryMap = new Dictionary<ToolButton, Category>();
-		private Dictionary<IBBoard.WarFoundry.API.Objects.Unit, UnitDisplayWidget> unitToWidgetMap = new Dictionary<IBBoard.WarFoundry.API.Objects.Unit,UnitDisplayWidget>();
-
+		private Dictionary<WFObjects.Unit, UnitDisplayWidget> unitToWidgetMap = new Dictionary<WFObjects.Unit,UnitDisplayWidget>();
 		private ObjectAddDelegate UnitAddedMethod;
 		private ObjectRemoveDelegate UnitRemovedMethod;
 		private DoubleValChangedDelegate PointsValueChangedMethod;
 		private FailedUnitRequirementDelegate FailedUnitRequirementMethod;
 		private StringValChangedDelegate UnitNameChangedMethod;
-
 		private GameSystem system;
 		private string loadedArmyPath;
-
 		private MenuToolButton undoMenuButton, redoMenuButton;
 
-		public static void Main (string[] args)
+		public static void Main(string[] args)
 		{
 			try
 			{
+				ExceptionManager.UnhandledException += HandleUnhandledException;
 				Application.Init();
 				FrmMainWindow win = new FrmMainWindow(args);
 				win.Show();
 				Application.Run();
 				LogManager.GetLogger(typeof(FrmMainWindow)).Debug("Application ended");
 			}
-			catch(Exception ex)
+			catch (Exception ex)
+			{
+				HandleUnhandledException(ex);
+			}
+		}
+
+		private static void HandleUnhandledException(UnhandledExceptionArgs args)
+		{
+			object obj = args.ExceptionObject;
+			Exception ex = null;
+			
+			if (obj is Exception)
 			{
-				LogManager.GetLogger(typeof(FrmMainWindow)).Fatal("("+ex.GetType().Name+") "+ex.Message + Environment.NewLine + ex.StackTrace);
+				ex = (Exception)obj;
+			}
+			else
+			{
+				ex = new Exception("GLib returned unexpected exception object type " + obj.GetType());
 			}
+			
+			HandleUnhandledException(ex);
+		}
+
+		private static void HandleUnhandledException(Exception ex)
+		{
+			string msg = String.Format("({0}) {1}", ex.GetType().FullName, ex.Message);
+			LogManager.GetLogger(typeof(FrmMainWindow)).Fatal(msg, ex);
+			MessageDialog dialog = new MessageDialog(null, DialogFlags.Modal, MessageType.Error, ButtonsType.Ok, false, "An unhandled exception occurred. Please check the log for more details.");
+			dialog.Run();
+			dialog.Hide();
+			dialog.Dispose();
 		}
 
 		public FrmMainWindow() : this(new string[0])
@@ -73,35 +99,33 @@
 			//Do nothing extra
 		}
 
-		public FrmMainWindow (string[] args): base (Gtk.WindowType.Toplevel)
+		public FrmMainWindow(string[] args) : base(Gtk.WindowType.Toplevel)
 		{
 			logger.Info("Opening FrmMainWindow");
-			Build ();
+			Build();
 			//Replace the undo/redo buttons with menu versions, which Monodevelop's GUI editor doesn't currently support
 			redoMenuButton = new MenuToolButton("gtk-redo");
-			redoMenuButton.Label = "Redo";
-			redoMenuButton.TooltipText = "Redo";
-			redoMenuButton.Clicked+= redoTBButtonActivated;
+			redoMenuButton.Name = "bttnRedo";
+			redoMenuButton.Clicked += redoTBButtonActivated;
+			redoMenuButton.Sensitive = false;
 			toolbar.Insert(redoMenuButton, CATEGORY_BUTTON_SEPARATOR_INDEX);
 			undoMenuButton = new MenuToolButton("gtk-undo");
-			undoMenuButton.Label = "Undo";
-			undoMenuButton.TooltipText = "Undo";
-			undoMenuButton.Clicked+= undoTBButtonActivated;
+			undoMenuButton.Name = "bttnUndo";
+			undoMenuButton.Clicked += undoTBButtonActivated;
+			undoMenuButton.Sensitive = false;
 			toolbar.Insert(undoMenuButton, CATEGORY_BUTTON_SEPARATOR_INDEX);
-			toolbar.Remove(toolbar.Children[CATEGORY_BUTTON_SEPARATOR_INDEX-1]);
-			toolbar.Remove(toolbar.Children[CATEGORY_BUTTON_SEPARATOR_INDEX-2]);
+			toolbar.Remove(toolbar.Children[CATEGORY_BUTTON_SEPARATOR_INDEX - 1]);
+			toolbar.Remove(toolbar.Children[CATEGORY_BUTTON_SEPARATOR_INDEX - 2]);
 			toolbar.ShowAll();
 
-			Title = AppTitle;
-			TreeViewColumn mainColumn = new TreeViewColumn ();
-			mainColumn.Title = "Army Categories";
-			CellRendererText mainCell = new CellRendererText ();
-			mainColumn.PackStart (mainCell, true);
+			TreeViewColumn mainColumn = new TreeViewColumn();
+			CellRendererText mainCell = new CellRendererText();
+			mainColumn.PackStart(mainCell, true);
 			treeUnits.AppendColumn(mainColumn);
 			mainColumn.SetCellDataFunc(mainCell, new TreeCellDataFunc(RenderCategoryTreeObjectName));
 			treeUnits.Model = new TreeStore(typeof(WarFoundryObject));
 			logger.Debug("Loading preferences");
-			Preferences = new Preferences("WarFoundryGTK");
+			Preferences = new Preferences("WarFoundry-GTK");
 			logger.Debug("Loading translations");
 
 			try
@@ -119,11 +143,12 @@
 
 			logger.Debug("Initialising");
 			commandStack = new CommandStack();
-			commandStack.CommandStackUpdated+=new MethodInvoker(commandStack_CommandStackUpdated);
-			WarFoundryCore.GameSystemChanged+= new GameSystemChangedDelegate(OnGameSystemChanged);
-			WarFoundryCore.ArmyChanged+= new ArmyChangedDelegate(OnArmyChanged);
-			Destroyed+= new EventHandler(OnWindowDestroyed);
-			//TODO: Translate and subscribe to other events
+			commandStack.CommandStackUpdated += new MethodInvoker(commandStack_CommandStackUpdated);
+			WarFoundryCore.GameSystemChanged += new GameSystemChangedDelegate(OnGameSystemChanged);
+			WarFoundryCore.ArmyChanged += new ArmyChangedDelegate(OnArmyChanged);
+			Destroyed += new EventHandler(OnWindowDestroyed);
+			Translation.TranslationChanged += Retranslate;
+			Translate();
 			UnitAddedMethod = new ObjectAddDelegate(OnUnitAdded);
 			UnitRemovedMethod = new ObjectRemoveDelegate(OnUnitRemoved);
 			PointsValueChangedMethod = new DoubleValChangedDelegate(OnPointsValueChanged);
@@ -159,10 +184,14 @@
 							WarFoundryCore.CurrentArmy = (Army)loadedObject;
 							logger.InfoFormat("Loaded army from {0}", file.FullName);
 						}
-						else if (loadedObject is GameSystem)
+						else
 						{
-							WarFoundryCore.CurrentGameSystem = (GameSystem)loadedObject;
-							logger.InfoFormat("Loaded game system from {0}", file.FullName);
+							if (loadedObject is GameSystem)
+							{
+								WarFoundryCore.CurrentGameSystem = (GameSystem)loadedObject;
+								logger.InfoFormat("Loaded game system from {0}", file.FullName);
+							}
+
 						}
 					}
 				}
@@ -176,12 +205,12 @@
 			{
 				string gameSystemID = Preferences.GetStringProperty("currSystem");
 
-				if (gameSystemID!=null && !"".Equals(gameSystemID))
+				if (gameSystemID != null && !"".Equals(gameSystemID))
 				{
 					logger.Debug("Attempting to load current game system from properties");
 					GameSystem sys = WarFoundryLoader.GetDefault().GetGameSystem(gameSystemID);
 
-					if (sys!=null)
+					if (sys != null)
 					{
 						WarFoundryCore.CurrentGameSystem = sys;
 						logger.InfoFormat("Loaded game system {0} from properties", gameSystemID);
@@ -190,9 +219,28 @@
 			}
 		}
 
-		private void FileLoadingFinished (List<FileLoadFailure> failures)
+		protected override void Translate()
+		{
+			base.Translate();
+			SetAppTitle();
+			treeUnits.GetColumn(0).Title = Translation.GetTranslation("armyCategoryColumnTitle", "categories");
+			RebuildUndoRedoMenus();
+		}
+
+		private void Retranslate()
 		{
-			foreach(FileLoadFailure failure in failures)
+			Translate();
+		}
+
+		public override void Dispose()
+		{
+			Translation.TranslationChanged -= Retranslate;
+			base.Dispose();
+		}
+
+		private void FileLoadingFinished(List<FileLoadFailure> failures)
+		{
+			foreach (FileLoadFailure failure in failures)
 			{
 				logger.Warn("Failed to load " + failure.FailedFile.FullName + ": " + failure.Message);
 			}
@@ -218,11 +266,15 @@
 
 				(cell as CellRendererText).Text = name;
 			}
-			else if (o is IBBoard.WarFoundry.API.Objects.Unit)
+			else
 			{
-				IBBoard.WarFoundry.API.Objects.Unit u = (IBBoard.WarFoundry.API.Objects.Unit)o;
-				string name = Translation.GetTranslation("unitTreeCatName", "{0} - {1}pts", u.Name, u.Points);
-				(cell as CellRendererText).Text = name;
+				if (o is WFObjects.Unit)
+				{
+					WFObjects.Unit u = (WFObjects.Unit)o;
+					string name = Translation.GetTranslation("unitTreeCatName", "{0} - {1}pts", u.Name, u.Points);
+					(cell as CellRendererText).Text = name;
+				}
+
 			}
 		}
 
@@ -234,24 +286,33 @@
 
 		private void OnUnitNameChanged(WarFoundryObject val, string oldValue, string newValue)
 		{
-			IBBoard.WarFoundry.API.Objects.Unit unit = (IBBoard.WarFoundry.API.Objects.Unit)val;
+			WFObjects.Unit unit = (WFObjects.Unit)val;
+			logger.DebugFormat("Unit name changed for {0} - now called {1}", unit.ID, unit.Name);
 			UnitDisplayWidget widget;
 			unitToWidgetMap.TryGetValue(unit, out widget);
-
-			if (widget!=null)
+			
+			if (widget != null)
 			{
-				unitsNotebook.SetTabLabel(widget, NotebookUtil.CreateNotebookTabLabelWithClose(unitsNotebook, widget, newValue));
+				unitsNotebook.SetTabLabel(widget, NotebookUtil.CreateNotebookTabLabelWithClose(unitsNotebook, widget, unit.Name));
 			}
+			
+			treeUnits.QueueDraw();
 		}
 
 		private void OnUnitAdded(WarFoundryObject val)
 		{
-			IBBoard.WarFoundry.API.Objects.Unit unit = (IBBoard.WarFoundry.API.Objects.Unit)val;
-			unit.NameChanged+= UnitNameChangedMethod;
+			WFObjects.Unit unit = (WFObjects.Unit)val;
+			unit.NameChanged += UnitNameChangedMethod;
+			unit.PointsValueChanged += HandleUnitPointsValueChanged;
 			AddUnitToTree(unit);
 		}
 
-		private void AddUnitToTree(IBBoard.WarFoundry.API.Objects.Unit unit)
+		private void HandleUnitPointsValueChanged(WarFoundryObject obj, double oldValue, double newValue)
+		{			
+			treeUnits.QueueDraw();
+		}
+
+		private void AddUnitToTree(WFObjects.Unit unit)
 		{
 			TreeStore model = (TreeStore)treeUnits.Model;
 			TreeIter iter;
@@ -278,14 +339,13 @@
 
 		private void OnUnitRemoved(WarFoundryObject obj)
 		{
-			IBBoard.WarFoundry.API.Objects.Unit unit = (IBBoard.WarFoundry.API.Objects.Unit)obj;
-			unit.NameChanged-= UnitNameChangedMethod;
+			WFObjects.Unit unit = (WFObjects.Unit)obj;
+			unit.NameChanged -= UnitNameChangedMethod;
 			RemoveUnitFromTree(unit);
-
-			//See if unit has a tab open and close it if it does
+			RemoveUnitTab(unit);
 		}
 
-		private void RemoveUnitFromTree(IBBoard.WarFoundry.API.Objects.Unit unit)
+		private void RemoveUnitFromTree(WFObjects.Unit unit)
 		{
 			TreeStore model = (TreeStore)treeUnits.Model;
 			TreeIter iter;
@@ -328,9 +388,19 @@
 			while (model.IterNext(ref iter));
 		}
 
+		private void RemoveUnitTab(WFObjects.Unit unit)
+		{
+			UnitDisplayWidget widget = DictionaryUtils.GetValue(unitToWidgetMap, unit);
+			
+			if (widget != null)
+			{
+				unitsNotebook.Remove(widget);
+			}
+		}
+
 		private void OnPointsValueChanged(WarFoundryObject obj, double before, double after)
 		{
-			//Set points in panel
+			SetPointsPanelText();
 		}
 
 		private void OnFailedUnitRequirement(List<FailedUnitRequirement> failedRequirement)
@@ -344,14 +414,9 @@
 			set { preferences = value; }
 		}
 
-		/*public AbstractNativeWarFoundryFactory Factory
+		protected void OnDeleteEvent(object sender, DeleteEventArgs a)
 		{
-			get { return WarFoundryFactoryFactory.GetFactoryFactory().GetFactory(Constants.ExecutablePath, factoryType); }
-		}*/
-
-		protected void OnDeleteEvent (object sender, DeleteEventArgs a)
-		{
-			Application.Quit ();
+			Application.Quit();
 			a.RetVal = true;
 		}
 
@@ -367,6 +432,7 @@
 
 		protected virtual void OnReloadFilesActivated(object sender, System.EventArgs e)
 		{
+			WarFoundryLoader.GetDefault().LoadFiles();
 		}
 
 		protected virtual void OnSaveArmyAsActivated(object sender, System.EventArgs e)
@@ -393,20 +459,21 @@
 		{
 			if (sender is ToolButton)
 			{
-				Category cat = null;
-				categoryMap.TryGetValue((ToolButton)sender, out cat);
+				ToolButton toolButton = (ToolButton)sender;
+				Category cat = (Category)toolButton.Data["Category"];
 
-				if (cat!=null)
+				if (cat != null)
 				{
 					logger.DebugFormat("Show FrmNewUnit for {0}", cat.Name);
 					FrmNewUnit newUnit = new FrmNewUnit(WarFoundryCore.CurrentArmy.Race, cat, WarFoundryCore.CurrentArmy);
 					ResponseType response = (ResponseType)newUnit.Run();
 					newUnit.Hide();
 
-					if (response==ResponseType.Ok)
+					if (response == ResponseType.Ok)
 					{
 						CreateAndAddUnitCommand cmd = new CreateAndAddUnitCommand(newUnit.SelectedUnit, WarFoundryCore.CurrentArmy.GetCategory(cat));
 						commandStack.Execute(cmd);
+						ShowUnitWidget(cmd.Unit);
 					}
 
 					newUnit.Dispose();
@@ -421,17 +488,21 @@
 
 		private void SetAppTitle()
 		{
-			if (WarFoundryCore.CurrentArmy!=null)
+			if (WarFoundryCore.CurrentArmy != null)
 			{
 				Title = AppTitle + " - " + WarFoundryCore.CurrentGameSystem.Name + " - " + WarFoundryCore.CurrentArmy.Name;
 			}
-			else if (WarFoundryCore.CurrentGameSystem!=null)
-			{
-				Title = AppTitle + " - " + WarFoundryCore.CurrentGameSystem.Name;
-			}
 			else
 			{
-				Title = AppTitle;
+				if (WarFoundryCore.CurrentGameSystem != null)
+				{
+					Title = AppTitle + " - " + WarFoundryCore.CurrentGameSystem.Name;
+				}
+				else
+				{
+					Title = AppTitle;
+				}
+
 			}
 		}
 
@@ -441,7 +512,7 @@
 			SetAppTitle();
 			RemoveCategoryButtons();
 
-			if (system!=null)
+			if (system != null)
 			{
 				AddCategoryButtons(system.Categories);
 			}
@@ -453,12 +524,12 @@
 			SetAppTitle();
 			SetArmyTree(newArmy);
 
-			if (oldArmy!=null)
+			if (oldArmy != null)
 			{
-				oldArmy.UnitAdded-= UnitAddedMethod;
-				oldArmy.UnitRemoved-= UnitRemovedMethod;
-				oldArmy.PointsValueChanged-= PointsValueChangedMethod;
-				oldArmy.FailedRequirement-=FailedUnitRequirementMethod;
+				oldArmy.UnitAdded -= UnitAddedMethod;
+				oldArmy.UnitRemoved -= UnitRemovedMethod;
+				oldArmy.PointsValueChanged -= PointsValueChangedMethod;
+				oldArmy.FailedRequirement -= FailedUnitRequirementMethod;
 			}
 
 			unitToWidgetMap.Clear();
@@ -468,16 +539,16 @@
 				unitsNotebook.RemovePage(0);
 			}
 
-			if (newArmy==null)
+			if (newArmy == null)
 			{
 				DisableCategoryButtons();
 			}
 			else
 			{
-				newArmy.UnitAdded+= UnitAddedMethod;
-				newArmy.UnitRemoved+= UnitRemovedMethod;
-				newArmy.PointsValueChanged+= PointsValueChangedMethod;
-				newArmy.FailedRequirement+=FailedUnitRequirementMethod;
+				newArmy.UnitAdded += UnitAddedMethod;
+				newArmy.UnitRemoved += UnitRemovedMethod;
+				newArmy.PointsValueChanged += PointsValueChangedMethod;
+				newArmy.FailedRequirement += FailedUnitRequirementMethod;
 				//TODO: Clear all buttons
 				EnableCategoryButtons();
 
@@ -488,13 +559,15 @@
 				}
 			}
 
-			miCloseArmy.Sensitive = newArmy!=null;
-			miSaveArmyAs.Sensitive = newArmy!=null;
-			miExportArmy.Sensitive = newArmy!=null;
+			bool nonNullNewArmy = (newArmy != null);
+			miCloseArmy.Sensitive = nonNullNewArmy;
+			miSaveArmyAs.Sensitive = nonNullNewArmy;
+			miExportArmyAs.Sensitive = nonNullNewArmy;
+			hpaned2.Visible = nonNullNewArmy;
 			loadedArmyPath = null;
 			//New army has no changes, so we can't save it
 			miSaveArmy.Sensitive = false;
-			saveArmyButton.Sensitive = false;
+			bttnSaveArmy.Sensitive = false;
 
 			CommandStack.Reset();
 			SetPointsPanelText();
@@ -507,7 +580,7 @@
 			store.Clear();
 			TreeIter iter;
 
-			if (army!=null)
+			if (army != null)
 			{
 				logger.Debug("Loading in categories to tree");
 
@@ -516,7 +589,7 @@
 					logger.DebugFormat("Append category {0}", cat.Name);
 					iter = store.AppendValues(cat);
 
-					foreach (IBBoard.WarFoundry.API.Objects.Unit unit in cat.GetUnits())
+					foreach (WFObjects.Unit unit in cat.GetUnits())
 					{
 						store.AppendValues(iter, unit);
 					}
@@ -539,7 +612,7 @@
 		private void SetCategoryButtonsSensitive(bool state)
 		{
 			int toolbarButtonCount = toolbar.Children.Length - 1;
-			logger.Debug("Last button index: "+toolbarButtonCount);
+			logger.Debug("Last button index: " + toolbarButtonCount);
 
 			for (int i = toolbarButtonCount; i > CATEGORY_BUTTON_SEPARATOR_INDEX; i--)
 			{
@@ -556,13 +629,11 @@
 			{
 				toolbar.Remove(toolbar.Children[i]);
 			}
-
-			categoryMap.Clear();
 		}
 
 		private void AddCategoryButtons(Category[] cats)
 		{
-			if (cats!=null && cats.Length > 0)
+			if (cats != null && cats.Length > 0)
 			{
 				logger.DebugFormat("Toolbar button count: {0}. Adding {1} categories.", toolbar.Children.Length, cats.Length);
 
@@ -570,22 +641,28 @@
 				{
 					ToolButton button = new ToolButton("gtk-add");
 					button.Label = cat.Name;
-					button.TooltipText = "Add unit from "+cat.Name;
-					//TODO: See if we can associate data in some way, the same as we can with SWF. For now we just use the map.
-					categoryMap.Add(button, cat);
-					button.Clicked+= new System.EventHandler(OnAddUnitActivated);
+					button.TooltipText = Translation.GetTranslation("bttnCreateFromCat", "{0}", cat.Name);
+					button.Data["Category"] = cat;
+					button.Clicked += new System.EventHandler(OnAddUnitActivated);
 					toolbar.Insert(button, -1);
 				}
 			}
 
-			toolbar.Children[CATEGORY_BUTTON_SEPARATOR_INDEX].Visible = cats!=null && cats.Length>0;
+			toolbar.Children[CATEGORY_BUTTON_SEPARATOR_INDEX].Visible = cats != null && cats.Length > 0;
 
 			toolbar.ShowAll();
 		}
 
 		private void SetPointsPanelText()
 		{
-			//TODO: Set the points value in the status bar
+			if (WarFoundryCore.CurrentArmy != null)
+			{
+				lblTotalPoints.Text = Translation.GetTranslation("statusPanelPoints", "{0}pts of {1} pts", WarFoundryCore.CurrentArmy.Points, WarFoundryCore.CurrentArmy.MaxPoints);
+			}
+			else
+			{
+				lblTotalPoints.Text = "";
+			}
 		}
 
 		private void commandStack_CommandStackUpdated()
@@ -594,85 +671,115 @@
 			miUndo.Sensitive = undoMenuButton.Sensitive;
 			redoMenuButton.Sensitive = commandStack.CanRedo();
 			miRedo.Sensitive = redoMenuButton.Sensitive;
+
+			RebuildUndoRedoMenus();
+
+			bttnSaveArmy.Sensitive = commandStack.IsDirty() && WarFoundryCore.CurrentArmy != null;
+			miSaveArmy.Sensitive = commandStack.IsDirty() && WarFoundryCore.CurrentArmy != null;
+		}
+
+		private void RebuildUndoRedoMenus()
+		{
 			int redoLength = commandStack.RedoLength;
-			//TODO: Build menus for undo/redo and find way of adding tooltips
-			/*int maxRedo = Math.Min(10, redoLength);
-			MenuItem[] menuItems = null;
-
+			int maxRedo = Math.Min(10, redoLength);
+			
 			if (redoLength > 0)
 			{
-				menuItems = new MenuItem[maxRedo];
+				Menu menu = new Menu();
 				Command com;
 				MenuItem mi;
-
+			
 				for (int i = 0; i < maxRedo; i++)
 				{
-					com = commandStack.PeekRedoCommand(i+1);
-
+					com = commandStack.PeekRedoCommand(i + 1);
+			
 					if (com == null)
 					{
 						break;
 					}
-
+			
 					mi = new MenuItem(com.Description);
-					mi.Click+=new EventHandler(redoMenu_Click);
-					menuItems[i] = mi;
+					mi.Activated += new EventHandler(RedoMenuActivated);
+					menu.Append(mi);
 				}
+				
+				menu.ShowAll();
+				redoMenuButton.Menu = menu;
 			}
-
-			redoMenu.MenuItems.Clear();
-
-			if (menuItems!=null && menuItems[0]!=null)
+			else
 			{
-				bttnRedo.ToolTipText = menuItems[0].Text;
-				redoMenu.MenuItems.AddRange(menuItems);
-			}*/
-			//TODO: Put above code back when we have a dropdown version of the redo button
-			if (redoLength > 0)
-			{
-				//redoMenuButton.Tooltip = CommandStack.PeekRedoCommand().Description;
+				redoMenuButton.Menu = null;
 			}
-
+			
 			int undoLength = commandStack.UndoLength;
-			/*int maxUndo = Math.Min(10, undoLength);
-			MenuItem[] menuItemsUndo = null;
-
+			int maxUndo = Math.Min(10, undoLength);
+			
 			if (undoLength > 0)
 			{
-				menuItemsUndo = new MenuItem[maxUndo];
+				Menu menu = new Menu();
 				Command com;
 				MenuItem mi;
-
+			
 				for (int i = 0; i < maxUndo; i++)
 				{
-					com = commandStack.PeekUndoCommand(i+1);
-
+					com = commandStack.PeekUndoCommand(i + 1);
+			
 					if (com == null)
 					{
 						break;
 					}
-
+			
 					mi = new MenuItem(com.UndoDescription);
-					mi.Click+=new EventHandler(undoMenu_Click);
-					menuItemsUndo[i] = mi;
+					mi.Activated += new EventHandler(UndoMenuActivated);
+					menu.Add(mi);
+				}
+				
+				menu.ShowAll();
+				undoMenuButton.Menu = menu;
+			}
+			else
+			{
+				undoMenuButton.Menu = null;
+			}
+		}
+
+		private void RedoMenuActivated(object sender, EventArgs e)
+		{
+			if (sender is MenuItem)
+			{
+				MenuItem item = (MenuItem)sender;
+				//we know it's an redo menu item so find it's index and redo everything
+				
+				int max = Arrays.IndexOf(((Menu)redoMenuButton.Menu).Children, item);
+				
+				if (max >= 0)
+				{
+					for (int i = 0; i <= max; i++)
+					{
+						commandStack.Redo();
+					}
 				}
 			}
+		}
 
-			undoMenu.MenuItems.Clear();
-
-			if (menuItemsUndo!=null && menuItemsUndo[0]!=null)
+		private void UndoMenuActivated(object sender, EventArgs e)
+		{
+			if (sender is MenuItem)
 			{
-				bttnUndo.ToolTipText = menuItemsUndo[0].Text;
-				undoMenu.MenuItems.AddRange(menuItemsUndo);
-			}*/
-			//TODO: Put above code back when we have a dropdown version of the undo button
-			if (undoLength > 0)
-			{
-				//undoMenuButton.Tooltip = CommandStack.PeekUndoCommand().UndoDescription;
+				
+				MenuItem item = (MenuItem)sender;
+				//we know it's an undo menu item so find it's index and undo everything
+				
+				int max = Arrays.IndexOf(((Menu)undoMenuButton.Menu).Children, item);
+				
+				if (max >= 0)
+				{
+					for (int i = 0; i <= max; i++)
+					{
+						commandStack.Undo();
+					}
+				}
 			}
-
-			saveArmyButton.Sensitive = commandStack.IsDirty() && WarFoundryCore.CurrentArmy!=null;
-			miSaveArmy.Sensitive = commandStack.IsDirty() && WarFoundryCore.CurrentArmy!=null;
 		}
 
 		private bool SaveCurrentArmyOrSaveAs()
@@ -689,10 +796,13 @@
 
 		private bool OpenArmy()
 		{
-			FileChooserDialog fileDialog = new FileChooserDialog("Open army", this, FileChooserAction.Open, "Cancel", ResponseType.Cancel, "Open", ResponseType.Accept);
+			string title = Translation.GetTranslation("openArmyDialog", "open army");
+			string cancelText = Translation.GetTranslation("bttnCancel", "cancel");
+			string openText = Translation.GetTranslation("bttnOpen", "open");
+			FileChooserDialog fileDialog = new FileChooserDialog(title, this, FileChooserAction.Open, cancelText, ResponseType.Cancel, openText, ResponseType.Accept);
 			FileFilter filter = new FileFilter();
 			filter.AddPattern("*.army");
-			filter.Name = "WarFoundry Army files (*.army)";
+			filter.Name = Translation.GetTranslation("armyFileFilter", "WarFoundry .army files");
 			fileDialog.AddFilter(filter);
 			int response = fileDialog.Run();
 			string filePath = null;
@@ -710,7 +820,16 @@
 			if (filePath != null)
 			{
 				FileInfo file = new FileInfo(filePath);
-				Army army = WarFoundryLoader.GetDefault().LoadArmy(file);
+				Army army = null;
+
+				try
+				{
+					army = WarFoundryLoader.GetDefault().LoadArmy(file);
+				}
+				catch (Exception ex)
+				{
+					logger.Error("Error while loading army file " + filePath, ex);
+				}
 
 				if (army != null)
 				{
@@ -722,9 +841,8 @@
 				}
 				else
 				{
-					logger.ErrorFormat("Failed to load {0} as an army file", filePath);
-					MessageDialog dialog = new MessageDialog(this, DialogFlags.Modal, MessageType.Error, ButtonsType.Ok, file.Name + " could not be loaded.\n\nIf the file is an army file then please check your file loaders.");
-					dialog.Title = "Failed to open army";
+					MessageDialog dialog = new MessageDialog(this, DialogFlags.Modal, MessageType.Error, ButtonsType.Ok, Translation.GetTranslation("OpenFailed", "File open failed. Please check log file"));
+					dialog.Title = Translation.GetTranslation("OpenFailedTitle", "File open failed");
 					dialog.Run();
 					dialog.Hide();
 					dialog.Dispose();
@@ -742,7 +860,7 @@
 		{
 			bool success = false;
 
-			if (loadedArmyPath!=null)
+			if (loadedArmyPath != null)
 			{
 				success = SaveArmyToPath(WarFoundryCore.CurrentArmy, loadedArmyPath);
 			}
@@ -752,10 +870,13 @@
 
 		private bool SaveCurrentArmyAs()
 		{
-			FileChooserDialog fileDialog = new FileChooserDialog("Save file as", this, FileChooserAction.Save, "Cancel", ResponseType.Cancel, "Save", ResponseType.Accept);
+			string title = Translation.GetTranslation("saveArmyDialog", "save army");
+			string cancelText = Translation.GetTranslation("bttnCancel", "cancel");
+			string saveText = Translation.GetTranslation("bttnSave", "save");
+			FileChooserDialog fileDialog = new FileChooserDialog(title, this, FileChooserAction.Save, cancelText, ResponseType.Cancel, saveText, ResponseType.Accept);
 			FileFilter filter = new FileFilter();
 			filter.AddPattern("*.army");
-			filter.Name = "WarFoundry Army files (*.army)";
+			filter.Name = Translation.GetTranslation("armyFileFilter", "WarFoundry .army files");
 			fileDialog.AddFilter(filter);
 			int response = fileDialog.Run();
 			string filePath = null;
@@ -770,25 +891,36 @@
 			
 			return SaveArmyToPath(WarFoundryCore.CurrentArmy, filePath);
 		}
-		
+
 		private bool SaveArmyToPath(Army army, string filePath)
 		{
 			bool success = false;
 			
-			if (filePath!=null)
+			if (filePath != null)
 			{
-				if (WarFoundrySaver.GetSaver().Save(WarFoundryCore.CurrentArmy, filePath))
+				bool saveSuccess = false;
+
+				try
+				{
+					saveSuccess = WarFoundrySaver.GetSaver().Save(WarFoundryCore.CurrentArmy, filePath);
+				}
+				catch (Exception ex)
+				{
+					logger.Error("Error while saving army file to " + filePath, ex);
+				}
+
+				if (saveSuccess)
 				{
 					miSaveArmy.Sensitive = false;
-					saveArmyButton.Sensitive = false;
+					bttnSaveArmy.Sensitive = false;
 					CommandStack.setCleanMark();
 					loadedArmyPath = filePath;
 					success = true;
 				}
 				else
 				{
-					MessageDialog dialog = new MessageDialog(this, DialogFlags.Modal, MessageType.Error, ButtonsType.Ok, "Failed to save file to "+filePath);
-					dialog.Title = "Army save failed";
+					MessageDialog dialog = new MessageDialog(this, DialogFlags.Modal, MessageType.Error, ButtonsType.Ok,  Translation.GetTranslation("SaveFailed", "File save failed. Please check log file"));
+					dialog.Title = Translation.GetTranslation("SaveFailedTitle", "File save failed");
 					dialog.Run();
 					dialog.Hide();
 					dialog.Dispose();
@@ -801,13 +933,20 @@
 
 		private bool CloseCurrentArmy()
 		{
-			if (WarFoundryCore.CurrentArmy!=null)
+			if (WarFoundryCore.CurrentArmy != null)
 			{
 				bool canClose = false;
 
 				if (CommandStack.IsDirty())
 				{
-					MessageDialog dia  = new MessageDialog(this, DialogFlags.DestroyWithParent, MessageType.Question, ButtonsType.YesNo, "The army \""+WarFoundryCore.CurrentArmy.Name+"\" has been modified.\r\nSave changes before closing army?");
+					string message = Translation.GetTranslation("SaveChangesQuestion", "Save changes to army before closing?", WarFoundryCore.CurrentArmy.Name);
+					MessageDialog dia = new MessageDialog(this, DialogFlags.DestroyWithParent, MessageType.Question, ButtonsType.None, message);
+					dia.AddButton(Translation.GetTranslation("bttnDiscard", "lose changes"), ResponseType.No);
+					Button button = (Button)dia.AddButton(Translation.GetTranslation("bttnCancel", "cancel"), ResponseType.Cancel);
+					button.Image = new Image("gtk-cancel", IconSize.Button);
+					button = (Button)dia.AddButton(Translation.GetTranslation("bttnSave", "save"), ResponseType.Yes);
+					button.Image = new Image("gtk-save", IconSize.Button);
+					dia.Title = Translation.GetTranslation("SaveChangesTitle", "Save changes?");
 					ResponseType dr = (ResponseType)dia.Run();
 					dia.Hide();
 					dia.Dispose();
@@ -818,15 +957,19 @@
 						//If they cancel the save as then assume they don't want to close
 						canClose = SaveCurrentArmyOrSaveAs();
 					}
-					else if (dr == ResponseType.No)
-					{
-						//They don't care about their changes
-						canClose = true;
-					}
 					else
 					{
-						//Assume cancel or close with the X button
-						canClose = false;
+						if (dr == ResponseType.No)
+						{
+							//They don't care about their changes
+							canClose = true;
+						}
+						else
+						{
+							//Assume cancel or close with the X button
+							canClose = false;
+						}
+
 					}
 				}
 				else
@@ -875,75 +1018,74 @@
 			newArmy.Destroy();
 		}
 
-		protected virtual void undoTBButtonActivated (object sender, System.EventArgs e)
+		protected virtual void undoTBButtonActivated(object sender, System.EventArgs e)
 		{
 			CommandStack.Undo();
 		}
 
-		protected virtual void redoTBButtonActivated (object sender, System.EventArgs e)
+		protected virtual void redoTBButtonActivated(object sender, System.EventArgs e)
 		{
 			CommandStack.Redo();
 		}
 
-		protected virtual void saveTBButtonActivated (object sender, System.EventArgs e)
+		protected virtual void saveTBButtonActivated(object sender, System.EventArgs e)
 		{
 			SaveCurrentArmyOrSaveAs();
 		}
 
-		protected virtual void openTBButtonActivated (object sender, System.EventArgs e)
+		protected virtual void openTBButtonActivated(object sender, System.EventArgs e)
 		{
 			OpenArmy();
 		}
 
-		protected virtual void newTBButtonActivated (object sender, System.EventArgs e)
+		protected virtual void newTBButtonActivated(object sender, System.EventArgs e)
 		{
 			CreateNewArmy();
 		}
 
-		protected virtual void ArmyRowActivated (object o, Gtk.RowActivatedArgs args)
+		protected virtual void ArmyRowActivated(object o, Gtk.RowActivatedArgs args)
 		{
 			object obj = TreeUtils.GetItemAtPath(treeUnits, args.Path);
 
-			if (obj is IBBoard.WarFoundry.API.Objects.Unit)
+			if (obj is WFObjects.Unit)
 			{
-				IBBoard.WarFoundry.API.Objects.Unit unit = (IBBoard.WarFoundry.API.Objects.Unit)obj;
-
-				UnitDisplayWidget widget;
-				unitToWidgetMap.TryGetValue(unit, out widget);
-
-				if (widget!=null)
-				{
-					logger.DebugFormat("Selecting existing page for "+unit.Name);
-					unitsNotebook.Page = unitsNotebook.PageNum(widget);
-				}
-				else
-				{
-					widget = new UnitDisplayWidget(unit, CommandStack);
-					logger.Debug("Adding page for "+unit.Name);
-					unitToWidgetMap[unit] = widget;
-					widget.Destroyed+= new EventHandler(UnitWidgetDestroyed);
-					int pageNum = NotebookUtil.AddPageToNotebookWithCloseButton(unitsNotebook, widget, unit.Name);
-					logger.Debug("Page added at index "+pageNum);
-					unitsNotebook.ShowAll();
-					unitsNotebook.Page = pageNum;
-				}
+				WFObjects.Unit unit = (WFObjects.Unit)obj;
+				ShowUnitWidget(unit);
 			}
 		}
 
-		private void UnitWidgetDestroyed(object sender, EventArgs e)
+		private void ShowUnitWidget(WFObjects.Unit unit)
 		{
-			if (sender is UnitDisplayWidget)
+			UnitDisplayWidget widget;
+			unitToWidgetMap.TryGetValue(unit, out widget);
+
+			if (widget != null)
 			{
-				unitToWidgetMap.Remove(((UnitDisplayWidget)sender).Unit);
+				logger.DebugFormat("Selecting existing page for " + unit.Name);
+				unitsNotebook.Page = unitsNotebook.PageNum(widget);
+			}
+			else
+			{
+				widget = new UnitDisplayWidget(unit, CommandStack);
+				logger.Debug("Adding page for " + unit.Name);
+				unitToWidgetMap[unit] = widget;
+				int pageNum = NotebookUtil.AddPageToNotebookWithCloseButton(unitsNotebook, widget, unit.Name);
+				logger.Debug("Page added at index " + pageNum);
+				unitsNotebook.ShowAll();
+				unitsNotebook.CurrentPage = pageNum;
+				unitsNotebook.SetTabReorderable(widget, true);
 			}
 		}
 
-		protected virtual void OnMiExportAsBasicHtmlActivated (object sender, System.EventArgs e)
+		protected virtual void OnMiExportAsBasicHtmlActivated(object sender, System.EventArgs e)
 		{
-			FileChooserDialog fileDialog = new FileChooserDialog("Export army", this, FileChooserAction.Save, "Cancel", ResponseType.Cancel, "Export", ResponseType.Accept);
+			string exportArmyTitle = Translation.GetTranslation("exportBasicHtmlDialogTitle", "export army");
+			string cancelText = Translation.GetTranslation("exportBasicHtmlCancel", "cancel");
+			string exportText = Translation.GetTranslation("exportBasicHtmlExport", "export");
+			FileChooserDialog fileDialog = new FileChooserDialog(exportArmyTitle, this, FileChooserAction.Save, cancelText, ResponseType.Cancel, exportText, ResponseType.Accept);
 			FileFilter filter = new FileFilter();
 			filter.AddPattern("*.html");
-			filter.Name = "HTML pages (*.html)";
+			filter.Name = Translation.GetTranslation("exportBasicHtmlHtmlFilter", "HTML pages (*.html)");
 			fileDialog.AddFilter(filter);
 			int response = fileDialog.Run();
 			string filePath = null;
@@ -964,16 +1106,16 @@
 			}
 		}
 
-		protected virtual void OnTreeUnitsPopupMenu (object o, Gtk.PopupMenuArgs args)
+		protected virtual void OnTreeUnitsPopupMenu(object o, Gtk.PopupMenuArgs args)
 		{
 			object selectedItem = TreeUtils.GetSelectedItem(treeUnits);
 
-			if (selectedItem is IBBoard.WarFoundry.API.Objects.Unit)
+			if (selectedItem is WFObjects.Unit)
 			{
 				Menu menu = new Menu();
-				ImageMenuItem delete = new ImageMenuItem("Remove unit");
+				ImageMenuItem delete = new ImageMenuItem(Translation.GetTranslation("menuRemoveUnit", "remove unit"));
 				delete.Image = new Gtk.Image(Stock.Delete, IconSize.Menu);
-				delete.Activated+= new EventHandler(OnUnitDelete);
+				delete.Activated += new EventHandler(OnUnitDelete);
 				delete.Data["unit"] = selectedItem;
 				menu.Append(delete);
 				menu.ShowAll();
@@ -983,17 +1125,65 @@
 
 		private void OnUnitDelete(object o, EventArgs args)
 		{
-			RemoveUnitCommand command = new RemoveUnitCommand((IBBoard.WarFoundry.API.Objects.Unit)((ImageMenuItem)o).Data["unit"]);
+			RemoveUnitCommand command = new RemoveUnitCommand((WFObjects.Unit)((ImageMenuItem)o).Data["unit"]);
 			commandStack.Execute(command);
 		}
 
 		[GLib.ConnectBefore]
-		protected virtual void UnitTreeButtonPressed (object o, Gtk.ButtonPressEventArgs args)
+
+		protected virtual void UnitTreeButtonPressed(object o, Gtk.ButtonPressEventArgs args)
 		{
+			TreePath path;
+			treeUnits.GetPathAtPos((int)args.Event.X, (int)args.Event.Y, out path);
+			
+			if (!treeUnits.Selection.PathIsSelected(path))
+			{
+				treeUnits.Selection.SelectPath(path);
+			}
+			
 			if (args.Event.Type == Gdk.EventType.ButtonPress && args.Event.Button == 3)
 			{
 				OnTreeUnitsPopupMenu(o, null);
 			}
 		}
+
+		protected virtual void NotebookPageRemoved(object o, Gtk.RemovedArgs args)
+		{
+			Widget widget = args.Widget;
+			
+			if (widget is UnitDisplayWidget)
+			{
+				unitToWidgetMap.Remove(((UnitDisplayWidget)widget).Unit);
+			}
+		}
+
+		protected virtual void HelpAboutActivated(object sender, System.EventArgs e)
+		{
+			FrmAbout form = FrmAbout.GetForm();
+			form.Run();
+			form.Hide();
+		}
+
+		protected virtual void miPreferencesClicked(object sender, System.EventArgs e)
+		{
+			FrmPreferences form = new FrmPreferences(Preferences);
+			form.Run();
+			form.Hide();
+		}
+
+		public override ICollection<Action> Actions
+		{
+			get
+			{
+				List<Action> actions = new List<Action>();
+
+				foreach (ActionGroup actionGroup in this.UIManager.ActionGroups)
+				{
+					actions.AddRange(actionGroup.ListActions());
+				}
+
+				return actions;
+			}
+		}
 	}
 }

--- a/FrmNewArmy.cs	Sun Jan 31 20:46:06 2010 +0000
+++ b/FrmNewArmy.cs	Mon Jan 17 19:43:47 2011 +0000
@@ -9,16 +9,18 @@
 using IBBoard.WarFoundry.API.Objects;
 using IBBoard.GtkSharp;
 using log4net;
+using IBBoard.WarFoundry.GUI.GTK.Util;
+using IBBoard.GtkSharp.Translatable;
 
-namespace IBBoard.WarFoundry.GTK
+namespace IBBoard.WarFoundry.GUI.GTK
 {	
-	public partial class FrmNewArmy : Dialog, ITranslatable
+	public partial class FrmNewArmy : TranslatableDialog, ITranslatable
 	{
 		private ILog logger = LogManager.GetLogger(typeof(FrmNewArmy));
 		private Race race;
 		private string armyName;
 		private int pointsValue;
-		
+
 		public FrmNewArmy(GameSystem gameSystem)
 		{
 			this.Build();
@@ -26,6 +28,15 @@
 			GameSystem[] gameSystems = WarFoundryLoader.GetDefault().GetGameSystems();
 			ComboBoxUtils.FillCombo(systemCombo, gameSystems, delegate(GameSystem sys){return sys.Name;});
 			
+			lstRaces.Selection.Changed += new EventHandler(OnSelectionChanged);
+			
+			TreeViewColumn raceColumn = new TreeViewColumn();
+			raceColumn.Title = Translation.GetTranslation("frmNewArmyRaceColumn", "race");
+			CellRendererText raceCell = new CellRendererText();
+			raceColumn.PackStart(raceCell, true);
+			lstRaces.AppendColumn(raceColumn);
+			raceColumn.SetCellDataFunc(raceCell, GtkWarFoundryUtil.RenderWarFoundryObjectName);
+			
 			if (gameSystem != null)
 			{
 				ComboBoxUtils.SelectItem(systemCombo, gameSystem);
@@ -35,32 +46,25 @@
 				ComboBoxUtils.SelectIndex(systemCombo, 0);
 			}
 			
-			lstRaces.Selection.Changed+= new EventHandler(OnSelectionChanged);
-			
-			TreeViewColumn raceColumn = new TreeViewColumn ();
-			raceColumn.Title = "Race";
-			CellRendererText raceCell = new CellRendererText ();
-			raceColumn.PackStart (raceCell, true);
-			lstRaces.AppendColumn(raceColumn);
-			raceColumn.SetCellDataFunc(raceCell, new TreeCellDataFunc(RenderRaceName));
+			Translation.TranslationChanged += Retranslate;
+			Translate();
+		}
+
+		private void Retranslate()
+		{
+			Translate();
+		}
 
-			
-			if (gameSystem!=null)
-			{
-				SetRaces(gameSystem);
-			}
-		}
-		
-		public string Text
+		public override void Dispose()
 		{
-			get { return Title; }
-			set { Title = value; }
+			Translation.TranslationChanged -= Retranslate;
+			base.Dispose();
 		}
-		
-		private void RenderRaceName(TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
+
+		protected override void Translate()
 		{
-			Race r = (Race)model.GetValue(iter, 0);
-			(cell as CellRendererText).Text = r.Name;
+			base.Translate();
+			ControlTranslator.TranslateButtons(bttnCreate, bttnCancel);
 		}
 
 		protected virtual void OnSelectionChanged(object o, EventArgs e)
@@ -68,51 +72,60 @@
 			logger.Debug("Race selection changed");
 			SetOkayButtonState();
 		}
-		
+
 		private void SetOkayButtonState()
 		{
-			bttnCreate.Sensitive = (lstRaces.Selection.CountSelectedRows() == 1 && txtArmyName.Text!="" && sbPointsValue.Value > 0);
+			bttnCreate.Sensitive = (lstRaces.Selection.CountSelectedRows() == 1 && txtArmyName.Text != "" && sbPointsValue.Value > 0);
 		}
 
-		protected virtual void OnCreateClicked (object sender, System.EventArgs e)
+		protected virtual void OnCreateClicked(object sender, System.EventArgs e)
 		{
 			TreeModel model;
 			TreeIter iter;
-			lstRaces.Selection.GetSelected (out model, out iter);
-			race = (Race) model.GetValue(iter, 0);
+			lstRaces.Selection.GetSelected(out model, out iter);
+			race = (Race)model.GetValue(iter, 0);
 			armyName = txtArmyName.Text;
 			pointsValue = (int)sbPointsValue.Value;
 			Respond(ResponseType.Ok);
 		}
 
-		protected virtual void OnCancelClicked (object sender, System.EventArgs e)
+		protected virtual void OnCancelClicked(object sender, System.EventArgs e)
 		{
 			Respond(ResponseType.Cancel);
 		}
 
-		protected virtual void OnTextChanged (object sender, System.EventArgs e)
+		protected virtual void OnTextChanged(object sender, System.EventArgs e)
+		{
+			SetOkayButtonState();
+		}
+
+		protected virtual void OnSpinChangeValue(object o, Gtk.ChangeValueArgs args)
 		{
 			SetOkayButtonState();
 		}
 
-		protected virtual void OnSpinChangeValue (object o, Gtk.ChangeValueArgs args)
+		protected virtual void OnSpinValueChanged(object sender, System.EventArgs e)
 		{
 			SetOkayButtonState();
 		}
 
-		protected virtual void OnSpinValueChanged (object sender, System.EventArgs e)
-		{
-			SetOkayButtonState();
-		}
-		
-		protected virtual void OnSystemComboChanged (object sender, System.EventArgs e)
+		protected virtual void OnSystemComboChanged(object sender, System.EventArgs e)
 		{
 			GameSystem system = ComboBoxUtils.GetSelectedItem<GameSystem>(systemCombo);
 			SetRaces(system);
+			ListStore model = (ListStore)lstRaces.Model;
+
+			if (model.IterNChildren() == 1)
+			{
+				TreeIter iter;
+				model.GetIterFirst(out iter);
+				lstRaces.Selection.SelectIter(iter);
+			}
+
 			logger.Debug("System selection changed: " + (system == null ? "null" : system.Name));
 			SetOkayButtonState();
 		}
-		
+
 		private void SetRaces(GameSystem system)
 		{	
 			ListStore store = new ListStore(typeof(Race));
@@ -127,18 +140,18 @@
 			
 			lstRaces.Model = store;
 		}
-		
+
 		public Race SelectedRace
 		{
 			get { return race; }
 		}
-		
+
 		public string ArmyName
 		{
 			get { return armyName; }
 		}
-		
-		public int ArmySize 
+
+		public int ArmySize
 		{
 			get { return pointsValue; }
 		}

--- a/FrmNewUnit.cs	Sun Jan 31 20:46:06 2010 +0000
+++ b/FrmNewUnit.cs	Mon Jan 17 19:43:47 2011 +0000
@@ -4,31 +4,33 @@
 
 using System;
 using System.Collections.Generic;
+using Gtk;
+using IBBoard.GtkSharp.Translatable;
 using IBBoard.WarFoundry.API.Objects;
 using IBBoard.WarFoundry.API.Requirements;
-using Gtk;
 using log4net;
+using IBBoard.Lang;
 
-namespace IBBoard.WarFoundry.GTK
+namespace IBBoard.WarFoundry.GUI.GTK
 {
-	public partial class FrmNewUnit : Gtk.Dialog
+	public partial class FrmNewUnit : TranslatableDialog
 	{
 		private ILog logger = LogManager.GetLogger(typeof(FrmNewUnit));
-		
 		private UnitType unitType;
 		private Army unitArmy;
-		
-		public FrmNewUnit(Race race, Category cat, Army army)
+		private Category cat;
+
+		public FrmNewUnit(Race race, Category category, Army army)
 		{
 			this.Build();
 			unitArmy = army;
+			cat = category;
 			
-			TreeViewColumn unitTypeColumn = new TreeViewColumn ();
-			unitTypeColumn.Title = "Unit Type";
-			CellRendererText unitTypeCell = new CellRendererText ();
+			TreeViewColumn unitTypeColumn = new TreeViewColumn();
+			CellRendererText unitTypeCell = new CellRendererText();
 			unitTypeColumn.PackStart(unitTypeCell, true);
 			lstUnitTypes.AppendColumn(unitTypeColumn);
-			unitTypeColumn.SetCellDataFunc (unitTypeCell, new TreeCellDataFunc(RenderUnitTypeName));
+			unitTypeColumn.SetCellDataFunc(unitTypeCell, new TreeCellDataFunc(RenderUnitTypeName));
 			ListStore store = new ListStore(typeof(UnitType));
 			UnitType[] types = race.GetUnitTypes(cat);
 			logger.DebugFormat("Listing {0} unit types in {1}", types.Length, cat.Name);
@@ -40,47 +42,68 @@
 			}
 			
 			lstUnitTypes.Model = store;
-			lstUnitTypes.Selection.Changed+= new EventHandler(OnSelectionChanged);
+			lstUnitTypes.Selection.Changed += new EventHandler(OnSelectionChanged);
+
+			Translation.TranslationChanged += Retranslate;
+			Translate();
+		}
+
+		private void Retranslate()
+		{
+			Translate();
 		}
-		
+
+		public override void Dispose()
+		{
+			Translation.TranslationChanged -= Retranslate;
+			base.Dispose();
+		}
+
+		protected override void Translate()
+		{
+			base.Translate();
+			lstUnitTypes.Columns[0].Title = Translation.GetTranslation("frmNewUnitNewUnitColumn", "unit type");
+			Title = Translation.GetTranslation(Name, "Create new unit", cat.Name);
+		}
+
 		private void RenderUnitTypeName(TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
 		{
 			UnitType type = (UnitType)model.GetValue(iter, 0);
 			(cell as CellRendererText).Text = type.Name;
 		}
-		
+
 		protected virtual void OnSelectionChanged(object o, EventArgs e)
 		{
 			SetSelectUnitEnabledVal();
 		}
-		
+
 		public UnitType SelectedUnit
 		{
 			get { return unitType; }
 		}
-		
+
 		private UnitType GetSelectedUnitType()
 		{		
 			TreeModel model;
 			TreeIter iter;
-			lstUnitTypes.Selection.GetSelected (out model, out iter);
+			lstUnitTypes.Selection.GetSelected(out model, out iter);
 			UnitType toReturn = null;
 			
-			if (model!=null)
+			if (model != null)
 			{
-				toReturn = (UnitType) model.GetValue(iter, 0);
+				toReturn = (UnitType)model.GetValue(iter, 0);
 			}
 			
 			return toReturn;
 		}
-		
+
 		private void SetSelectUnitEnabledVal()
 		{
 			UnitType type = GetSelectedUnitType();
 			
-			if (type!=null)
+			if (type != null)
 			{
-				buttonOk.Sensitive = true;
+				bttnCreate.Sensitive = true;
 				List<FailedUnitRequirement> fails = unitArmy.CanAddUnitType(type);
 				lblNewUnitWarning.Visible = (fails != null);
 
@@ -92,23 +115,23 @@
 			}
 			else
 			{
-				buttonOk.Sensitive = false;
+				bttnCreate.Sensitive = false;
 				lblNewUnitWarning.Visible = false;
 			}
 		}
 
-		protected virtual void OnButtonCancelActivated (object sender, System.EventArgs e)
+		protected virtual void OnButtonCancelActivated(object sender, System.EventArgs e)
 		{
 			Respond(ResponseType.Cancel);
 		}
 
-		protected virtual void OnRowActivated (object o, Gtk.RowActivatedArgs args)
+		protected virtual void OnRowActivated(object o, Gtk.RowActivatedArgs args)
 		{
 			unitType = GetSelectedUnitType();
 			Respond(ResponseType.Ok);
 		}
 
-		protected virtual void OnButtonOkClicked (object sender, System.EventArgs e)
+		protected virtual void OnButtonOkClicked(object sender, System.EventArgs e)
 		{
 			unitType = GetSelectedUnitType();
 			Respond(ResponseType.Ok);

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/FrmPreferences.cs	Mon Jan 17 19:43:47 2011 +0000
@@ -0,0 +1,120 @@
+//  This file (FrmPreferences.cs) is a part of the IBBoard.WarFoundry.GUI.GTK project and is copyright 2011 IBBoard
+// 
+//  The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
+
+using System;
+using IBBoard.GtkSharp.Translatable;
+using IBBoard.Lang;
+using Gtk;
+using System.Collections.Generic;
+using IBBoard.GtkSharp;
+using System.Globalization;
+using log4net;
+
+namespace IBBoard.WarFoundry.GUI.GTK
+{
+	public partial class FrmPreferences : TranslatableDialog
+	{
+		private ILog logger = LogManager.GetLogger(typeof(FrmPreferences));
+		private Preferences prefs;
+		private string initialLang;
+
+		public FrmPreferences(Preferences preferences)
+		{
+			prefs = preferences;
+			initialLang = Translation.GetTranslationLanguage();
+			this.Build();
+			BuildPreferenceCategoryTree();
+			BuildLanguageList();
+
+			Translation.TranslationChanged += Retranslate;
+			Translate();
+		}
+
+		private void Retranslate()
+		{
+			Translate();
+		}
+
+		public override void Dispose()
+		{
+			Translation.TranslationChanged -= Retranslate;
+			base.Dispose();
+		}
+
+		protected override void Translate()
+		{
+			base.Translate();
+			frameLabel.Text = Translation.GetTranslation("languagesGroup", "languages");
+			TreeStore model = ((TreeStore)preferencesTree.Model);
+			TreeIter iter;
+			model.GetIterFirst(out iter);
+			model.SetValue(iter, 0, Translation.GetTranslation("languagePrefSection", "Language"));
+		}
+
+		private void RenderPreference(TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
+		{
+			object obj = model.GetValue(iter, 0);
+
+			if (obj is string)
+			{
+				(cell as CellRendererText).Text = (string)obj;
+			}
+		}
+
+		private void BuildPreferenceCategoryTree()
+		{
+			TreeViewColumn mainColumn = new TreeViewColumn();
+			CellRendererText mainCell = new CellRendererText();
+			mainColumn.PackStart(mainCell, true);
+			preferencesTree.AppendColumn(mainColumn);
+			mainColumn.SetCellDataFunc(mainCell, new TreeCellDataFunc(RenderPreference));
+			TreeStore model = new TreeStore(typeof(string));
+			preferencesTree.Model = model;
+			model.AppendValues(Translation.GetTranslation("languagePrefSection", "Language"));
+		}
+
+		private void BuildLanguageList()
+		{
+			ICollection<TranslationLanguage> langs = Translation.GetLanguages();
+			List<TranslationLanguage> sortedLangs = new List<TranslationLanguage>(langs);
+			sortedLangs.Sort(CompareLanguages);
+			ComboBoxUtils.FillCombo(languageList, sortedLangs, delegate(TranslationLanguage lang){return lang.Name;});
+			ComboBoxUtils.SelectItem(languageList, Translation.GetTranslationSet(initialLang).Language);
+		}
+
+		private int CompareLanguages(TranslationLanguage lang1, TranslationLanguage lang2)
+		{
+			CompareOptions options = CompareOptions.IgnoreCase | CompareOptions.IgnoreKanaType | CompareOptions.IgnoreWidth;
+			return CultureInfo.CurrentCulture.CompareInfo.Compare(lang1.Name, lang2.Name, options);
+		}
+
+		protected virtual void bttnOkayClicked(object sender, System.EventArgs e)
+		{
+			prefs["language"] = Translation.GetTranslationLanguage();
+			prefs.Save();
+			Respond(ResponseType.Ok);
+		}
+
+		protected virtual void bttnCancelClicked(object sender, System.EventArgs e)
+		{
+			Translation.LoadTranslation(initialLang);
+			Respond(ResponseType.Cancel);
+		}
+
+		protected virtual void languageListChanged(object sender, System.EventArgs e)
+		{
+			TranslationLanguage selectedLang = ComboBoxUtils.GetSelectedItem<TranslationLanguage>(languageList);
+			string code = selectedLang == null ? "" : selectedLang.Code;
+			logger.Debug("New language: " + code);
+			Translation.LoadTranslation(code);
+			bttnOkay.Sensitive = !initialLang.Equals(code);
+
+		}
+
+
+
+
+	}
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/FrmReplaceEquipment.cs	Mon Jan 17 19:43:47 2011 +0000
@@ -0,0 +1,269 @@
+//  This file (FrmAddEquipment.cs) is a part of the IBBoard.WarFoundry.GUI.GTK project and is copyright 2010 IBBoard
+// 
+//  The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
+
+using System;
+using Gtk;
+using IBBoard.GtkSharp;
+using IBBoard.GtkSharp.Translatable;
+using IBBoard.Lang;
+using IBBoard.WarFoundry.API.Objects;
+using IBBoard.WarFoundry.GUI.GTK.UIControl.Interfaces;
+using IBBoard.WarFoundry.GUI.GTK.Util;
+using log4net;
+
+namespace IBBoard.WarFoundry.GUI.GTK
+{
+	public partial class FrmReplaceEquipment : TranslatableDialog, IReplaceEquipmentUI
+	{
+		private static ILog log = LogManager.GetLogger(typeof(FrmReplaceEquipment));
+
+		public event SingleArgMethodInvoker<UnitEquipmentItem> UnitEquipmentItemChoiceChanged;
+		public event MethodInvoker UnitEquipmentAmountTypeChanged;
+		public event MethodInvoker UnitEquipmentAmountChanged;
+
+		private bool isRatioLimited;
+
+		public FrmReplaceEquipment()
+		{
+			this.Build();
+			lstEquipment.Selection.Changed += OnSelectionChanged;
+			TreeViewColumn equipColumn = new TreeViewColumn();
+			equipColumn.Title = "Equipment";
+			CellRendererText equipCell = new CellRendererText();
+			equipColumn.PackStart(equipCell, true);
+			equipColumn.SetCellDataFunc(equipCell, GtkWarFoundryUtil.RenderWarFoundryObjectName);
+			lstEquipment.AppendColumn(equipColumn);			
+
+			Translation.TranslationChanged += Retranslate;
+			Translate();
+		}
+
+		private void Retranslate()
+		{
+			Translate();
+		}
+
+		public override void Dispose()
+		{
+			Translation.TranslationChanged -= Retranslate;
+			base.Dispose();
+		}
+
+		public void ListenToWidgets()
+		{
+			rbEquipAll.Clicked += RadioButtonClicked;
+			rbEquipNumeric.Clicked += RadioButtonClicked;
+			rbEquipPercent.Clicked += RadioButtonClicked;
+			numericAmount.ValueChanged += SpinButtonValueChanged;
+			percentageAmount.ValueChanged += SpinButtonValueChanged;
+			lstEquipment.Selection.Changed += OnSelectionChanged;
+		}
+
+		public void IgnoreWidgets()
+		{
+			rbEquipAll.Clicked -= RadioButtonClicked;
+			rbEquipNumeric.Clicked -= RadioButtonClicked;
+			rbEquipPercent.Clicked -= RadioButtonClicked;
+			numericAmount.ValueChanged -= SpinButtonValueChanged;
+			percentageAmount.ValueChanged -= SpinButtonValueChanged;
+			lstEquipment.Selection.Changed -= OnSelectionChanged;
+		}
+
+		private void OnUnitEquipmentAmountChanged()
+		{
+			if (UnitEquipmentAmountChanged != null)
+			{
+				UnitEquipmentAmountChanged();
+			}
+		}
+
+		private void OnUnitEquipmentAmountTypeChanged()
+		{
+			if (UnitEquipmentAmountChanged != null)
+			{
+				UnitEquipmentAmountTypeChanged();
+			}
+		}
+
+		protected void OnSelectionChanged(object o, EventArgs e)
+		{
+			if (UnitEquipmentItemChoiceChanged != null)
+			{
+				UnitEquipmentItemChoiceChanged(SelectedUnitEquipmentItem);
+			}
+		}
+
+		public void SetUnitEquipmentItems(UnitEquipmentItem[] items)
+		{
+			ListStore store = new ListStore(typeof(UnitEquipmentItem));
+			
+			foreach (UnitEquipmentItem equipItem in items)
+			{
+				store.AppendValues(equipItem);
+			}
+			
+			lstEquipment.Model = store;
+		}
+
+		public void SetUnitEquipmentLimits(bool isRatioLimit, double minPercent, double maxPercent, int minNumber, int maxNumber)
+		{
+			log.DebugFormat("IsRatio? {0}. Limits: {1}->{2}, {3}%->{4}%", isRatioLimit, minNumber, maxNumber, minPercent, maxPercent);
+			numericAmount.SetRange(minNumber, maxNumber);
+			percentageAmount.SetRange(minPercent, maxPercent);
+			isRatioLimited = isRatioLimit;
+			
+			if (isRatioLimit)
+			{
+				if (minPercent == 100)
+				{
+					rbEquipAll.Active = true;
+				}
+				else
+				{
+					rbEquipPercent.Active = true;
+				}
+			}
+			else
+			{
+				rbEquipNumeric.Active = true;
+			}
+		}
+
+		public void SetUnitEquipmentLimitsEnabled(bool isEnabled)
+		{
+			SetNumericAmountEnabledState(isEnabled);
+			SetPercentageAmountEnabledState(isEnabled);
+		}
+
+		public bool ShowControl()
+		{
+			int result = Run();
+			bool okayClicked = (result == (int)ResponseType.Ok);
+			this.Hide();
+			return okayClicked;
+		}
+
+		protected virtual void CancelButtonClicked(object sender, System.EventArgs e)
+		{
+			log.Debug("Cancel clicked");
+			Respond(ResponseType.Cancel);
+		}	
+
+		protected virtual void OkayButtonClicked(object sender, System.EventArgs e)
+		{
+			log.Debug("Okay clicked");
+			Respond(ResponseType.Ok);
+		}		
+
+		public void SetOkayEnabledState(bool enabled)
+		{
+			bttnOkay.Sensitive = enabled;
+		}
+
+		protected virtual void SpinButtonValueChanged(object sender, System.EventArgs e)
+		{
+			OnUnitEquipmentAmountChanged();
+		}		
+
+		protected virtual void RadioButtonClicked(object sender, System.EventArgs e)
+		{
+			OnUnitEquipmentAmountTypeChanged();
+		}
+
+		public void SetNumericAmountEnabledState(bool enabled)
+		{
+			double minPercent = GetMinPercentage();
+			rbEquipNumeric.Sensitive = enabled && !(isRatioLimited && minPercent == 100);
+			numericAmount.Sensitive = rbEquipNumeric.Sensitive;
+		}		
+
+		public void SetPercentageAmountEnabledState(bool enabled)
+		{
+			if (enabled)
+			{
+				double minPercentage = GetMinPercentage();
+				rbEquipPercent.Sensitive = isRatioLimited && minPercentage != 100;
+				percentageAmount.Sensitive = rbEquipPercent.Sensitive;
+				double maxPercentage = GetMaxPercentage();				
+				rbEquipAll.Sensitive = isRatioLimited && maxPercentage == 100;
+				lblEquipAll.Sensitive = rbEquipAll.Sensitive;
+			}
+			else
+			{
+				rbEquipPercent.Sensitive = false;
+				percentageAmount.Sensitive = false;
+				rbEquipAll.Sensitive = false;
+				lblEquipAll.Sensitive = false;
+			}
+		}
+
+		private double GetMaxPercentage()
+		{
+			double min, max;
+			percentageAmount.GetRange(out min, out max);
+			return max;
+		}
+
+		private double GetMinPercentage()
+		{
+			double min, max;
+			percentageAmount.GetRange(out min, out max);
+			return min;
+		}
+
+		public UnitEquipmentItem SelectedUnitEquipmentItem
+		{
+			get
+			{
+				return (UnitEquipmentItem)TreeUtils.GetSelectedItem(lstEquipment);
+			}
+		}
+
+		public bool IsRatioEquipmentAmount
+		{
+			get
+			{
+				return !rbEquipNumeric.Active;
+			}
+		}
+
+		public int EquipmentNumericAmount
+		{
+			get
+			{
+				return (int)numericAmount.Value;
+			}
+			
+			set
+			{
+				numericAmount.Value = value;
+			}
+		}
+
+		public double EquipmentPercentageAmount
+		{
+			get
+			{
+				double percent;
+				
+				if (rbEquipAll.Active)
+				{
+					percent = 100;
+				}
+				else
+				{
+					percent = percentageAmount.Value;
+				}
+				
+				return percent;
+			}
+			
+			set
+			{
+				percentageAmount.Value = value;
+			}
+		}
+	}
+}
+

--- a/IBBoard.WarFoundry.GUI.GTK.csproj	Sun Jan 31 20:46:06 2010 +0000
+++ b/IBBoard.WarFoundry.GUI.GTK.csproj	Mon Jan 17 19:43:47 2011 +0000
@@ -9,8 +9,9 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>IBBoard.WarFoundry.GUI.GTK</RootNamespace>
-    <StartupObject>IBBoard.WarFoundry.GTK.FrmMainWindow</StartupObject>
+    <StartupObject>IBBoard.WarFoundry.GUI.GTK.FrmMainWindow</StartupObject>
     <ApplicationIcon>App.ico</ApplicationIcon>
+    <AssemblyName>WarFoundry-GTK</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -20,7 +21,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AssemblyName>WarFoundryGTK</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,7 +29,6 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AssemblyName>IBBoard.WarFoundry.GUI.GTK</AssemblyName>
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -46,10 +45,32 @@
     <Compile Include="FrmNewUnit.cs" />
     <Compile Include="Widgets\UnitDisplayWidget.cs" />
     <Compile Include="gtk-gui\generated.cs" />
-    <Compile Include="gtk-gui\IBBoard.WarFoundry.GTK.FrmMainWindow.cs" />
-    <Compile Include="gtk-gui\IBBoard.WarFoundry.GTK.FrmNewArmy.cs" />
-    <Compile Include="gtk-gui\IBBoard.WarFoundry.GTK.FrmNewUnit.cs" />
-    <Compile Include="gtk-gui\IBBoard.WarFoundry.GTK.Widgets.UnitDisplayWidget.cs" />
+    <Compile Include="UIControl\AddEquipmentUIControl.cs" />
+    <Compile Include="UIControl\Interfaces\IAddEquipmentUI.cs" />
+    <Compile Include="FrmAddEquipment.cs" />
+    <Compile Include="gtk-gui\IBBoard.WarFoundry.GUI.GTK.FrmAddEquipment.cs" />
+    <Compile Include="Util\GtkWarFoundryUtil.cs" />
+    <Compile Include="UIControl\EditEquipmentUIControl.cs" />
+    <Compile Include="UIControl\Interfaces\IEditEquipmentUI.cs" />
+    <Compile Include="gtk-gui\IBBoard.WarFoundry.GUI.GTK.FrmEditEquipment.cs" />
+    <Compile Include="FrmEditEquipment.cs" />
+    <Compile Include="UIControl\AbstractBaseEquipmentUIControl.cs" />
+    <Compile Include="UIControl\Interfaces\IBaseEquipmentUI.cs" />
+    <Compile Include="UIControl\Interfaces\ISelectableItemEquipmentUI.cs" />
+    <Compile Include="UIControl\Interfaces\IReplaceEquipmentUI.cs" />
+    <Compile Include="FrmReplaceEquipment.cs" />
+    <Compile Include="UIControl\ReplaceEquipmentUIControl.cs" />
+    <Compile Include="gtk-gui\IBBoard.WarFoundry.GUI.GTK.FrmReplaceEquipment.cs" />
+    <Compile Include="FrmAbout.cs" />
+    <Compile Include="gtk-gui\IBBoard.WarFoundry.GUI.GTK.FrmAbout.cs" />
+    <Compile Include="gtk-gui\IBBoard.WarFoundry.GUI.GTK.FrmMainWindow.cs" />
+    <Compile Include="gtk-gui\IBBoard.WarFoundry.GUI.GTK.FrmNewArmy.cs" />
+    <Compile Include="gtk-gui\IBBoard.WarFoundry.GUI.GTK.FrmNewUnit.cs" />
+    <Compile Include="gtk-gui\IBBoard.WarFoundry.GUI.GTK.Widgets.UnitDisplayWidget.cs" />
+    <Compile Include="FrmAboutCredits.cs" />
+    <Compile Include="gtk-gui\IBBoard.WarFoundry.GUI.GTK.FrmAboutCredits.cs" />
+    <Compile Include="FrmPreferences.cs" />
+    <Compile Include="gtk-gui\IBBoard.WarFoundry.GUI.GTK.FrmPreferences.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="App.png" />
@@ -59,13 +80,16 @@
     <None Include="translations\en.translation">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="WarFoundryGTK.exe.log4net">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="gtk-gui\gui.stetic" />
     <None Include="gtk-gui\objects.xml" />
     <None Include="COPYING" />
-    <None Include="WarFoundryGTKPref.xml">
+    <None Include="WarFoundry-GTK.exe.log4net">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="WarFoundry-GTKPref.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="translations\fr.translation">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
@@ -102,5 +126,11 @@
     <EmbeddedResource Include="App.ico">
       <LogicalName>App.ico</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="App-lrg.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="UIControl\" />
+    <Folder Include="UIControl\Interfaces\" />
+    <Folder Include="Util\" />
   </ItemGroup>
 </Project>
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/IBBoard.WarFoundry.GUI.GTK.sln	Mon Jan 17 19:43:47 2011 +0000
@@ -0,0 +1,86 @@
+
+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
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBBoard.NUnit", "..\IBBoard.NUnit\IBBoard.NUnit.csproj", "{C52AFD32-B869-4E14-AACE-2846AD2CC742}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IBBoard.NUnit.Tests", "..\IBBoard.NUnit.Tests\IBBoard.NUnit.Tests.csproj", "{2025A316-8377-4454-807C-3C4ED02DF4D5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpZLib", "..\SharpZipLib\ICSharpCode.SharpZLib.csproj", "{0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}"
+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
+		{0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}.Debug|x86.Build.0 = Debug|Any CPU
+		{0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}.Release|x86.ActiveCfg = Release|Any CPU
+		{0E7413FF-EB9E-4714-ACF2-BE3A6A7B2FFD}.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
+		{2025A316-8377-4454-807C-3C4ED02DF4D5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2025A316-8377-4454-807C-3C4ED02DF4D5}.Debug|x86.Build.0 = Debug|Any CPU
+		{2025A316-8377-4454-807C-3C4ED02DF4D5}.Release|x86.ActiveCfg = Release|Any CPU
+		{2025A316-8377-4454-807C-3C4ED02DF4D5}.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
+		{C52AFD32-B869-4E14-AACE-2846AD2CC742}.Debug|x86.ActiveCfg = Debug|x86
+		{C52AFD32-B869-4E14-AACE-2846AD2CC742}.Debug|x86.Build.0 = Debug|x86
+		{C52AFD32-B869-4E14-AACE-2846AD2CC742}.Release|x86.ActiveCfg = Release|x86
+		{C52AFD32-B869-4E14-AACE-2846AD2CC742}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = IBBoard.WarFoundry.GUI.GTK.csproj
+	EndGlobalSection
+EndGlobal

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/UIControl/AbstractBaseEquipmentUIControl.cs	Mon Jan 17 19:43:47 2011 +0000
@@ -0,0 +1,281 @@
+//  This file (AbstractBaseEquipmentUIControl.cs) is a part of the IBBoard.WarFoundry.GUI.GTK project and is copyright 2010 IBBoard
+// 
+//  The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
+
+using System;
+using IBBoard.Commands;
+using IBBoard.WarFoundry.API.Objects;
+using IBBoard.WarFoundry.GUI.GTK.UIControl.Interfaces;
+using IBBoard.Lang;
+using IBBoard.WarFoundry.API.Util;
+
+namespace IBBoard.WarFoundry.GUI.GTK.UIControl
+{
+	public abstract class AbstractBaseEquipmentUIControl<UI_TYPE> where UI_TYPE : IBaseEquipmentUI
+	{
+		protected CommandStack commandStack;
+		protected Unit unit;
+		protected UI_TYPE ui;
+		protected UnitEquipmentItem equipItem;
+		protected double minPercentage, maxPercentage;
+		protected int minNumber, maxNumber;
+		protected bool isRatioAmount;
+		protected double equipmentAmount;
+
+		public AbstractBaseEquipmentUIControl(Unit unit, CommandStack commandStack)
+		{
+			this.unit = unit;
+			this.commandStack = commandStack;
+		}
+
+		private void SetupUI()
+		{
+			ui = CreateEquipmentUI();
+			ui.SetUnitEquipmentLimitsEnabled(false);
+			ui.SetOkayEnabledState(false);
+			CompleteUISetup();
+			ui.UnitEquipmentAmountChanged += HandleUnitEquipmentAmountChanged;
+			ui.UnitEquipmentAmountTypeChanged += HandleUnitEquipmentAmountChanged;
+			ui.ListenToWidgets();
+		}
+		
+		/// <summary>
+		/// Creates the UI component that will be displayed to the user and returns it
+		/// </summary>
+		/// <returns>
+		/// the UI component to display to the user
+		/// </returns>
+
+		protected abstract UI_TYPE CreateEquipmentUI();
+		
+		/// <summary>
+		/// Completes any additional user interface setup.
+		/// </summary>
+
+		protected virtual void CompleteUISetup()
+		{
+			//Do nothing
+		}
+
+		protected void HandleUnitEquipmentAmountChanged()
+		{
+			SetUnitEquipmentValuesFromUI();
+		}
+
+		protected void SetUnitEquipmentLimits(UnitEquipmentItem equip)
+		{			
+			ui.IgnoreWidgets();
+			
+			if (equip != null)
+			{
+				bool equipIsRatioLimit = UnitEquipmentUtil.IsEquipmentRatioLimited(unit, equip);
+				maxPercentage = GetMaxPercentageLimit(equip);
+				minPercentage = GetMinPercentageLimit(equip);
+				maxNumber = GetMaxNumericLimit(equip);
+				minNumber = GetMinNumericLimit(equip);
+			
+				ui.SetUnitEquipmentLimits(equipIsRatioLimit, minPercentage, maxPercentage, minNumber, maxNumber);
+				ui.SetUnitEquipmentLimitsEnabled(true);
+				ui.SetOkayEnabledState(HasNonZeroEquipmentAmount());
+				SetEquipmentAmountControlEnabledStates();
+			}
+			else
+			{
+				maxPercentage = minPercentage = 0;
+				maxNumber = minNumber = 0;
+				ui.SetUnitEquipmentLimits(false, minPercentage, maxPercentage, minNumber, maxNumber);
+				ui.SetUnitEquipmentLimitsEnabled(false);
+				ui.SetOkayEnabledState(false);
+			}
+			
+			ui.ListenToWidgets();
+		}
+
+		protected void SetUnitEquipmentValuesFromEquipment(UnitEquipmentItem equip)
+		{			
+			isRatioAmount = UnitEquipmentUtil.GetEquipmentAmountIsRatio(unit, equip);
+			equipmentAmount = UnitEquipmentUtil.GetEquipmentAmount(unit, equip);			
+			SetUnitEquipmentValues();
+			SetEquipmentAmountControlEnabledStates();
+		}
+
+		/// <summary>
+		/// Sets the unit equipment values on the UI
+		/// </summary>
+
+		protected void SetUnitEquipmentValuesFromUI()
+		{			
+			isRatioAmount = ui.IsRatioEquipmentAmount;
+			
+			if (isRatioAmount)
+			{
+				equipmentAmount = ui.EquipmentPercentageAmount;
+			}
+			else
+			{
+				int equipmentIntAmount = ui.EquipmentNumericAmount;
+				equipmentAmount = equipmentIntAmount;
+			}
+			
+			SetUnitEquipmentValues();
+		}
+
+		private void SetUnitEquipmentValues()
+		{			
+			ui.IgnoreWidgets();
+			
+			if (isRatioAmount)
+			{
+				SetEquipmentAmountsFromPercentage(equipmentAmount);
+			}
+			else
+			{
+				int equipmentIntAmount = (int)equipmentAmount;
+				SetEquipmentAmountsFromNumber(equipmentIntAmount);
+			}
+			
+			ui.SetOkayEnabledState(equipmentAmount != 0);
+			ui.ListenToWidgets();
+		}
+
+		private void SetEquipmentAmountsFromPercentage(double equipAmount)
+		{
+			if (equipAmount > maxPercentage)
+			{
+				string percentageTooLarge = Translation.GetTranslation("equipPercentageTooLarge", "the current percentage ({0}%) was larger than the maximum for the equipment item ({1}%) - the maximum value will be used instead", equipAmount, maxPercentage);
+				string percentageTooLargeTitle = Translation.GetTranslation("equipPercentageTooLargeTitle", "equipment percentage too large");
+				ShowMessage(percentageTooLarge, percentageTooLargeTitle);
+				equipAmount = maxPercentage;
+			}
+			else
+			{
+				if (equipAmount < minPercentage)
+				{
+					string percentageTooSmall = Translation.GetTranslation("equipPercentageTooSmall", "the current percentage ({0}%) was smaller than the minimum for the equipment item ({1}%) - the minimum value will be used instead", equipAmount, minPercentage);
+					string percentageTooSmallTitle = Translation.GetTranslation("equipPercentageTooSmallTitle", "equipment percentage too small");
+					ShowMessage(percentageTooSmall, percentageTooSmallTitle);
+					equipAmount = minPercentage;
+				}
+
+			}			
+			ui.EquipmentNumericAmount = CalculateNumericValueFromPercentage(equipAmount);
+			ui.EquipmentPercentageAmount = equipAmount;
+		}
+
+		private int CalculateNumericValueFromPercentage(double percent)
+		{
+			int calcedAmount = (int)CustomMath.IBBMath.Round((unit.Size * (percent / 100.0)), equipItem.RoundNumberUp);
+			return Math.Min(Math.Max(calcedAmount, minNumber), maxNumber);
+		}
+
+		private void ShowMessage(string message, string title)
+		{
+			Gtk.MessageDialog dialog = new Gtk.MessageDialog(null, Gtk.DialogFlags.Modal, Gtk.MessageType.Warning, Gtk.ButtonsType.Ok, false, message);
+			dialog.Title = title;
+			dialog.Run();
+			dialog.Hide();
+			dialog.Dispose();
+		}
+
+		private void SetEquipmentAmountsFromNumber(int equipAmount)
+		{
+			if (equipAmount > maxNumber)
+			{
+				string amountTooLarge = Translation.GetTranslation("equipNumberTooLarge", "the current amount ({0}) was larger than the maximum for the equipment item ({1}) - the maximum value will be used instead", equipAmount, maxNumber);
+				string amountTooLargeTitle = Translation.GetTranslation("equipNumberTooLargeTitle", "equipment amount too large");
+				ShowMessage(amountTooLarge, amountTooLargeTitle);
+				equipAmount = maxNumber;
+			}
+			else
+			{
+				if (equipAmount < minNumber)
+				{
+					string amountTooSmall = Translation.GetTranslation("equipNumberTooSmall", "the current amount ({0}) was smaller than the minimum for the equipment item ({1}) - the minimum value will be used instead", equipAmount, minNumber);
+					string amountTooSmallTitle = Translation.GetTranslation("equipNumberTooSmallTitle", "equipment amount too small");
+					ShowMessage(amountTooSmall, amountTooSmallTitle);
+					equipAmount = minNumber;
+				}
+
+			}			
+			ui.EquipmentPercentageAmount = CalcualtePercentageValueFromNumber(equipAmount);
+			ui.EquipmentNumericAmount = equipAmount;
+		}
+
+		private double CalcualtePercentageValueFromNumber(int number)
+		{
+			double calcedAmount = RoundPercentage(CustomMath.IBBMath.Percentage(number, unit.Size));
+			return Math.Min(Math.Max(calcedAmount, minPercentage), maxPercentage);
+		}
+
+		protected void SetEquipmentAmountControlEnabledStates()
+		{
+			ui.SetNumericAmountEnabledState(!isRatioAmount);
+			ui.SetPercentageAmountEnabledState(true);
+		}
+
+		protected double GetMaxPercentageLimit(UnitEquipmentItem equip)
+		{
+			double maxPercent = RoundPercentage(UnitEquipmentUtil.GetMaxEquipmentPercentage(unit, equip));
+			return Math.Max(0, maxPercent);
+		}
+
+		protected double GetMinPercentageLimit(UnitEquipmentItem equip)
+		{
+			double minPercent = RoundPercentage(UnitEquipmentUtil.GetMinEquipmentPercentage(unit, equip));
+			return Math.Max(0, minPercent);
+		}
+
+		protected int GetMaxNumericLimit(UnitEquipmentItem equip)
+		{
+			int maxNumber = UnitEquipmentUtil.GetMaxEquipmentCount(unit, equip);
+			return Math.Max(0, maxNumber);
+		}
+
+		protected int GetMinNumericLimit(UnitEquipmentItem equip)
+		{
+			int minNumber = UnitEquipmentUtil.GetMinEquipmentCount(unit, equip);
+			return Math.Max(0, minNumber);
+		}
+
+		protected bool HasNonZeroEquipmentAmount()
+		{
+			bool nonZero;
+			
+			if (isRatioAmount)
+			{
+				nonZero = (ui.EquipmentPercentageAmount > 0);
+			}
+			else
+			{
+				nonZero = (ui.EquipmentNumericAmount > 0);
+			}
+			
+			return nonZero;
+		}
+
+		private double RoundPercentage(double percent)
+		{
+			return Math.Round(percent, 1);
+		}
+
+		public void Show()
+		{			
+			SetupUI();
+			bool okayed = ui.ShowControl();
+			
+			if (okayed)
+			{
+				DoProcessing();
+			}
+			
+			ui.Dispose();
+		}	
+		
+		/// <summary>
+		/// Does the processing required for the control when the "OK" button was clicked
+		/// </summary>
+
+		protected abstract void DoProcessing();
+	}
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/UIControl/AddEquipmentUIControl.cs	Mon Jan 17 19:43:47 2011 +0000
@@ -0,0 +1,63 @@
+//  This file (AddEquipmentUIControl.cs) is a part of the IBBoard.WarFoundry.GUI.GTK project and is copyright 2010 IBBoard
+// 
+// The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
+
+using IBBoard.Commands;
+using IBBoard.WarFoundry.API.Commands;
+using IBBoard.WarFoundry.API.Objects;
+using IBBoard.WarFoundry.API.Util;
+using IBBoard.WarFoundry.GUI.GTK.UIControl.Interfaces;
+using CustomMath = IBBoard.CustomMath;
+
+namespace IBBoard.WarFoundry.GUI.GTK.UIControl
+{
+	public class AddEquipmentUIControl : AbstractBaseEquipmentUIControl<IAddEquipmentUI>
+	{		
+		public AddEquipmentUIControl(Unit unit, CommandStack commandStack) : base(unit, commandStack)
+		{
+			//Do nothing extra
+		}
+
+		//TODO Make abstract
+
+		protected override IAddEquipmentUI CreateEquipmentUI()
+		{
+			return new FrmAddEquipment();
+		}
+
+		protected override void CompleteUISetup()
+		{
+			ui.SetUnitEquipmentItems(GetEquipmentItems(unit));
+			ui.UnitEquipmentItemChoiceChanged += HandleUiUnitEquipmentItemChoiceChanged;
+		}
+
+		public static UnitEquipmentItem[] GetEquipmentItems(Unit unit)
+		{
+			return Arrays.Subtract(UnitEquipmentUtil.GetAllowedEquipmentItems(unit), unit.GetEquipment());
+		}
+
+		public static bool HasEquipmentToAdd(Unit unit)
+		{
+			return GetEquipmentItems(unit).Length > 0;
+		}
+
+		private void HandleUiUnitEquipmentItemChoiceChanged(UnitEquipmentItem equip)
+		{
+			equipItem = equip;
+			SetUnitEquipmentLimits(equip);
+		}
+
+		protected override void DoProcessing()
+		{
+			if (isRatioAmount)
+			{
+				commandStack.Execute(new SetUnitEquipmentRatioAmountCommand(unit, equipItem, equipmentAmount));
+			}
+			else
+			{
+				commandStack.Execute(new SetUnitEquipmentNumericAmountCommand(unit, equipItem, (int)equipmentAmount));
+			}
+		}
+	}
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/UIControl/EditEquipmentUIControl.cs	Mon Jan 17 19:43:47 2011 +0000
@@ -0,0 +1,51 @@
+//  This file (EditEquipmentUIControl.cs) is a part of the IBBoard.WarFoundry.GUI.GTK project and is copyright 2010 IBBoard
+// 
+//  // The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
+
+using System;
+using IBBoard.Commands;
+using IBBoard.WarFoundry.API.Objects;
+using IBBoard.WarFoundry.API.Util;
+using IBBoard.WarFoundry.GUI.GTK.UIControl.Interfaces;
+using IBBoard.WarFoundry.API.Commands;
+using CustomMath = IBBoard.CustomMath;
+using IBBoard.Lang;
+using IBBoard.WarFoundry.GUI.GTK;
+
+namespace IBBoard.WarFoundry.GUI.GTK.UIControl
+{
+	public class EditEquipmentUIControl : AbstractBaseEquipmentUIControl<IEditEquipmentUI>
+	{		
+		public EditEquipmentUIControl(Unit unit, UnitEquipmentItem item, CommandStack commandStack) : base(unit, commandStack)
+		{
+			this.equipItem = item;
+		}
+
+		//TODO Make abstract
+
+		protected override IEditEquipmentUI CreateEquipmentUI()
+		{
+			return new FrmEditEquipment();
+		}
+		
+		protected override void CompleteUISetup()
+		{
+			SetUnitEquipmentLimits(equipItem);
+			SetUnitEquipmentValuesFromEquipment(equipItem);
+			ui.SetEquipmentAmountType(UnitEquipmentUtil.GetEquipmentAmountIsRatio(unit, equipItem));
+		}
+
+		protected override void DoProcessing()
+		{
+			if (isRatioAmount)
+			{
+				commandStack.Execute(new SetUnitEquipmentRatioAmountCommand(unit, equipItem, equipmentAmount));
+			}
+			else
+			{
+				commandStack.Execute(new SetUnitEquipmentNumericAmountCommand(unit, equipItem, (int)equipmentAmount));
+			}
+		}
+	}
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/UIControl/Interfaces/IAddEquipmentUI.cs	Mon Jan 17 19:43:47 2011 +0000
@@ -0,0 +1,16 @@
+//  This file (IAddEquipmentUI.cs) is a part of the IBBoard.WarFoundry.GUI.GTK project and is copyright 2010 IBBoard
+// 
+//  The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
+using System;
+using IBBoard.WarFoundry.API.Objects;
+namespace IBBoard.WarFoundry.GUI.GTK.UIControl.Interfaces
+{
+	/// <summary>
+	/// The interface that UI components should implement to represent "Add Equipment" dialogs or system equivalents (e.g. console areas or HTML fragments)
+	/// </summary>
+	public interface IAddEquipmentUI : ISelectableItemEquipmentUI
+	{
+		//Marker interface
+	}
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/UIControl/Interfaces/IBaseEquipmentUI.cs	Mon Jan 17 19:43:47 2011 +0000
@@ -0,0 +1,144 @@
+//  This file (IBaseEquipmentUI.cs) is a part of the IBBoard.WarFoundry.GUI.GTK project and is copyright 2010 IBBoard
+// 
+//  The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
+
+using System;
+
+namespace IBBoard.WarFoundry.GUI.GTK.UIControl.Interfaces
+{
+	/// <summary>
+	/// The base interface that all "UI control" controlled interfaces implement. It provides common definitions for all classes
+	/// </summary>
+	public interface IBaseEquipmentUI : IDisposable
+	{
+		/// <summary>
+		/// Occurs when the unit equipment amount type changes (e.g. percentage to numeric)
+		/// </summary>
+		event MethodInvoker UnitEquipmentAmountTypeChanged;
+
+		/// <summary>
+		/// Occurs when the unit equipment amount changes
+		/// </summary>
+
+		event MethodInvoker UnitEquipmentAmountChanged;
+		
+		/// <summary>
+		/// Causes the UI to listen to its widgets and fire events
+		/// </summary>
+
+		void ListenToWidgets();
+		
+		/// <summary>
+		/// Causes the UI to ignore the widgets so that changes do not fire events
+		/// </summary>
+
+		void IgnoreWidgets();
+
+		/// <summary>
+		/// Sets the limits for the currently selected equipment item
+		/// </summary>
+		/// <param name='isRatioLimit'>
+		/// <code>True</code> if the current limit is a ratio limit, else <code>false</code> for absolute limits
+		/// </param>
+		/// <param name='minPercent'>
+		/// The minimum limit as a percentage
+		/// </param>
+		/// <param name='maxPercent'>
+		/// The maximum limit as a percentage
+		/// </param>
+		/// <param name='minNumber'>
+		/// The minimum number as an absolute figure
+		/// </param>
+		/// <param name='maxNumber'>
+		/// The maximum number as an absolute figure
+		/// </param>
+
+		void SetUnitEquipmentLimits(bool isRatioLimit, double minPercent, double maxPercent, int minNumber, int maxNumber);
+
+		/// <summary>
+		/// Sets whether the unit equipment limit UI components should be enabled and able to accept input. This will 
+		/// generally pass the values on to the <see cref="SetNumericAmountEnabledState(bool)"/> and
+		/// <see cref="SetPercentageAmountEnabledState(bool)"/> methods and is included for convenience
+		/// </summary>
+		/// <param name='isEnabled'>
+		/// <code>True</code> if the UI components should accept input, else <code>false</code>
+		/// </param>
+
+		void SetUnitEquipmentLimitsEnabled(bool isEnabled);
+
+		/// <summary>
+		/// Shows the control and awaits a user action (close or okay)
+		/// </summary>
+		/// <returns>
+		/// <code>true</code> if the control was closed with "Okay", else <code>false</code>
+		/// </returns>
+
+		bool ShowControl();
+
+		/// <summary>
+		/// Gets a value indicating whether the equipment amount is a ratio or an absolute number.
+		/// </summary>
+		/// <value>
+		/// <c>true</c> if the selected amount is a ratio type (percentage or "all"); otherwise, <c>false</c>.
+		/// </value>
+
+		bool IsRatioEquipmentAmount
+		{
+			get;
+		}
+
+		/// <summary>
+		/// Gets and sets the numeric amount for the current equipment amount. This number is meaningless if <see cref="IsRatioEquipmentAmount"/> is <code>true</code>
+		/// </summary>
+		/// <value>
+		/// The absolue number of items taken.
+		/// </value>
+
+		int EquipmentNumericAmount
+		{
+			get;
+			set;
+		}
+
+		/// <summary>
+		/// Gets and sets the percentage amount for the current equipment amount. This number is meaningless if <see cref="IsRatioEquipmentAmount"/> is <code>false</code>
+		/// </summary>
+		/// <value>
+		/// The number of items taken as a percentage of the unit size.
+		/// </value>
+
+		double EquipmentPercentageAmount
+		{
+			get;
+			set;
+		}
+
+		/// <summary>
+		/// Sets the state of the Okay button.
+		/// </summary>
+		/// <param name='enabled'>
+		/// <code>true</code> to enable the button, else <code>false</code>
+		/// </param>
+
+		void SetOkayEnabledState(bool enabled);
+
+		/// <summary>
+		/// Sets the state of the numeric equipment amount control.
+		/// </summary>
+		/// <param name='enabled'>
+		/// <code>true</code> to enable the control, else <code>false</code>
+		/// </param>
+
+		void SetNumericAmountEnabledState(bool enabled);
+
+		/// <summary>
+		/// Sets the state of the percentage equipment amount control.
+		/// </summary>
+		/// <param name='enabled'>
+		/// <code>true</code> to enable the control, else <code>false</code>
+		/// </param>
+
+		void SetPercentageAmountEnabledState(bool enabled);
+	}
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/UIControl/Interfaces/IEditEquipmentUI.cs	Mon Jan 17 19:43:47 2011 +0000
@@ -0,0 +1,24 @@
+//  This file (IEditEquipmentUI.cs) is a part of the IBBoard.WarFoundry.GUI.GTK project and is copyright 2010 IBBoard
+// 
+//  The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
+
+using System;
+using IBBoard.WarFoundry.API.Objects;
+
+namespace IBBoard.WarFoundry.GUI.GTK.UIControl.Interfaces
+{
+	/// <summary>
+	/// The interface that UI components should implement to represent "Edit Equipment" dialogs or system equivalents (e.g. console areas or HTML fragments)
+	/// </summary>
+	public interface IEditEquipmentUI : IBaseEquipmentUI
+	{
+		/// <summary>
+		/// Sets the type of the equipment amount.
+		/// </summary>
+		/// <param name='isRatioLimit'>
+		/// <code>True</code> for ratio selection amounts, else <code>false</code> for numeric amounts
+		/// </param>
+		void SetEquipmentAmountType(bool isRatioLimit);
+	}
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/UIControl/Interfaces/IReplaceEquipmentUI.cs	Mon Jan 17 19:43:47 2011 +0000
@@ -0,0 +1,17 @@
+//  This file (IReplaceEquipmentUI.cs) is a part of the IBBoard.WarFoundry.GUI.GTK project and is copyright 2010 IBBoard
+// 
+//  The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
+
+using System;
+
+namespace IBBoard.WarFoundry.GUI.GTK.UIControl.Interfaces
+{
+	/// <summary>
+	/// The interface that UI components should implement to represent "Replace Equipment" dialogs or system equivalents (e.g. console areas or HTML fragments)
+	/// </summary>
+	public interface IReplaceEquipmentUI : ISelectableItemEquipmentUI
+	{
+		//Marker interface
+	}
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/UIControl/Interfaces/ISelectableItemEquipmentUI.cs	Mon Jan 17 19:43:47 2011 +0000
@@ -0,0 +1,38 @@
+//  This file (ISelectableItemEquipmentUI.cs) is a part of the IBBoard.WarFoundry.GUI.GTK project and is copyright 2010 IBBoard
+// 
+//  The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
+using System;
+using IBBoard.WarFoundry.API.Objects;
+namespace IBBoard.WarFoundry.GUI.GTK.UIControl.Interfaces
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public interface ISelectableItemEquipmentUI : IBaseEquipmentUI
+	{
+		/// <summary>
+		/// Should be fired when unit equipment item choice changes.
+		/// </summary>
+		event SingleArgMethodInvoker<UnitEquipmentItem> UnitEquipmentItemChoiceChanged;
+
+		/// <summary>
+		/// Sets the equipment items that should be displayed on the form
+		/// </summary>
+		/// <param name='items'>
+		/// The equipment items that should be displayed on the form
+		/// </param>
+		void SetUnitEquipmentItems(UnitEquipmentItem[] items);
+
+		/// <summary>
+		/// Gets the selected equipment item.
+		/// </summary>
+		/// <value>
+		/// The selected equipment item.
+		/// </value>
+		UnitEquipmentItem SelectedUnitEquipmentItem
+		{
+			get;
+		}
+	}
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/UIControl/ReplaceEquipmentUIControl.cs	Mon Jan 17 19:43:47 2011 +0000
@@ -0,0 +1,60 @@
+//  This file (AddEquipmentUIControl.cs) is a part of the IBBoard.WarFoundry.GUI.GTK project and is copyright 2010 IBBoard
+// 
+// The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
+
+using IBBoard.Commands;
+using IBBoard.WarFoundry.API.Commands;
+using IBBoard.WarFoundry.API.Objects;
+using IBBoard.WarFoundry.API.Util;
+using IBBoard.WarFoundry.GUI.GTK.UIControl.Interfaces;
+using CustomMath = IBBoard.CustomMath;
+
+namespace IBBoard.WarFoundry.GUI.GTK.UIControl
+{
+	public class ReplaceEquipmentUIControl : AbstractBaseEquipmentUIControl<IReplaceEquipmentUI>
+	{		
+		private UnitEquipmentItem origItem;
+		
+		public ReplaceEquipmentUIControl(Unit unit, UnitEquipmentItem equipmentItem, CommandStack commandStack) : base(unit, commandStack)
+		{
+			origItem = equipmentItem;
+		}
+
+		//TODO Make abstract
+
+		protected override IReplaceEquipmentUI CreateEquipmentUI()
+		{
+			return new FrmReplaceEquipment();
+		}
+
+		protected override void CompleteUISetup()
+		{			
+			UnitType unitType = unit.UnitType;
+			string[] mutexGroups = origItem.MutexGroups;
+			UnitEquipmentItem[] mutexItems = unitType.GetEquipmentItemsByExclusionGroups(mutexGroups);
+			UnitEquipmentItem[] currentEquipment = unit.GetEquipment();
+			UnitEquipmentItem[] allowedItems = Arrays.Subtract(mutexItems, currentEquipment);
+			ui.SetUnitEquipmentItems(allowedItems);
+			ui.UnitEquipmentItemChoiceChanged += HandleUiUnitEquipmentItemChoiceChanged;
+		}
+
+		private void HandleUiUnitEquipmentItemChoiceChanged(UnitEquipmentItem equip)
+		{
+			equipItem = equip;
+			SetUnitEquipmentLimits(equip);
+		}
+
+		protected override void DoProcessing()
+		{
+			if (isRatioAmount)
+			{
+				commandStack.Execute(new ReplaceUnitEquipmentWithRatioAmountItemCommand(unit, origItem, equipItem, equipmentAmount));
+			}
+			else
+			{
+				commandStack.Execute(new ReplaceUnitEquipmentWithRatioAmountItemCommand(unit, origItem, equipItem, (int)equipmentAmount));
+			}
+		}
+	}
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Util/GtkWarFoundryUtil.cs	Mon Jan 17 19:43:47 2011 +0000
@@ -0,0 +1,17 @@
+//  This file (GtkWarFoundryUtil.cs) is a part of the IBBoard.WarFoundry.GUI.GTK project and is copyright 2010 IBBoard
+// 
+//  The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
+using System;
+using IBBoard.WarFoundry.API.Objects;
+using Gtk;
+namespace IBBoard.WarFoundry.GUI.GTK.Util
+{
+	public class GtkWarFoundryUtil
+	{
+		public static void RenderWarFoundryObjectName(TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
+		{
+			WarFoundryObject equip = (WarFoundryObject)model.GetValue(iter, 0);
+			(cell as CellRendererText).Text = equip.Name;
+		}
+	}
+}
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/WarFoundry-GTK.exe.log4net	Mon Jan 17 19:43:47 2011 +0000
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<log4net>
+	<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender" >
+		<layout type="log4net.Layout.PatternLayout">
+			<conversionPattern value="%-5p [%d{HH:MM:ss}]: %C{1}.%M() - Line: %L - %m%n" />
+		</layout>
+	</appender>
+	<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
+		<file value="logs/WarFoundry.log" />
+		<appendToFile value="false" />
+		<rollingStyle value="Size" />
+		<maxSizeRollBackups value="-1" />
+		<maximumFileSize value="100MB" />
+		<layout type="log4net.Layout.PatternLayout">
+			<conversionPattern value="%-5p [%d{HH:MM:ss}]: %C{1}.%M() - Line: %L - %m%n" />
+		</layout>
+	</appender>
+	<root>
+		<level value="DEBUG" />
+		<appender-ref ref="ConsoleAppender" />
+		<appender-ref ref="RollingLogFileAppender" />
+	</root>
+</log4net>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/WarFoundry-GTKPref.xml	Mon Jan 17 19:43:47 2011 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE preferences[
+  <!ELEMENT preference (CDATA|preferenceArr+)> 
+  <!ELEMENT preferenceArr (CDATA)>
+  <!ATTLIST preference id ID #REQUIRED>
+  <!ATTLIST preference type CDATA #REQUIRED>
+  <!ATTLIST preferenceArr id ID #REQUIRED>
+]>
+<preferences>
+<preference id="language" type="System.String">en</preference>
+<preference id="currSystem" type="System.String"></preference>
+<preference id="logLevel" type="System.String">Info</preference>
+</preferences>

--- a/WarFoundryGTK.exe.log4net	Sun Jan 31 20:46:06 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<log4net>
-	<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender" >
-		<layout type="log4net.Layout.PatternLayout">
-			<conversionPattern value="%-5p [%d{HH:MM:ss}]: %C{1}.%M() - Line: %L - %m%n" />
-		</layout>
-	</appender>
-	<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
-		<file value="logs/WarFoundry.log" />
-		<appendToFile value="false" />
-		<rollingStyle value="Size" />
-		<maxSizeRollBackups value="-1" />
-		<maximumFileSize value="100MB" />
-		<layout type="log4net.Layout.PatternLayout">
-			<conversionPattern value="%-5p [%d{HH:MM:ss}]: %C{1}.%M() - Line: %L - %m%n" />
-		</layout>
-	</appender>
-	<root>
-		<level value="DEBUG" />
-		<appender-ref ref="ConsoleAppender" />
-		<appender-ref ref="RollingLogFileAppender" />
-	</root>
-</log4net>

--- a/WarFoundryGTKPref.xml	Sun Jan 31 20:46:06 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE preferences[
-  <!ELEMENT preference (CDATA|preferenceArr+)> 
-  <!ELEMENT preferenceArr (CDATA)>
-  <!ATTLIST preference id ID #REQUIRED>
-  <!ATTLIST preference type CDATA #REQUIRED>
-  <!ATTLIST preferenceArr id ID #REQUIRED>
-]>
-<preferences>
-<preference id="language" type="System.String">en</preference>
-<preference id="currSystem" type="System.String"></preference>
-<preference id="logLevel" type="System.String">Info</preference>
-</preferences>

--- a/Widgets/UnitDisplayWidget.cs	Sun Jan 31 20:46:06 2010 +0000
+++ b/Widgets/UnitDisplayWidget.cs	Mon Jan 17 19:43:47 2011 +0000
@@ -5,143 +5,389 @@
 using System;
 using Gtk;
 using IBBoard.Commands;
+using IBBoard.GtkSharp;
 using IBBoard.Lang;
 using IBBoard.WarFoundry.API;
+using IBBoard.WarFoundry.API.Commands;
 using IBBoard.WarFoundry.API.Objects;
-using IBBoard.WarFoundry.API.Commands;
+using IBBoard.WarFoundry.API.Util;
+using IBBoard.WarFoundry.GUI.GTK.UIControl;
+using log4net;
+using WFObjects = IBBoard.WarFoundry.API.Objects;
+using System.Collections.Generic;
+using IBBoard.GtkSharp.Translatable;
 
-namespace IBBoard.WarFoundry.GTK.Widgets
+namespace IBBoard.WarFoundry.GUI.GTK.Widgets
 {
 	[System.ComponentModel.Category("WarFoundry GTK# GUI")]
 	[System.ComponentModel.ToolboxItem(true)]
 	public partial class UnitDisplayWidget : Gtk.Bin
-	{		
-		private IBBoard.WarFoundry.API.Objects.Unit unit;
+	{
+		private static ILog log = LogManager.GetLogger(typeof(UnitDisplayWidget));
+		private WFObjects.Unit unit;
 		private CommandStack stack;
-		
-		public UnitDisplayWidget(IBBoard.WarFoundry.API.Objects.Unit sourceUnit, CommandStack commandStack)
+		private Dictionary<string, NodeView> statsViews = new Dictionary<string, NodeView>();
+
+		public UnitDisplayWidget(WFObjects.Unit sourceUnit, CommandStack commandStack)
 		{
 			this.Build();
 			stack = commandStack;
 			unit = sourceUnit;
 			unitName.Text = unit.Name;
 			unitSize.Value = unit.Size;
-			double max = unit.UnitType.MaxSize;
+			int maxSize = (unit.UnitType.MaxSize == WarFoundryCore.INFINITY ? int.MaxValue : unit.UnitType.MaxSize);
+			int minSize = unit.UnitType.MinSize;
+			unitSize.SetRange(minSize, maxSize);
+			unitSize.Sensitive = (maxSize != minSize);
+			notesView.Buffer.Text = unit.UnitType.Notes;
+			unit.NameChanged += UnitNameChanged;
+			unit.UnitSizeChanged += UnitSizeChanged;
+			unit.UnitEquipmentAmountChanged += HandleUnitUnitEquipmentAmountChanged;
+			equipmentList.Selection.Changed += HandleEquipmentListSelectionChanged;
+			SetAbilities();
+			SetStats();
+			SetWeapons();
+			SetAddButtonEnabledState();
+			ControlTranslator.TranslateWidget(this);
+		}
+
+		private void HandleEquipmentListSelectionChanged(object sender, EventArgs e)
+		{
+			SetButtonsEnabledState();	
+		}
+
+		private void SetButtonsEnabledState()
+		{			
+			UnitEquipmentItem equipItem = GetSelectedEquipmentItem();
+			bttnReplaceWeapon.Sensitive = (equipItem != null && equipItem.HasAlternatives());
+			bttnEditWeapon.Sensitive = (UnitEquipmentUtil.CanEditEquipmentAmount(unit, equipItem));
+			bttnRemoveWeapon.Sensitive = (equipItem != null && !equipItem.IsRequired);
+		}
+
+		private void SetAddButtonEnabledState()
+		{
+			bttnAddWeapon.Sensitive = AddEquipmentUIControl.HasEquipmentToAdd(unit);
+		}
+
+		private UnitEquipmentItem GetSelectedEquipmentItem()
+		{
+			return (UnitEquipmentItem)TreeUtils.GetSelectedItem(equipmentList);
+		}
+
+		private void SetAbilities()
+		{
+			CellRendererText renderer = new CellRendererText();
+			abilitiesList.AppendColumn("", renderer, new TreeCellDataFunc(RenderAbility));
 			
-			if (max == -1)
+			ListStore model = new ListStore(typeof(Ability));
+			
+			foreach (Ability ability in unit.UnitType.GetRequiredAbilities())
 			{
-				max = double.MaxValue;
+				model.AppendValues(ability);
 			}
 			
-			unitSize.SetRange(unit.UnitType.MinSize, max);
-			unit.NameChanged+= new StringValChangedDelegate(UnitNameChanged);
-			unit.UnitSizeChanged+= new IntValChangedDelegate(UnitSizeChanged);
-			SetStats();
+			abilitiesList.Model = model;
+		}
+
+		public void RenderAbility(TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
+		{
+			object o = model.GetValue(iter, 0);
+			
+			if (o is Ability)
+			{
+				Ability ability = (Ability)o;
+				(cell as CellRendererText).Text = ability.Name;
+			}			
+						
 		}
 
 		private void SetStats()
 		{
-            //GameSystem system = unit.Army.GameSystem;
-            //SystemStats stats = system.StandardSystemStats;
-            CellRendererText renderer = new CellRendererText();
-            unitStats.AppendColumn(Translation.GetTranslation("UnitNameColumn", "Unit Type", null), renderer, new TreeCellDataFunc(RenderUnitName));
-            
-            TreeCellDataFunc statFunc = new TreeCellDataFunc(RenderUnitStat);
-            Stat[] stats = unit.UnitStatsArray;
-			
-			int length = stats.Length;
+			Stat[][] stats = unit.UnitStatsArraysWithName;
+			string[] statsIDs = unit.UnitStatsArrayIDs;
+			int statsCount = stats.Length;
+			log.DebugFormat("Unit {0} has {1} stats arrays", unit.UnitType.Name, statsCount);
 
-			for (int i = 0; i < length; i++)
+			for (int i = 0; i < statsCount; i++)
 			{
-	            unitStats.AppendColumn(stats[i].ParentSlotName, renderer, statFunc);
+				NodeView statsGrid = GetStatsView(statsIDs[i]);
+				TreeStore model = (TreeStore)statsGrid.Model;
+				log.DebugFormat("Adding row to data table for {0}", statsIDs[i]);
+				log.DebugFormat("TreeStore supports {0} columns", model.NColumns);
+				model.AppendValues((object)stats[i]);
+			}
+		}
+
+		private NodeView GetStatsView(string statsID)
+		{
+			NodeView statsView;
+
+			if (statsViews.ContainsKey(statsID))
+			{
+				statsView = DictionaryUtils.GetValue(statsViews, statsID);
+			}
+			else
+			{
+				statsView = CreateStatsView(statsID);
+				statsViews[statsID] = statsView;
 			}
 
-			TreeStore model = new TreeStore(typeof(IBBoard.WarFoundry.API.Objects.Unit));
-			model.AppendValues(unit);
-			unitStats.Model = model;
+			return statsView;
 		}
-		
-		private void RenderUnitName(TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
+
+		private NodeView CreateStatsView(string statsID)
 		{
-			object o = model.GetValue(iter, 0);
-			
-			if (o is IBBoard.WarFoundry.API.Objects.Unit)
+			log.DebugFormat("Create NodeView for stats ID {0}", statsID);
+			SystemStats sysStats = unit.Race.GameSystem.GetSystemStatsForID(statsID);
+			StatSlot[] sysStatSlots = sysStats.StatSlots;
+			int statsCount = sysStatSlots.Length;
+			NodeView statsGrid = CreateNodeView();
+			CellRendererText renderer = new CellRendererText();
+			statsGrid.AppendColumn(Translation.GetTranslation("UnitNameColumn", "Unit Type", null), renderer, RenderUnitStat);
+
+			for (int i = 0; i < statsCount; i++)
 			{
-				IBBoard.WarFoundry.API.Objects.Unit u = (IBBoard.WarFoundry.API.Objects.Unit)o;				
-				(cell as CellRendererText).Text = u.UnitType.Name;
+				StatSlot stat = sysStatSlots[i];
+				string slotName = stat.Name;
+				statsGrid.AppendColumn(slotName, renderer, RenderUnitStat);
 			}
+			
+			statsGrid.Model = new TreeStore(typeof(Stat[]));
+			return statsGrid;
 		}
-		
+
+		private NodeView CreateNodeView()
+		{
+			NodeView nodeView = new NodeView();
+			statsRepeatBox.Add(nodeView);
+			return nodeView;
+		}
+
 		private void RenderUnitStat(TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
 		{
 			object o = model.GetValue(iter, 0);
 			
-			if (o is IBBoard.WarFoundry.API.Objects.Unit)
+			if (o is Stat[])
 			{
-				IBBoard.WarFoundry.API.Objects.Unit u = (IBBoard.WarFoundry.API.Objects.Unit)o;
-				(cell as CellRendererText).Text = u.GetStatValue(column.Title);
+				Stat[] stats = (Stat[])o;
+				(cell as CellRendererText).Text = stats[GetStatColumnIndex(column)].SlotValueString;
 			}
 		}
 
-		public IBBoard.WarFoundry.API.Objects.Unit Unit
+		private int GetStatColumnIndex(TreeViewColumn column)
+		{
+			int idx = -1;
+			TreeViewColumn[] cols = ((TreeView)column.TreeView).Columns;
+			int colCount = cols.Length;
+			
+			for (int i = 0; i < colCount; i++)
+			{
+				if (cols[i] == column)
+				{
+					idx = i;
+					break;
+				}
+			}
+			
+			return idx;
+		}
+
+		private void SetWeapons()
+		{
+			CellRendererText renderer = new CellRendererText();
+			equipmentList.AppendColumn("", renderer, new TreeCellDataFunc(RenderEquipmentLine));
+			
+			ListStore model = new ListStore(typeof(UnitEquipmentItem));
+			
+			foreach (UnitEquipmentItem item in unit.GetEquipment())
+			{
+				model.AppendValues(item);
+			}
+			
+			equipmentList.Model = model;
+		}
+
+		public void RenderEquipmentLine(TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
+		{
+			object o = model.GetValue(iter, 0);
+			
+			if (o is UnitEquipmentItem)
+			{
+				UnitEquipmentItem item = (UnitEquipmentItem)o;
+				(cell as CellRendererText).Text = GetUnitEquipmentText(item);
+			}			
+						
+		}
+
+		private string GetUnitEquipmentText(UnitEquipmentItem item)
+		{
+			string translation = "";
+
+			if (item.Cost == 0)
+			{
+				translation = Translation.GetTranslation("equipmentAmountWithZeroCost", "{0} ({1} - free)", item.Name, GetAmountString(item));
+			}
+			else
+			{
+				translation = Translation.GetTranslation("equipmentAmountWithCost", "{0} ({1} at {2}pts each)", item.Name, GetAmountString(item), item.Cost);
+			}
+
+			return translation;
+		}
+
+		private string GetAmountString(UnitEquipmentItem item)
+		{
+			double amount = UnitEquipmentUtil.GetEquipmentAmount(unit, item);
+			string amountString = "";
+			
+			if (UnitEquipmentUtil.GetEquipmentAmountIsRatio(unit, item))
+			{
+				int number = UnitEquipmentUtil.GetEquipmentAmountTaken(unit, item);
+				
+				if (amount == 100)
+				{
+					amountString = Translation.GetTranslation("equipmentChoiceAmountAll", "all ({1})", amount, number);
+				}
+				else
+				{
+					amountString = Translation.GetTranslation("equipmentChoiceAmountPercentage", "{0}% ({1})", amount, number);
+				}
+			}
+			else
+			{
+				amountString = Translation.GetTranslation("equipmentChoiceAmountNumber", "{0}", amount);
+			}
+			
+			return amountString;
+		}
+
+		public WFObjects.Unit Unit
 		{
 			get { return unit; }
 		}
-		
+
 		private void UnitNameChanged(WarFoundryObject obj, string oldValue, string newValue)
 		{
 			unitName.Text = newValue;
 		}
-		
+
 		private void UnitSizeChanged(WarFoundryObject obj, int oldValue, int newValue)
 		{
 			unitSize.Value = newValue;
 		}
 
-		protected virtual void OnUnitSizeFocusOut (object o, Gtk.FocusOutEventArgs args)
+		private void HandleUnitUnitEquipmentAmountChanged(WarFoundryObject obj, double oldValue, double newValue)
+		{
+			if (oldValue == 0)
+			{
+				((ListStore)equipmentList.Model).AppendValues(obj);
+			}
+			else
+			{
+				if (newValue == 0)
+				{
+					TreeIter treeIter = TreeUtils.GetItemIter(equipmentList, obj);
+					((ListStore)equipmentList.Model).Remove(ref treeIter);
+				}
+			}
+
+			SetAddButtonEnabledState();
+			equipmentList.QueueDraw();
+		}
+
+		protected virtual void OnUnitSizeFocusOut(object o, Gtk.FocusOutEventArgs args)
 		{
 			SetNewUnitSize();
 		}
 
 		[GLib.ConnectBefore ()]
-		protected virtual void OnUnitSizeKeyPress (object o, Gtk.KeyPressEventArgs args)
+
+		protected virtual void OnUnitSizeKeyPress(object o, Gtk.KeyPressEventArgs args)
 		{
-			if (args.Event.Key == Gdk.Key.Return)
+			if (args.Event.Key == Gdk.Key.Return || args.Event.Key == Gdk.Key.KP_Enter)
 			{
 				SetNewUnitSize();
 			}
 		}
-		
+
 		private void SetNewUnitSize()
 		{
-			if (unitSize.Value!=unit.Size)
+			if (unitSize.Value != unit.Size)
 			{
 				SetUnitSizeCommand cmd = new SetUnitSizeCommand(unit, (int)Math.Round(unitSize.Value));
 				stack.Execute(cmd);
 			}
 		}
 
-		protected virtual void OnUnitNameFocusOut (object o, Gtk.FocusOutEventArgs args)
+		protected virtual void OnUnitNameFocusOut(object o, Gtk.FocusOutEventArgs args)
 		{
 			SetNewUnitName();
 		}
 
 		[GLib.ConnectBefore ()]
-		protected virtual void OnUnitNameKeyPress (object o, Gtk.KeyPressEventArgs args)
+
+		protected virtual void OnUnitNameKeyPress(object o, Gtk.KeyPressEventArgs args)
 		{
-			if (args.Event.Key == Gdk.Key.Return)
+			if (args.Event.Key == Gdk.Key.Return || args.Event.Key == Gdk.Key.KP_Enter)
 			{
 				SetNewUnitName();
 			}
 		}
-		
+
 		private void SetNewUnitName()
 		{
-			if (unitName.Text!=unit.Name)
+			if (unitName.Text != unit.Name)
 			{
 				SetNameCommand cmd = new SetNameCommand(unit, unitName.Text);
 				stack.Execute(cmd);
 			}
 		}
+
+		private void OnBttnAddEquipmentClicked(object sender, System.EventArgs e)
+		{
+			AddEquipment();
+		}
+
+		private void AddEquipment()
+		{
+			AddEquipmentUIControl addEquipment = new AddEquipmentUIControl(unit, stack);
+			addEquipment.Show();
+		}
+
+		protected virtual void HandleRemoveButtonActivated(object sender, System.EventArgs e)
+		{
+			UnitEquipmentItem item = GetSelectedEquipmentItem();
+			log.Debug("Remove " + item);
+				
+			if (item != null)
+			{
+				SetUnitEquipmentNumericAmountCommand cmd = new SetUnitEquipmentNumericAmountCommand(unit, item, 0);
+				stack.Execute(cmd);
+			}
+		}		
+
+		protected virtual void HandleEditButtonClicked(object sender, System.EventArgs e)
+		{
+			UnitEquipmentItem item = GetSelectedEquipmentItem();
+			log.Debug("Edit " + item);
+			
+			if (item != null)
+			{
+				EditEquipmentUIControl editEquipment = new EditEquipmentUIControl(unit, item, stack);
+				editEquipment.Show();
+			}
+		}
+
+		protected virtual void HandleReplaceButtonClicked(object sender, System.EventArgs e)
+		{
+			UnitEquipmentItem item = GetSelectedEquipmentItem();
+			log.Debug("Replace " + item);
+				
+			if (item != null)
+			{
+				ReplaceEquipmentUIControl addEquipment = new ReplaceEquipmentUIControl(unit, item, stack);
+				addEquipment.Show();
+			}
+		}		
 	}
-}
+}
\ No newline at end of file