changeset 77:68804784bf6f

Re #86: Complete initial GTK# UI * Add About dialog * Make sure app builds as "WarFoundry-GTK.exe" * Move all UI components to IBBoard.WarFoundry.GUI.GTK namespace
author IBBoard <dev@ibboard.co.uk>
date Sat, 18 Dec 2010 16:42:51 +0000
parents 7055b24cfc79
children e63209ab2cfa
files App-lrg.png FrmAbout.cs FrmMainWindow.cs FrmNewArmy.cs FrmNewUnit.cs IBBoard.WarFoundry.GUI.GTK.csproj WarFoundry-GTK.exe.log4net WarFoundry-GTKPref.xml WarFoundryGTK.exe.log4net WarFoundryGTKPref.xml Widgets/UnitDisplayWidget.cs gtk-gui/IBBoard.WarFoundry.GTK.FrmMainWindow.cs gtk-gui/IBBoard.WarFoundry.GTK.FrmNewArmy.cs gtk-gui/IBBoard.WarFoundry.GTK.FrmNewUnit.cs gtk-gui/IBBoard.WarFoundry.GTK.Widgets.UnitDisplayWidget.cs gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmAbout.cs gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmAddEquipment.cs gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmEditEquipment.cs gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmMainWindow.cs gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewArmy.cs gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewUnit.cs gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmReplaceEquipment.cs gtk-gui/IBBoard.WarFoundry.GUI.GTK.Widgets.UnitDisplayWidget.cs gtk-gui/generated.cs gtk-gui/gui.stetic gtk-gui/objects.xml
diffstat 26 files changed, 1361 insertions(+), 1191 deletions(-) [+]
line diff
     1.1 Binary file App-lrg.png has changed
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/FrmAbout.cs	Sat Dec 18 16:42:51 2010 +0000
     2.3 @@ -0,0 +1,35 @@
     2.4 +//  This file (FrmAbout.cs) is a part of the IBBoard.WarFoundry.GUI.GTK project and is copyright 2010 IBBoard
     2.5 +// 
     2.6 +//  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.
     2.7 +
     2.8 +using System;
     2.9 +using Gtk;
    2.10 +
    2.11 +namespace IBBoard.WarFoundry.GUI.GTK
    2.12 +{
    2.13 +	public partial class FrmAbout : Gtk.Dialog
    2.14 +	{
    2.15 +		private static FrmAbout frm;
    2.16 +
    2.17 +		public static FrmAbout GetForm()
    2.18 +		{
    2.19 +			if (frm == null)
    2.20 +			{
    2.21 +				frm = new FrmAbout();
    2.22 +			}
    2.23 +			
    2.24 +			return frm;
    2.25 +		}
    2.26 +
    2.27 +		private FrmAbout()
    2.28 +		{
    2.29 +			this.Build();
    2.30 +		}
    2.31 +
    2.32 +		protected virtual void OkayClicked(object sender, System.EventArgs e)
    2.33 +		{
    2.34 +			Respond(ResponseType.Ok);
    2.35 +		}		
    2.36 +	}
    2.37 +}
    2.38 +
     3.1 --- a/FrmMainWindow.cs	Tue Nov 23 21:03:46 2010 +0000
     3.2 +++ b/FrmMainWindow.cs	Sat Dec 18 16:42:51 2010 +0000
     3.3 @@ -3,33 +3,34 @@
     3.4  // 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.
     3.5  
     3.6  using System;
     3.7 -using System.IO;
     3.8  using System.Collections.Generic;
     3.9  using System.Configuration;
    3.10 +using System.IO;
    3.11 +using GLib;
    3.12  using Gtk;
    3.13  using IBBoard;
    3.14  using IBBoard.Commands;
    3.15 +using IBBoard.CustomMath;
    3.16  using IBBoard.GtkSharp;
    3.17 +using IBBoard.GtkSharp.Translatable;
    3.18  using IBBoard.IO;
    3.19  using IBBoard.Lang;
    3.20  using IBBoard.Logging;
    3.21 -using IBBoard.CustomMath;
    3.22  using IBBoard.WarFoundry.API;
    3.23 +using IBBoard.WarFoundry.API.Commands;
    3.24  using IBBoard.WarFoundry.API.Exporters;
    3.25  using IBBoard.WarFoundry.API.Factories;
    3.26  using IBBoard.WarFoundry.API.Factories.Xml;
    3.27  using IBBoard.WarFoundry.API.Objects;
    3.28 -using WFObjects = IBBoard.WarFoundry.API.Objects;
    3.29 -using IBBoard.WarFoundry.API.Commands;
    3.30 +using IBBoard.WarFoundry.API.Requirements;
    3.31  using IBBoard.WarFoundry.API.Savers;
    3.32 -using IBBoard.WarFoundry.API.Requirements;
    3.33 -using IBBoard.WarFoundry.GTK.Widgets;
    3.34 +using IBBoard.WarFoundry.GUI.GTK.Widgets;
    3.35  using IBBoard.WarFoundry.Plugin.Rollcall;
    3.36  using IBBoard.Xml;
    3.37  using log4net;
    3.38 -using GLib;
    3.39 +using WFObjects = IBBoard.WarFoundry.API.Objects;
    3.40  
    3.41 -namespace IBBoard.WarFoundry.GTK
    3.42 +namespace IBBoard.WarFoundry.GUI.GTK
    3.43  {
    3.44  	public partial class FrmMainWindow: Gtk.Window
    3.45  	{
    3.46 @@ -126,7 +127,7 @@
    3.47  			mainColumn.SetCellDataFunc(mainCell, new TreeCellDataFunc(RenderCategoryTreeObjectName));
    3.48  			treeUnits.Model = new TreeStore(typeof(WarFoundryObject));
    3.49  			logger.Debug("Loading preferences");
    3.50 -			Preferences = new Preferences("WarFoundryGTK");
    3.51 +			Preferences = new Preferences("WarFoundry-GTK");
    3.52  			logger.Debug("Loading translations");
    3.53  
    3.54  			try
    3.55 @@ -149,6 +150,7 @@
    3.56  			WarFoundryCore.ArmyChanged += new ArmyChangedDelegate(OnArmyChanged);
    3.57  			Destroyed += new EventHandler(OnWindowDestroyed);
    3.58  			//TODO: Translate and subscribe to other events
    3.59 +			ControlTranslator.TranslateWidget(this);
    3.60  			UnitAddedMethod = new ObjectAddDelegate(OnUnitAdded);
    3.61  			UnitRemovedMethod = new ObjectRemoveDelegate(OnUnitRemoved);
    3.62  			PointsValueChangedMethod = new DoubleValChangedDelegate(OnPointsValueChanged);
    3.63 @@ -368,7 +370,7 @@
    3.64  			}
    3.65  			while (model.IterNext(ref iter));
    3.66  		}
    3.67 -		
    3.68 +
    3.69  		private void RemoveUnitTab(WFObjects.Unit unit)
    3.70  		{
    3.71  			UnitDisplayWidget widget = DictionaryUtils.GetValue(unitToWidgetMap, unit);
    3.72 @@ -720,7 +722,7 @@
    3.73  			saveArmyButton.Sensitive = commandStack.IsDirty() && WarFoundryCore.CurrentArmy != null;
    3.74  			miSaveArmy.Sensitive = commandStack.IsDirty() && WarFoundryCore.CurrentArmy != null;
    3.75  		}
    3.76 -		
    3.77 +
    3.78  		private void RedoMenuActivated(object sender, EventArgs e)
    3.79  		{
    3.80  			if (sender is MenuItem)
    3.81 @@ -855,7 +857,7 @@
    3.82  			
    3.83  			return SaveArmyToPath(WarFoundryCore.CurrentArmy, filePath);
    3.84  		}
    3.85 -		
    3.86 +
    3.87  		private bool SaveArmyToPath(Army army, string filePath)
    3.88  		{
    3.89  			bool success = false;
    3.90 @@ -908,12 +910,12 @@
    3.91  					{
    3.92  						if (dr == ResponseType.No)
    3.93  						{
    3.94 -						//They don't care about their changes
    3.95 +							//They don't care about their changes
    3.96  							canClose = true;
    3.97  						}
    3.98  						else
    3.99  						{
   3.100 -						//Assume cancel or close with the X button
   3.101 +							//Assume cancel or close with the X button
   3.102  							canClose = false;
   3.103  						}
   3.104  
   3.105 @@ -1000,7 +1002,7 @@
   3.106  				ShowUnitWidget(unit);
   3.107  			}
   3.108  		}
   3.109 -		
   3.110 +
   3.111  		private void ShowUnitWidget(WFObjects.Unit unit)
   3.112  		{
   3.113  			UnitDisplayWidget widget;
   3.114 @@ -1090,7 +1092,7 @@
   3.115  				OnTreeUnitsPopupMenu(o, null);
   3.116  			}
   3.117  		}
   3.118 -		
   3.119 +
   3.120  		protected virtual void NotebookPageRemoved(object o, Gtk.RemovedArgs args)
   3.121  		{
   3.122  			Widget widget = args.Widget;
   3.123 @@ -1100,7 +1102,12 @@
   3.124  				unitToWidgetMap.Remove(((UnitDisplayWidget)widget).Unit);
   3.125  			}
   3.126  		}
   3.127 -		
   3.128 -		
   3.129 +
   3.130 +		protected virtual void HelpAboutActivated(object sender, System.EventArgs e)
   3.131 +		{
   3.132 +			FrmAbout form = FrmAbout.GetForm();
   3.133 +			form.Run();
   3.134 +			form.Hide();
   3.135 +		}
   3.136  	}
   3.137  }
     4.1 --- a/FrmNewArmy.cs	Tue Nov 23 21:03:46 2010 +0000
     4.2 +++ b/FrmNewArmy.cs	Sat Dec 18 16:42:51 2010 +0000
     4.3 @@ -12,7 +12,7 @@
     4.4  using IBBoard.WarFoundry.GUI.GTK.Util;
     4.5  using IBBoard.GtkSharp.Translatable;
     4.6  
     4.7 -namespace IBBoard.WarFoundry.GTK
     4.8 +namespace IBBoard.WarFoundry.GUI.GTK
     4.9  {	
    4.10  	public partial class FrmNewArmy : TranslatableDialog, ITranslatable
    4.11  	{
    4.12 @@ -20,7 +20,7 @@
    4.13  		private Race race;
    4.14  		private string armyName;
    4.15  		private int pointsValue;
    4.16 -		
    4.17 +
    4.18  		public FrmNewArmy(GameSystem gameSystem)
    4.19  		{
    4.20  			this.Build();
    4.21 @@ -46,13 +46,13 @@
    4.22  				ComboBoxUtils.SelectIndex(systemCombo, 0);
    4.23  			}
    4.24  		}
    4.25 -		
    4.26 +
    4.27  		protected virtual void OnSelectionChanged(object o, EventArgs e)
    4.28  		{
    4.29  			logger.Debug("Race selection changed");
    4.30  			SetOkayButtonState();
    4.31  		}
    4.32 -		
    4.33 +
    4.34  		private void SetOkayButtonState()
    4.35  		{
    4.36  			bttnCreate.Sensitive = (lstRaces.Selection.CountSelectedRows() == 1 && txtArmyName.Text != "" && sbPointsValue.Value > 0);
    4.37 @@ -88,7 +88,7 @@
    4.38  		{
    4.39  			SetOkayButtonState();
    4.40  		}
    4.41 -		
    4.42 +
    4.43  		protected virtual void OnSystemComboChanged(object sender, System.EventArgs e)
    4.44  		{
    4.45  			GameSystem system = ComboBoxUtils.GetSelectedItem<GameSystem>(systemCombo);
    4.46 @@ -96,7 +96,7 @@
    4.47  			logger.Debug("System selection changed: " + (system == null ? "null" : system.Name));
    4.48  			SetOkayButtonState();
    4.49  		}
    4.50 -		
    4.51 +
    4.52  		private void SetRaces(GameSystem system)
    4.53  		{	
    4.54  			ListStore store = new ListStore(typeof(Race));
    4.55 @@ -111,17 +111,17 @@
    4.56  			
    4.57  			lstRaces.Model = store;
    4.58  		}
    4.59 -		
    4.60 +
    4.61  		public Race SelectedRace
    4.62  		{
    4.63  			get { return race; }
    4.64  		}
    4.65 -		
    4.66 +
    4.67  		public string ArmyName
    4.68  		{
    4.69  			get { return armyName; }
    4.70  		}
    4.71 -		
    4.72 +
    4.73  		public int ArmySize
    4.74  		{
    4.75  			get { return pointsValue; }
     5.1 --- a/FrmNewUnit.cs	Tue Nov 23 21:03:46 2010 +0000
     5.2 +++ b/FrmNewUnit.cs	Sat Dec 18 16:42:51 2010 +0000
     5.3 @@ -10,14 +10,14 @@
     5.4  using IBBoard.WarFoundry.API.Requirements;
     5.5  using log4net;
     5.6  
     5.7 -namespace IBBoard.WarFoundry.GTK
     5.8 +namespace IBBoard.WarFoundry.GUI.GTK
     5.9  {
    5.10  	public partial class FrmNewUnit : TranslatableDialog
    5.11  	{
    5.12  		private ILog logger = LogManager.GetLogger(typeof(FrmNewUnit));
    5.13 -				private UnitType unitType;
    5.14 +		private UnitType unitType;
    5.15  		private Army unitArmy;
    5.16 -		
    5.17 +
    5.18  		public FrmNewUnit(Race race, Category cat, Army army)
    5.19  		{
    5.20  			this.Build();
    5.21 @@ -42,23 +42,23 @@
    5.22  			lstUnitTypes.Model = store;
    5.23  			lstUnitTypes.Selection.Changed += new EventHandler(OnSelectionChanged);
    5.24  		}
    5.25 -		
    5.26 +
    5.27  		private void RenderUnitTypeName(TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
    5.28  		{
    5.29  			UnitType type = (UnitType)model.GetValue(iter, 0);
    5.30  			(cell as CellRendererText).Text = type.Name;
    5.31  		}
    5.32 -		
    5.33 +
    5.34  		protected virtual void OnSelectionChanged(object o, EventArgs e)
    5.35  		{
    5.36  			SetSelectUnitEnabledVal();
    5.37  		}
    5.38 -		
    5.39 +
    5.40  		public UnitType SelectedUnit
    5.41  		{
    5.42  			get { return unitType; }
    5.43  		}
    5.44 -		
    5.45 +
    5.46  		private UnitType GetSelectedUnitType()
    5.47  		{		
    5.48  			TreeModel model;
    5.49 @@ -73,7 +73,7 @@
    5.50  			
    5.51  			return toReturn;
    5.52  		}
    5.53 -		
    5.54 +
    5.55  		private void SetSelectUnitEnabledVal()
    5.56  		{
    5.57  			UnitType type = GetSelectedUnitType();
     6.1 --- a/IBBoard.WarFoundry.GUI.GTK.csproj	Tue Nov 23 21:03:46 2010 +0000
     6.2 +++ b/IBBoard.WarFoundry.GUI.GTK.csproj	Sat Dec 18 16:42:51 2010 +0000
     6.3 @@ -9,8 +9,9 @@
     6.4      <OutputType>WinExe</OutputType>
     6.5      <AppDesignerFolder>Properties</AppDesignerFolder>
     6.6      <RootNamespace>IBBoard.WarFoundry.GUI.GTK</RootNamespace>
     6.7 -    <StartupObject>IBBoard.WarFoundry.GTK.FrmMainWindow</StartupObject>
     6.8 +    <StartupObject>IBBoard.WarFoundry.GUI.GTK.FrmMainWindow</StartupObject>
     6.9      <ApplicationIcon>App.ico</ApplicationIcon>
    6.10 +    <AssemblyName>WarFoundry-GTK</AssemblyName>
    6.11    </PropertyGroup>
    6.12    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    6.13      <DebugSymbols>true</DebugSymbols>
    6.14 @@ -20,7 +21,6 @@
    6.15      <DefineConstants>DEBUG;TRACE</DefineConstants>
    6.16      <ErrorReport>prompt</ErrorReport>
    6.17      <WarningLevel>4</WarningLevel>
    6.18 -    <AssemblyName>WarFoundryGTK</AssemblyName>
    6.19    </PropertyGroup>
    6.20    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    6.21      <DebugType>pdbonly</DebugType>
    6.22 @@ -29,7 +29,6 @@
    6.23      <DefineConstants>TRACE</DefineConstants>
    6.24      <ErrorReport>prompt</ErrorReport>
    6.25      <WarningLevel>4</WarningLevel>
    6.26 -    <AssemblyName>IBBoard.WarFoundry.GUI.GTK</AssemblyName>
    6.27    </PropertyGroup>
    6.28    <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    6.29    <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
    6.30 @@ -46,10 +45,6 @@
    6.31      <Compile Include="FrmNewUnit.cs" />
    6.32      <Compile Include="Widgets\UnitDisplayWidget.cs" />
    6.33      <Compile Include="gtk-gui\generated.cs" />
    6.34 -    <Compile Include="gtk-gui\IBBoard.WarFoundry.GTK.FrmMainWindow.cs" />
    6.35 -    <Compile Include="gtk-gui\IBBoard.WarFoundry.GTK.FrmNewArmy.cs" />
    6.36 -    <Compile Include="gtk-gui\IBBoard.WarFoundry.GTK.FrmNewUnit.cs" />
    6.37 -    <Compile Include="gtk-gui\IBBoard.WarFoundry.GTK.Widgets.UnitDisplayWidget.cs" />
    6.38      <Compile Include="UIControl\AddEquipmentUIControl.cs" />
    6.39      <Compile Include="UIControl\Interfaces\IAddEquipmentUI.cs" />
    6.40      <Compile Include="FrmAddEquipment.cs" />
    6.41 @@ -66,6 +61,12 @@
    6.42      <Compile Include="FrmReplaceEquipment.cs" />
    6.43      <Compile Include="UIControl\ReplaceEquipmentUIControl.cs" />
    6.44      <Compile Include="gtk-gui\IBBoard.WarFoundry.GUI.GTK.FrmReplaceEquipment.cs" />
    6.45 +    <Compile Include="FrmAbout.cs" />
    6.46 +    <Compile Include="gtk-gui\IBBoard.WarFoundry.GUI.GTK.FrmAbout.cs" />
    6.47 +    <Compile Include="gtk-gui\IBBoard.WarFoundry.GUI.GTK.FrmMainWindow.cs" />
    6.48 +    <Compile Include="gtk-gui\IBBoard.WarFoundry.GUI.GTK.FrmNewArmy.cs" />
    6.49 +    <Compile Include="gtk-gui\IBBoard.WarFoundry.GUI.GTK.FrmNewUnit.cs" />
    6.50 +    <Compile Include="gtk-gui\IBBoard.WarFoundry.GUI.GTK.Widgets.UnitDisplayWidget.cs" />
    6.51    </ItemGroup>
    6.52    <ItemGroup>
    6.53      <Content Include="App.png" />
    6.54 @@ -75,13 +76,13 @@
    6.55      <None Include="translations\en.translation">
    6.56        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    6.57      </None>
    6.58 -    <None Include="WarFoundryGTK.exe.log4net">
    6.59 -      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    6.60 -    </None>
    6.61      <None Include="gtk-gui\gui.stetic" />
    6.62      <None Include="gtk-gui\objects.xml" />
    6.63      <None Include="COPYING" />
    6.64 -    <None Include="WarFoundryGTKPref.xml">
    6.65 +    <None Include="WarFoundry-GTK.exe.log4net">
    6.66 +      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    6.67 +    </None>
    6.68 +    <None Include="WarFoundry-GTKPref.xml">
    6.69        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    6.70      </None>
    6.71    </ItemGroup>
    6.72 @@ -118,6 +119,7 @@
    6.73      <EmbeddedResource Include="App.ico">
    6.74        <LogicalName>App.ico</LogicalName>
    6.75      </EmbeddedResource>
    6.76 +    <EmbeddedResource Include="App-lrg.png" />
    6.77    </ItemGroup>
    6.78    <ItemGroup>
    6.79      <Folder Include="UIControl\" />
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/WarFoundry-GTK.exe.log4net	Sat Dec 18 16:42:51 2010 +0000
     7.3 @@ -0,0 +1,23 @@
     7.4 +<?xml version="1.0" encoding="utf-8" ?>
     7.5 +<log4net>
     7.6 +	<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender" >
     7.7 +		<layout type="log4net.Layout.PatternLayout">
     7.8 +			<conversionPattern value="%-5p [%d{HH:MM:ss}]: %C{1}.%M() - Line: %L - %m%n" />
     7.9 +		</layout>
    7.10 +	</appender>
    7.11 +	<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
    7.12 +		<file value="logs/WarFoundry.log" />
    7.13 +		<appendToFile value="false" />
    7.14 +		<rollingStyle value="Size" />
    7.15 +		<maxSizeRollBackups value="-1" />
    7.16 +		<maximumFileSize value="100MB" />
    7.17 +		<layout type="log4net.Layout.PatternLayout">
    7.18 +			<conversionPattern value="%-5p [%d{HH:MM:ss}]: %C{1}.%M() - Line: %L - %m%n" />
    7.19 +		</layout>
    7.20 +	</appender>
    7.21 +	<root>
    7.22 +		<level value="DEBUG" />
    7.23 +		<appender-ref ref="ConsoleAppender" />
    7.24 +		<appender-ref ref="RollingLogFileAppender" />
    7.25 +	</root>
    7.26 +</log4net>
     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/WarFoundry-GTKPref.xml	Sat Dec 18 16:42:51 2010 +0000
     8.3 @@ -0,0 +1,13 @@
     8.4 +<?xml version="1.0" encoding="ISO-8859-1"?>
     8.5 +<!DOCTYPE preferences[
     8.6 +  <!ELEMENT preference (CDATA|preferenceArr+)> 
     8.7 +  <!ELEMENT preferenceArr (CDATA)>
     8.8 +  <!ATTLIST preference id ID #REQUIRED>
     8.9 +  <!ATTLIST preference type CDATA #REQUIRED>
    8.10 +  <!ATTLIST preferenceArr id ID #REQUIRED>
    8.11 +]>
    8.12 +<preferences>
    8.13 +<preference id="language" type="System.String">en</preference>
    8.14 +<preference id="currSystem" type="System.String"></preference>
    8.15 +<preference id="logLevel" type="System.String">Info</preference>
    8.16 +</preferences>
     9.1 --- a/WarFoundryGTK.exe.log4net	Tue Nov 23 21:03:46 2010 +0000
     9.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.3 @@ -1,23 +0,0 @@
     9.4 -<?xml version="1.0" encoding="utf-8" ?>
     9.5 -<log4net>
     9.6 -	<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender" >
     9.7 -		<layout type="log4net.Layout.PatternLayout">
     9.8 -			<conversionPattern value="%-5p [%d{HH:MM:ss}]: %C{1}.%M() - Line: %L - %m%n" />
     9.9 -		</layout>
    9.10 -	</appender>
    9.11 -	<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
    9.12 -		<file value="logs/WarFoundry.log" />
    9.13 -		<appendToFile value="false" />
    9.14 -		<rollingStyle value="Size" />
    9.15 -		<maxSizeRollBackups value="-1" />
    9.16 -		<maximumFileSize value="100MB" />
    9.17 -		<layout type="log4net.Layout.PatternLayout">
    9.18 -			<conversionPattern value="%-5p [%d{HH:MM:ss}]: %C{1}.%M() - Line: %L - %m%n" />
    9.19 -		</layout>
    9.20 -	</appender>
    9.21 -	<root>
    9.22 -		<level value="DEBUG" />
    9.23 -		<appender-ref ref="ConsoleAppender" />
    9.24 -		<appender-ref ref="RollingLogFileAppender" />
    9.25 -	</root>
    9.26 -</log4net>
    10.1 --- a/WarFoundryGTKPref.xml	Tue Nov 23 21:03:46 2010 +0000
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,13 +0,0 @@
    10.4 -<?xml version="1.0" encoding="ISO-8859-1"?>
    10.5 -<!DOCTYPE preferences[
    10.6 -  <!ELEMENT preference (CDATA|preferenceArr+)> 
    10.7 -  <!ELEMENT preferenceArr (CDATA)>
    10.8 -  <!ATTLIST preference id ID #REQUIRED>
    10.9 -  <!ATTLIST preference type CDATA #REQUIRED>
   10.10 -  <!ATTLIST preferenceArr id ID #REQUIRED>
   10.11 -]>
   10.12 -<preferences>
   10.13 -<preference id="language" type="System.String">en</preference>
   10.14 -<preference id="currSystem" type="System.String"></preference>
   10.15 -<preference id="logLevel" type="System.String">Info</preference>
   10.16 -</preferences>
    11.1 --- a/Widgets/UnitDisplayWidget.cs	Tue Nov 23 21:03:46 2010 +0000
    11.2 +++ b/Widgets/UnitDisplayWidget.cs	Sat Dec 18 16:42:51 2010 +0000
    11.3 @@ -1,7 +1,6 @@
    11.4  // This file (UnitDisplayWidget.cs) is a part of the IBBoard.WarFoundry.GTK project and is copyright 2008, 2009 IBBoard.
    11.5  //
    11.6  // 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.
    11.7 -
    11.8  using System;
    11.9  using Gtk;
   11.10  using IBBoard.Commands;
   11.11 @@ -16,166 +15,156 @@
   11.12  using WFObjects = IBBoard.WarFoundry.API.Objects;
   11.13  using System.Collections.Generic;
   11.14  
   11.15 -namespace IBBoard.WarFoundry.GTK.Widgets
   11.16 +namespace IBBoard.WarFoundry.GUI.GTK.Widgets
   11.17  {
   11.18  	[System.ComponentModel.Category("WarFoundry GTK# GUI")]
   11.19  	[System.ComponentModel.ToolboxItem(true)]
   11.20  	public partial class UnitDisplayWidget : Gtk.Bin
   11.21  	{
   11.22 -		private static ILog log = LogManager.GetLogger(typeof(UnitDisplayWidget));
   11.23 +		private static ILog log = LogManager.GetLogger (typeof (UnitDisplayWidget));
   11.24  		private WFObjects.Unit unit;
   11.25  		private CommandStack stack;
   11.26 -		private Dictionary<string, NodeView> statsViews = new Dictionary<string, NodeView>();
   11.27 -		
   11.28 -		public UnitDisplayWidget(WFObjects.Unit sourceUnit, CommandStack commandStack)
   11.29 +		private Dictionary<string, NodeView> statsViews = new Dictionary<string, NodeView> ();
   11.30 +
   11.31 +		public UnitDisplayWidget (WFObjects.Unit sourceUnit, CommandStack commandStack)
   11.32  		{
   11.33 -			this.Build();
   11.34 +			this.Build ();
   11.35  			stack = commandStack;
   11.36  			unit = sourceUnit;
   11.37  			unitName.Text = unit.Name;
   11.38  			unitSize.Value = unit.Size;
   11.39  			int maxSize = (unit.UnitType.MaxSize == WarFoundryCore.INFINITY ? int.MaxValue : unit.UnitType.MaxSize);
   11.40  			int minSize = unit.UnitType.MinSize;
   11.41 -			unitSize.SetRange(minSize, maxSize);
   11.42 +			unitSize.SetRange (minSize, maxSize);
   11.43  			unitSize.Sensitive = (maxSize != minSize);
   11.44  			notesView.Buffer.Text = unit.UnitType.Notes;
   11.45  			unit.NameChanged += UnitNameChanged;
   11.46  			unit.UnitSizeChanged += UnitSizeChanged;
   11.47  			unit.UnitEquipmentAmountChanged += HandleUnitUnitEquipmentAmountChanged;
   11.48  			equipmentList.Selection.Changed += HandleEquipmentListSelectionChanged;
   11.49 -			SetAbilities();
   11.50 -			SetStats();
   11.51 -			SetWeapons();
   11.52 +			SetAbilities ();
   11.53 +			SetStats ();
   11.54 +			SetWeapons ();
   11.55  		}
   11.56  
   11.57 -		private void HandleEquipmentListSelectionChanged(object sender, EventArgs e)
   11.58 +		private void HandleEquipmentListSelectionChanged (object sender, EventArgs e)
   11.59  		{
   11.60 -			SetButtonsEnabledState();	
   11.61 +			SetButtonsEnabledState ();	
   11.62  		}
   11.63  
   11.64 -		private void SetButtonsEnabledState()
   11.65 +		private void SetButtonsEnabledState ()
   11.66  		{			
   11.67 -			UnitEquipmentItem equipItem = GetSelectedEquipmentItem();
   11.68 -			bttnReplaceEquipment.Sensitive = (equipItem != null && equipItem.HasAlternatives());
   11.69 -			bttnEditEquipment.Sensitive = (UnitEquipmentUtil.CanEditEquipmentAmount(unit, equipItem));
   11.70 +			UnitEquipmentItem equipItem = GetSelectedEquipmentItem ();
   11.71 +			bttnReplaceEquipment.Sensitive = (equipItem != null && equipItem.HasAlternatives ());
   11.72 +			bttnEditEquipment.Sensitive = (UnitEquipmentUtil.CanEditEquipmentAmount (unit, equipItem));
   11.73  			bttnRemoveEquipment.Sensitive = (equipItem != null && !equipItem.IsRequired);
   11.74  		}
   11.75  
   11.76 -		private UnitEquipmentItem GetSelectedEquipmentItem()
   11.77 +		private UnitEquipmentItem GetSelectedEquipmentItem ()
   11.78  		{
   11.79 -			return (UnitEquipmentItem)TreeUtils.GetSelectedItem(equipmentList);
   11.80 +			return (UnitEquipmentItem)TreeUtils.GetSelectedItem (equipmentList);
   11.81  		}
   11.82 -		
   11.83 -		private void SetAbilities()
   11.84 +
   11.85 +		private void SetAbilities ()
   11.86  		{
   11.87 -			CellRendererText renderer = new CellRendererText();
   11.88 -			abilitiesList.AppendColumn("", renderer, new TreeCellDataFunc(RenderAbility));
   11.89 +			CellRendererText renderer = new CellRendererText ();
   11.90 +			abilitiesList.AppendColumn ("", renderer, new TreeCellDataFunc (RenderAbility));
   11.91  			
   11.92 -			ListStore model = new ListStore(typeof(Ability));
   11.93 +			ListStore model = new ListStore (typeof (Ability));
   11.94  			
   11.95 -			foreach (Ability ability in unit.UnitType.GetRequiredAbilities())
   11.96 -			{
   11.97 -				model.AppendValues(ability);
   11.98 +			foreach (Ability ability in unit.UnitType.GetRequiredAbilities ()) {
   11.99 +				model.AppendValues (ability);
  11.100  			}
  11.101  			
  11.102  			abilitiesList.Model = model;
  11.103  		}
  11.104 -		
  11.105 -		public void RenderAbility(TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
  11.106 +
  11.107 +		public void RenderAbility (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
  11.108  		{
  11.109 -			object o = model.GetValue(iter, 0);
  11.110 +			object o = model.GetValue (iter, 0);
  11.111  			
  11.112 -			if (o is Ability)
  11.113 -			{
  11.114 +			if (o is Ability) {
  11.115  				Ability ability = (Ability)o;
  11.116  				(cell as CellRendererText).Text = ability.Name;
  11.117  			}			
  11.118  						
  11.119  		}
  11.120  
  11.121 -		private void SetStats()
  11.122 +		private void SetStats ()
  11.123  		{
  11.124  			Stat[][] stats = unit.UnitStatsArraysWithName;
  11.125  			string[] statsIDs = unit.UnitStatsArrayIDs;
  11.126  			int statsCount = stats.Length;
  11.127 -			log.DebugFormat("Unit {0} has {1} stats arrays", unit.UnitType.Name, statsCount);
  11.128 +			log.DebugFormat ("Unit {0} has {1} stats arrays", unit.UnitType.Name, statsCount);
  11.129  
  11.130 -			for (int i = 0; i < statsCount; i++)
  11.131 -			{
  11.132 -				NodeView statsGrid = GetStatsView(statsIDs[i]);
  11.133 +			for (int i = 0; i < statsCount; i++) {
  11.134 +				NodeView statsGrid = GetStatsView (statsIDs [i]);
  11.135  				TreeStore model = (TreeStore)statsGrid.Model;
  11.136 -				log.DebugFormat("Adding row to data table for {0}", statsIDs[i]);
  11.137 -				log.DebugFormat("TreeStore supports {0} columns", model.NColumns);
  11.138 -				model.AppendValues((object)stats[i]);
  11.139 +				log.DebugFormat ("Adding row to data table for {0}", statsIDs [i]);
  11.140 +				log.DebugFormat ("TreeStore supports {0} columns", model.NColumns);
  11.141 +				model.AppendValues ((object)stats [i]);
  11.142  			}
  11.143  		}
  11.144 -		
  11.145 -		private NodeView GetStatsView(string statsID)
  11.146 +
  11.147 +		private NodeView GetStatsView (string statsID)
  11.148  		{
  11.149  			NodeView statsView;
  11.150  
  11.151 -			if (statsViews.ContainsKey(statsID))
  11.152 -			{
  11.153 -				statsView = DictionaryUtils.GetValue(statsViews, statsID);
  11.154 -			}
  11.155 -			else
  11.156 -			{
  11.157 -				statsView = CreateStatsView(statsID);
  11.158 -				statsViews[statsID] = statsView;
  11.159 +			if (statsViews.ContainsKey (statsID)) {
  11.160 +				statsView = DictionaryUtils.GetValue (statsViews, statsID);
  11.161 +			} else {
  11.162 +				statsView = CreateStatsView (statsID);
  11.163 +				statsViews [statsID] = statsView;
  11.164  			}
  11.165  
  11.166  			return statsView;
  11.167  		}
  11.168 -		
  11.169 -		private NodeView CreateStatsView(string statsID)
  11.170 +
  11.171 +		private NodeView CreateStatsView (string statsID)
  11.172  		{
  11.173 -			log.DebugFormat("Create NodeView for stats ID {0}", statsID);
  11.174 -			SystemStats sysStats = unit.Race.GameSystem.GetSystemStatsForID(statsID);
  11.175 +			log.DebugFormat ("Create NodeView for stats ID {0}", statsID);
  11.176 +			SystemStats sysStats = unit.Race.GameSystem.GetSystemStatsForID (statsID);
  11.177  			StatSlot[] sysStatSlots = sysStats.StatSlots;
  11.178  			int statsCount = sysStatSlots.Length;
  11.179 -			NodeView statsGrid = CreateNodeView();
  11.180 -			CellRendererText renderer = new CellRendererText();
  11.181 -			statsGrid.AppendColumn(Translation.GetTranslation("UnitNameColumn", "Unit Type", null), renderer, RenderUnitStat);
  11.182 +			NodeView statsGrid = CreateNodeView ();
  11.183 +			CellRendererText renderer = new CellRendererText ();
  11.184 +			statsGrid.AppendColumn (Translation.GetTranslation ("UnitNameColumn", "Unit Type", null), renderer, RenderUnitStat);
  11.185  
  11.186 -			for (int i = 0; i < statsCount; i++)
  11.187 -			{
  11.188 -				StatSlot stat = sysStatSlots[i];
  11.189 +			for (int i = 0; i < statsCount; i++) {
  11.190 +				StatSlot stat = sysStatSlots [i];
  11.191  				string slotName = stat.Name;
  11.192 -				statsGrid.AppendColumn(slotName, renderer, RenderUnitStat);
  11.193 +				statsGrid.AppendColumn (slotName, renderer, RenderUnitStat);
  11.194  			}
  11.195  			
  11.196 -			statsGrid.Model = new TreeStore(typeof(Stat[]));
  11.197 +			statsGrid.Model = new TreeStore (typeof (Stat[]));
  11.198  			return statsGrid;
  11.199  		}
  11.200 -		
  11.201 -		private NodeView CreateNodeView()
  11.202 +
  11.203 +		private NodeView CreateNodeView ()
  11.204  		{
  11.205 -			NodeView nodeView = new NodeView();
  11.206 -			statsRepeatBox.Add(nodeView);
  11.207 +			NodeView nodeView = new NodeView ();
  11.208 +			statsRepeatBox.Add (nodeView);
  11.209  			return nodeView;
  11.210  		}
  11.211 -		
  11.212 -		private void RenderUnitStat(TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
  11.213 +
  11.214 +		private void RenderUnitStat (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
  11.215  		{
  11.216 -			object o = model.GetValue(iter, 0);
  11.217 +			object o = model.GetValue (iter, 0);
  11.218  			
  11.219 -			if (o is Stat[])
  11.220 -			{
  11.221 +			if (o is Stat[]) {
  11.222  				Stat[] stats = (Stat[])o;
  11.223 -				(cell as CellRendererText).Text = stats[GetStatColumnIndex(column)].SlotValueString;
  11.224 +				(cell as CellRendererText).Text = stats [GetStatColumnIndex (column)].SlotValueString;
  11.225  			}
  11.226  		}
  11.227 -		
  11.228 -		private int GetStatColumnIndex(TreeViewColumn column)
  11.229 +
  11.230 +		private int GetStatColumnIndex (TreeViewColumn column)
  11.231  		{
  11.232  			int idx = -1;
  11.233  			TreeViewColumn[] cols = ((TreeView)column.TreeView).Columns;
  11.234  			int colCount = cols.Length;
  11.235  			
  11.236 -			for (int i = 0; i < colCount; i++)
  11.237 -			{
  11.238 -				if (cols[i] == column)
  11.239 -				{
  11.240 +			for (int i = 0; i < colCount; i++) {
  11.241 +				if (cols [i] == column) {
  11.242  					idx = i;
  11.243  					break;
  11.244  				}
  11.245 @@ -184,200 +173,177 @@
  11.246  			return idx;
  11.247  		}
  11.248  
  11.249 -		private void SetWeapons()
  11.250 +		private void SetWeapons ()
  11.251  		{
  11.252 -			CellRendererText renderer = new CellRendererText();
  11.253 -			equipmentList.AppendColumn("", renderer, new TreeCellDataFunc(RenderEquipmentLine));
  11.254 +			CellRendererText renderer = new CellRendererText ();
  11.255 +			equipmentList.AppendColumn ("", renderer, new TreeCellDataFunc (RenderEquipmentLine));
  11.256  			
  11.257 -			ListStore model = new ListStore(typeof(UnitEquipmentItem));
  11.258 +			ListStore model = new ListStore (typeof (UnitEquipmentItem));
  11.259  			
  11.260 -			foreach (UnitEquipmentItem item in unit.GetEquipment())
  11.261 -			{
  11.262 -				model.AppendValues(item);
  11.263 +			foreach (UnitEquipmentItem item in unit.GetEquipment ()) {
  11.264 +				model.AppendValues (item);
  11.265  			}
  11.266  			
  11.267  			equipmentList.Model = model;
  11.268  		}
  11.269 -		
  11.270 -		public void RenderEquipmentLine(TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
  11.271 +
  11.272 +		public void RenderEquipmentLine (TreeViewColumn column, CellRenderer cell, TreeModel model, TreeIter iter)
  11.273  		{
  11.274 -			object o = model.GetValue(iter, 0);
  11.275 +			object o = model.GetValue (iter, 0);
  11.276  			
  11.277 -			if (o is UnitEquipmentItem)
  11.278 -			{
  11.279 +			if (o is UnitEquipmentItem) {
  11.280  				UnitEquipmentItem item = (UnitEquipmentItem)o;
  11.281 -				(cell as CellRendererText).Text = GetUnitEquipmentText(item);
  11.282 +				(cell as CellRendererText).Text = GetUnitEquipmentText (item);
  11.283  			}			
  11.284  						
  11.285  		}
  11.286 -		
  11.287 -		private string GetUnitEquipmentText(UnitEquipmentItem item)
  11.288 +
  11.289 +		private string GetUnitEquipmentText (UnitEquipmentItem item)
  11.290  		{
  11.291  			string translation = "";
  11.292  
  11.293 -			if (item.Cost == 0)
  11.294 -			{
  11.295 -				translation = Translation.GetTranslation("equipmentAmountWithZeroCost", "{0} ({1} - free)", item.Name, GetAmountString(item));
  11.296 -			}
  11.297 -			else
  11.298 -			{
  11.299 -				translation = Translation.GetTranslation("equipmentAmountWithCost", "{0} ({1} at {2}pts each)", item.Name, GetAmountString(item), item.Cost);
  11.300 +			if (item.Cost == 0) {
  11.301 +				translation = Translation.GetTranslation ("equipmentAmountWithZeroCost", "{0} ({1} - free)", item.Name, GetAmountString (item));
  11.302 +			} else {
  11.303 +				translation = Translation.GetTranslation ("equipmentAmountWithCost", "{0} ({1} at {2}pts each)", item.Name, GetAmountString (item), item.Cost);
  11.304  			}
  11.305  
  11.306  			return translation;
  11.307  		}
  11.308  
  11.309 -		private string GetAmountString(UnitEquipmentItem item)
  11.310 +		private string GetAmountString (UnitEquipmentItem item)
  11.311  		{
  11.312 -			double amount = UnitEquipmentUtil.GetEquipmentAmount(unit, item);
  11.313 +			double amount = UnitEquipmentUtil.GetEquipmentAmount (unit, item);
  11.314  			string amountString = "";
  11.315  			
  11.316 -			if (UnitEquipmentUtil.GetEquipmentAmountIsRatio(unit, item))
  11.317 -			{
  11.318 -				int number = UnitEquipmentUtil.GetEquipmentAmountTaken(unit, item);
  11.319 +			if (UnitEquipmentUtil.GetEquipmentAmountIsRatio (unit, item)) {
  11.320 +				int number = UnitEquipmentUtil.GetEquipmentAmountTaken (unit, item);
  11.321  				
  11.322 -				if (amount == 100)
  11.323 -				{
  11.324 -					amountString = Translation.GetTranslation("equipmentChoiceAmountAll", "all ({1})", amount, number);
  11.325 +				if (amount == 100) {
  11.326 +					amountString = Translation.GetTranslation ("equipmentChoiceAmountAll", "all ({1})", amount, number);
  11.327 +				} else {
  11.328 +					amountString = Translation.GetTranslation ("equipmentChoiceAmountPercentage", "{0}% ({1})", amount, number);
  11.329  				}
  11.330 -				else
  11.331 -				{
  11.332 -					amountString = Translation.GetTranslation("equipmentChoiceAmountPercentage", "{0}% ({1})", amount, number);
  11.333 -				}
  11.334 -			}
  11.335 -			else
  11.336 -			{
  11.337 -				amountString = Translation.GetTranslation("equipmentChoiceAmountNumber", "{0}", amount);
  11.338 +			} else {
  11.339 +				amountString = Translation.GetTranslation ("equipmentChoiceAmountNumber", "{0}", amount);
  11.340  			}
  11.341  			
  11.342  			return amountString;
  11.343  		}
  11.344  
  11.345 -		public WFObjects.Unit Unit
  11.346 -		{
  11.347 +		public WFObjects.Unit Unit {
  11.348  			get { return unit; }
  11.349  		}
  11.350 -		
  11.351 -		private void UnitNameChanged(WarFoundryObject obj, string oldValue, string newValue)
  11.352 +
  11.353 +		private void UnitNameChanged (WarFoundryObject obj, string oldValue, string newValue)
  11.354  		{
  11.355  			unitName.Text = newValue;
  11.356  		}
  11.357 -		
  11.358 -		private void UnitSizeChanged(WarFoundryObject obj, int oldValue, int newValue)
  11.359 +
  11.360 +		private void UnitSizeChanged (WarFoundryObject obj, int oldValue, int newValue)
  11.361  		{
  11.362  			unitSize.Value = newValue;
  11.363  		}
  11.364  
  11.365 -		private void HandleUnitUnitEquipmentAmountChanged(WarFoundryObject obj, double oldValue, double newValue)
  11.366 +		private void HandleUnitUnitEquipmentAmountChanged (WarFoundryObject obj, double oldValue, double newValue)
  11.367  		{
  11.368 -			if (oldValue == 0)
  11.369 -			{
  11.370 -				((ListStore)equipmentList.Model).AppendValues(obj);
  11.371 -			}
  11.372 -			else
  11.373 -			{
  11.374 -				if (newValue == 0)
  11.375 -				{
  11.376 -					TreeIter treeIter = TreeUtils.GetItemIter(equipmentList, obj);
  11.377 -					((ListStore)equipmentList.Model).Remove(ref treeIter);
  11.378 +			if (oldValue == 0) {
  11.379 +				((ListStore)equipmentList.Model).AppendValues (obj);
  11.380 +			} else {
  11.381 +				if (newValue == 0) {
  11.382 +					TreeIter treeIter = TreeUtils.GetItemIter (equipmentList, obj);
  11.383 +					((ListStore)equipmentList.Model).Remove (ref treeIter);
  11.384  				}
  11.385  
  11.386  			}			
  11.387 -			equipmentList.QueueDraw();
  11.388 +			equipmentList.QueueDraw ();
  11.389  		}
  11.390  
  11.391 -		protected virtual void OnUnitSizeFocusOut(object o, Gtk.FocusOutEventArgs args)
  11.392 +		protected virtual void OnUnitSizeFocusOut (object o, Gtk.FocusOutEventArgs args)
  11.393  		{
  11.394 -			SetNewUnitSize();
  11.395 +			SetNewUnitSize ();
  11.396  		}
  11.397  
  11.398  		[GLib.ConnectBefore ()]
  11.399  
  11.400 -		protected virtual void OnUnitSizeKeyPress(object o, Gtk.KeyPressEventArgs args)
  11.401 +		protected virtual void OnUnitSizeKeyPress (object o, Gtk.KeyPressEventArgs args)
  11.402  		{
  11.403 -			if (args.Event.Key == Gdk.Key.Return || args.Event.Key == Gdk.Key.KP_Enter)
  11.404 -			{
  11.405 -				SetNewUnitSize();
  11.406 -			}
  11.407 -		}
  11.408 -		
  11.409 -		private void SetNewUnitSize()
  11.410 -		{
  11.411 -			if (unitSize.Value != unit.Size)
  11.412 -			{
  11.413 -				SetUnitSizeCommand cmd = new SetUnitSizeCommand(unit, (int)Math.Round(unitSize.Value));
  11.414 -				stack.Execute(cmd);
  11.415 +			if (args.Event.Key == Gdk.Key.Return || args.Event.Key == Gdk.Key.KP_Enter) {
  11.416 +				SetNewUnitSize ();
  11.417  			}
  11.418  		}
  11.419  
  11.420 -		protected virtual void OnUnitNameFocusOut(object o, Gtk.FocusOutEventArgs args)
  11.421 +		private void SetNewUnitSize ()
  11.422  		{
  11.423 -			SetNewUnitName();
  11.424 +			if (unitSize.Value != unit.Size) {
  11.425 +				SetUnitSizeCommand cmd = new SetUnitSizeCommand (unit, (int)Math.Round (unitSize.Value));
  11.426 +				stack.Execute (cmd);
  11.427 +			}
  11.428 +		}
  11.429 +
  11.430 +		protected virtual void OnUnitNameFocusOut (object o, Gtk.FocusOutEventArgs args)
  11.431 +		{
  11.432 +			SetNewUnitName ();
  11.433  		}
  11.434  
  11.435  		[GLib.ConnectBefore ()]
  11.436  
  11.437 -		protected virtual void OnUnitNameKeyPress(object o, Gtk.KeyPressEventArgs args)
  11.438 +		protected virtual void OnUnitNameKeyPress (object o, Gtk.KeyPressEventArgs args)
  11.439  		{
  11.440 -			if (args.Event.Key == Gdk.Key.Return || args.Event.Key == Gdk.Key.KP_Enter)
  11.441 -			{
  11.442 -				SetNewUnitName();
  11.443 +			if (args.Event.Key == Gdk.Key.Return || args.Event.Key == Gdk.Key.KP_Enter) {
  11.444 +				SetNewUnitName ();
  11.445  			}
  11.446  		}
  11.447 -		
  11.448 -		private void SetNewUnitName()
  11.449 +
  11.450 +		private void SetNewUnitName ()
  11.451  		{
  11.452 -			if (unitName.Text != unit.Name)
  11.453 -			{
  11.454 -				SetNameCommand cmd = new SetNameCommand(unit, unitName.Text);
  11.455 -				stack.Execute(cmd);
  11.456 +			if (unitName.Text != unit.Name) {
  11.457 +				SetNameCommand cmd = new SetNameCommand (unit, unitName.Text);
  11.458 +				stack.Execute (cmd);
  11.459  			}
  11.460  		}
  11.461 -		
  11.462 -		private void OnBttnAddEquipmentClicked(object sender, System.EventArgs e)
  11.463 +
  11.464 +		private void OnBttnAddEquipmentClicked (object sender, System.EventArgs e)
  11.465  		{
  11.466 -			AddEquipment();
  11.467 +			AddEquipment ();
  11.468  		}
  11.469 -		
  11.470 -		private void AddEquipment()
  11.471 +
  11.472 +		private void AddEquipment ()
  11.473  		{
  11.474 -			AddEquipmentUIControl addEquipment = new AddEquipmentUIControl(unit, stack);
  11.475 -			addEquipment.Show();
  11.476 +			AddEquipmentUIControl addEquipment = new AddEquipmentUIControl (unit, stack);
  11.477 +			addEquipment.Show ();
  11.478  		}
  11.479 -		
  11.480 -		protected virtual void HandleRemoveButtonActivated(object sender, System.EventArgs e)
  11.481 +
  11.482 +		protected virtual void HandleRemoveButtonActivated (object sender, System.EventArgs e)
  11.483  		{
  11.484 -			UnitEquipmentItem item = GetSelectedEquipmentItem();
  11.485 -			log.Debug("Remove " + item);
  11.486 +			UnitEquipmentItem item = GetSelectedEquipmentItem ();
  11.487 +			log.Debug ("Remove " + item);
  11.488  				
  11.489 -			if (item != null)
  11.490 -			{
  11.491 -				SetUnitEquipmentNumericAmountCommand cmd = new SetUnitEquipmentNumericAmountCommand(unit, item, 0);
  11.492 -				stack.Execute(cmd);
  11.493 +			if (item != null) {
  11.494 +				SetUnitEquipmentNumericAmountCommand cmd = new SetUnitEquipmentNumericAmountCommand (unit, item, 0);
  11.495 +				stack.Execute (cmd);
  11.496  			}
  11.497  		}		
  11.498 -		
  11.499 -		protected virtual void HandleEditButtonClicked(object sender, System.EventArgs e)
  11.500 +
  11.501 +		protected virtual void HandleEditButtonClicked (object sender, System.EventArgs e)
  11.502  		{
  11.503 -			UnitEquipmentItem item = GetSelectedEquipmentItem();
  11.504 -			log.Debug("Edit " + item);
  11.505 +			UnitEquipmentItem item = GetSelectedEquipmentItem ();
  11.506 +			log.Debug ("Edit " + item);
  11.507  			
  11.508 -			if (item != null)
  11.509 -			{
  11.510 -				EditEquipmentUIControl editEquipment = new EditEquipmentUIControl(unit, item, stack);
  11.511 -				editEquipment.Show();
  11.512 +			if (item != null) {
  11.513 +				EditEquipmentUIControl editEquipment = new EditEquipmentUIControl (unit, item, stack);
  11.514 +				editEquipment.Show ();
  11.515  			}
  11.516  		}
  11.517 -		
  11.518 -		protected virtual void HandleReplaceButtonClicked(object sender, System.EventArgs e)
  11.519 +
  11.520 +		protected virtual void HandleReplaceButtonClicked (object sender, System.EventArgs e)
  11.521  		{
  11.522 -			UnitEquipmentItem item = GetSelectedEquipmentItem();
  11.523 -			log.Debug("Replace " + item);
  11.524 +			UnitEquipmentItem item = GetSelectedEquipmentItem ();
  11.525 +			log.Debug ("Replace " + item);
  11.526  				
  11.527 -			if (item != null)
  11.528 -			{
  11.529 -				ReplaceEquipmentUIControl addEquipment = new ReplaceEquipmentUIControl(unit, item, stack);
  11.530 -				addEquipment.Show();
  11.531 +			if (item != null) {
  11.532 +				ReplaceEquipmentUIControl addEquipment = new ReplaceEquipmentUIControl (unit, item, stack);
  11.533 +				addEquipment.Show ();
  11.534  			}
  11.535  		}		
  11.536  	}
    12.1 --- a/gtk-gui/IBBoard.WarFoundry.GTK.FrmMainWindow.cs	Tue Nov 23 21:03:46 2010 +0000
    12.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.3 @@ -1,235 +0,0 @@
    12.4 -
    12.5 -// This file has been generated by the GUI designer. Do not modify.
    12.6 -namespace IBBoard.WarFoundry.GTK
    12.7 -{
    12.8 -	public partial class FrmMainWindow
    12.9 -	{
   12.10 -		private global::Gtk.UIManager UIManager;
   12.11 -
   12.12 -		private global::Gtk.Action menuFile;
   12.13 -
   12.14 -		private global::Gtk.Action miCreateArmy;
   12.15 -
   12.16 -		private global::Gtk.Action miOpenArmy;
   12.17 -
   12.18 -		private global::Gtk.Action miSaveArmy;
   12.19 -
   12.20 -		private global::Gtk.Action miSaveArmyAs;
   12.21 -
   12.22 -		private global::Gtk.Action miCloseArmy;
   12.23 -
   12.24 -		private global::Gtk.Action refreshAction;
   12.25 -
   12.26 -		private global::Gtk.Action miExit;
   12.27 -
   12.28 -		private global::Gtk.Action menuEdit;
   12.29 -
   12.30 -		private global::Gtk.Action miUndo;
   12.31 -
   12.32 -		private global::Gtk.Action miRedo;
   12.33 -
   12.34 -		private global::Gtk.Action menuHelp;
   12.35 -
   12.36 -		private global::Gtk.Action miAbout;
   12.37 -
   12.38 -		private global::Gtk.Action miDebugInformation;
   12.39 -
   12.40 -		private global::Gtk.Action newArmyButton;
   12.41 -
   12.42 -		private global::Gtk.Action openArmyButton;
   12.43 -
   12.44 -		private global::Gtk.Action saveArmyButton;
   12.45 -
   12.46 -		private global::Gtk.Action undoActionButton;
   12.47 -
   12.48 -		private global::Gtk.Action redoActionButton;
   12.49 -
   12.50 -		private global::Gtk.Action goDown;
   12.51 -
   12.52 -		private global::Gtk.Action @add;
   12.53 -
   12.54 -		private global::Gtk.Action miExportArmy;
   12.55 -
   12.56 -		private global::Gtk.Action miExportAsBasicHtml;
   12.57 -
   12.58 -		private global::Gtk.VBox vbox1;
   12.59 -
   12.60 -		private global::Gtk.MenuBar menubar1;
   12.61 -
   12.62 -		private global::Gtk.Toolbar toolbar;
   12.63 -
   12.64 -		private global::Gtk.HPaned hpaned2;
   12.65 -
   12.66 -		private global::Gtk.TreeView treeUnits;
   12.67 -
   12.68 -		private global::Gtk.Notebook unitsNotebook;
   12.69 -
   12.70 -		private global::Gtk.Statusbar statusbar1;
   12.71 -
   12.72 -		protected virtual void Build()
   12.73 -		{
   12.74 -			global::Stetic.Gui.Initialize(this);
   12.75 -			// Widget IBBoard.WarFoundry.GTK.FrmMainWindow
   12.76 -			this.UIManager = new global::Gtk.UIManager();
   12.77 -			global::Gtk.ActionGroup w1 = new global::Gtk.ActionGroup("Default");
   12.78 -			this.menuFile = new global::Gtk.Action("menuFile", global::Mono.Unix.Catalog.GetString("File"), null, null);
   12.79 -			this.menuFile.ShortLabel = global::Mono.Unix.Catalog.GetString("File");
   12.80 -			w1.Add(this.menuFile, null);
   12.81 -			this.miCreateArmy = new global::Gtk.Action("miCreateArmy", global::Mono.Unix.Catalog.GetString("Create army"), null, "gtk-new");
   12.82 -			this.miCreateArmy.ShortLabel = global::Mono.Unix.Catalog.GetString("Create army");
   12.83 -			w1.Add(this.miCreateArmy, null);
   12.84 -			this.miOpenArmy = new global::Gtk.Action("miOpenArmy", global::Mono.Unix.Catalog.GetString("Open army"), null, "gtk-open");
   12.85 -			this.miOpenArmy.ShortLabel = global::Mono.Unix.Catalog.GetString("Open army");
   12.86 -			w1.Add(this.miOpenArmy, null);
   12.87 -			this.miSaveArmy = new global::Gtk.Action("miSaveArmy", global::Mono.Unix.Catalog.GetString("Save army"), null, "gtk-save");
   12.88 -			this.miSaveArmy.Sensitive = false;
   12.89 -			this.miSaveArmy.ShortLabel = global::Mono.Unix.Catalog.GetString("Save army");
   12.90 -			w1.Add(this.miSaveArmy, null);
   12.91 -			this.miSaveArmyAs = new global::Gtk.Action("miSaveArmyAs", global::Mono.Unix.Catalog.GetString("Save army as"), null, "gtk-save-as");
   12.92 -			this.miSaveArmyAs.Sensitive = false;
   12.93 -			this.miSaveArmyAs.ShortLabel = global::Mono.Unix.Catalog.GetString("Save army as");
   12.94 -			w1.Add(this.miSaveArmyAs, null);
   12.95 -			this.miCloseArmy = new global::Gtk.Action("miCloseArmy", global::Mono.Unix.Catalog.GetString("Close army"), null, "gtk-close");
   12.96 -			this.miCloseArmy.Sensitive = false;
   12.97 -			this.miCloseArmy.ShortLabel = global::Mono.Unix.Catalog.GetString("Close army");
   12.98 -			w1.Add(this.miCloseArmy, null);
   12.99 -			this.refreshAction = new global::Gtk.Action("refreshAction", global::Mono.Unix.Catalog.GetString("Reload files"), null, "gtk-refresh");
  12.100 -			this.refreshAction.ShortLabel = global::Mono.Unix.Catalog.GetString("Reload files");
  12.101 -			w1.Add(this.refreshAction, null);
  12.102 -			this.miExit = new global::Gtk.Action("miExit", global::Mono.Unix.Catalog.GetString("Exit"), null, "gtk-quit");
  12.103 -			this.miExit.ShortLabel = global::Mono.Unix.Catalog.GetString("Exit");
  12.104 -			w1.Add(this.miExit, null);
  12.105 -			this.menuEdit = new global::Gtk.Action("menuEdit", global::Mono.Unix.Catalog.GetString("Edit"), null, null);
  12.106 -			this.menuEdit.ShortLabel = global::Mono.Unix.Catalog.GetString("Edit");
  12.107 -			w1.Add(this.menuEdit, null);
  12.108 -			this.miUndo = new global::Gtk.Action("miUndo", global::Mono.Unix.Catalog.GetString("Undo"), null, "gtk-undo");
  12.109 -			this.miUndo.Sensitive = false;
  12.110 -			this.miUndo.ShortLabel = global::Mono.Unix.Catalog.GetString("Undo");
  12.111 -			w1.Add(this.miUndo, null);
  12.112 -			this.miRedo = new global::Gtk.Action("miRedo", global::Mono.Unix.Catalog.GetString("Redo"), null, "gtk-redo");
  12.113 -			this.miRedo.Sensitive = false;
  12.114 -			this.miRedo.ShortLabel = global::Mono.Unix.Catalog.GetString("Redo");
  12.115 -			w1.Add(this.miRedo, null);
  12.116 -			this.menuHelp = new global::Gtk.Action("menuHelp", global::Mono.Unix.Catalog.GetString("Help"), null, null);
  12.117 -			this.menuHelp.ShortLabel = global::Mono.Unix.Catalog.GetString("Help");
  12.118 -			w1.Add(this.menuHelp, null);
  12.119 -			this.miAbout = new global::Gtk.Action("miAbout", global::Mono.Unix.Catalog.GetString("About"), null, "gtk-about");
  12.120 -			this.miAbout.ShortLabel = global::Mono.Unix.Catalog.GetString("About");
  12.121 -			w1.Add(this.miAbout, null);
  12.122 -			this.miDebugInformation = new global::Gtk.Action("miDebugInformation", global::Mono.Unix.Catalog.GetString("Debug Information"), null, null);
  12.123 -			this.miDebugInformation.ShortLabel = global::Mono.Unix.Catalog.GetString("Debug Information");
  12.124 -			w1.Add(this.miDebugInformation, null);
  12.125 -			this.newArmyButton = new global::Gtk.Action("newArmyButton", null, null, "gtk-new");
  12.126 -			w1.Add(this.newArmyButton, null);
  12.127 -			this.openArmyButton = new global::Gtk.Action("openArmyButton", null, null, "gtk-open");
  12.128 -			w1.Add(this.openArmyButton, null);
  12.129 -			this.saveArmyButton = new global::Gtk.Action("saveArmyButton", null, null, "gtk-save");
  12.130 -			this.saveArmyButton.Sensitive = false;
  12.131 -			w1.Add(this.saveArmyButton, null);
  12.132 -			this.undoActionButton = new global::Gtk.Action("undoActionButton", null, null, "gtk-undo");
  12.133 -			this.undoActionButton.Sensitive = false;
  12.134 -			w1.Add(this.undoActionButton, null);
  12.135 -			this.redoActionButton = new global::Gtk.Action("redoActionButton", null, null, "gtk-redo");
  12.136 -			this.redoActionButton.Sensitive = false;
  12.137 -			w1.Add(this.redoActionButton, null);
  12.138 -			this.goDown = new global::Gtk.Action("goDown", null, null, null);
  12.139 -			w1.Add(this.goDown, null);
  12.140 -			this.@add = new global::Gtk.Action("add", null, null, "gtk-add");
  12.141 -			w1.Add(this.@add, null);
  12.142 -			this.miExportArmy = new global::Gtk.Action("miExportArmy", global::Mono.Unix.Catalog.GetString("Export army as..."), null, "gtk-convert");
  12.143 -			this.miExportArmy.Sensitive = false;
  12.144 -			this.miExportArmy.ShortLabel = global::Mono.Unix.Catalog.GetString("Export army");
  12.145 -			w1.Add(this.miExportArmy, null);
  12.146 -			this.miExportAsBasicHtml = new global::Gtk.Action("miExportAsBasicHtml", global::Mono.Unix.Catalog.GetString("Basic HTML"), null, null);
  12.147 -			this.miExportAsBasicHtml.ShortLabel = global::Mono.Unix.Catalog.GetString("Basic HTML");
  12.148 -			w1.Add(this.miExportAsBasicHtml, null);
  12.149 -			this.UIManager.InsertActionGroup(w1, 0);
  12.150 -			this.AddAccelGroup(this.UIManager.AccelGroup);
  12.151 -			this.Name = "IBBoard.WarFoundry.GTK.FrmMainWindow";
  12.152 -			this.Title = global::Mono.Unix.Catalog.GetString("MainWindow");
  12.153 -			this.Icon = global::Gdk.Pixbuf.LoadFromResource("App.ico");
  12.154 -			// Container child IBBoard.WarFoundry.GTK.FrmMainWindow.Gtk.Container+ContainerChild
  12.155 -			this.vbox1 = new global::Gtk.VBox();
  12.156 -			this.vbox1.Name = "vbox1";
  12.157 -			// Container child vbox1.Gtk.Box+BoxChild
  12.158 -			this.UIManager.AddUiFromString("<ui><menubar name='menubar1'><menu name='menuFile' action='menuFile'><menuitem name='miCreateArmy' action='miCreateArmy'/><menuitem name='miOpenArmy' action='miOpenArmy'/><menuitem name='miSaveArmy' action='miSaveArmy'/><menuitem name='miSaveArmyAs' action='miSaveArmyAs'/><menu name='miExportArmy' action='miExportArmy'><menuitem name='miExportAsBasicHtml' action='miExportAsBasicHtml'/></menu><menuitem name='miCloseArmy' action='miCloseArmy'/><separator/><menuitem name='refreshAction' action='refreshAction'/><separator/><menuitem name='miExit' action='miExit'/></menu><menu name='menuEdit' action='menuEdit'><menuitem name='miUndo' action='miUndo'/><menuitem name='miRedo' action='miRedo'/></menu><menu name='menuHelp' action='menuHelp'><menuitem name='miAbout' action='miAbout'/><menuitem name='miDebugInformation' action='miDebugInformation'/></menu></menubar></ui>");
  12.159 -			this.menubar1 = ((global::Gtk.MenuBar)(this.UIManager.GetWidget("/menubar1")));
  12.160 -			this.menubar1.Name = "menubar1";
  12.161 -			this.vbox1.Add(this.menubar1);
  12.162 -			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.menubar1]));
  12.163 -			w2.Position = 0;
  12.164 -			w2.Expand = false;
  12.165 -			w2.Fill = false;
  12.166 -			// Container child vbox1.Gtk.Box+BoxChild
  12.167 -			this.UIManager.AddUiFromString("<ui><toolbar name='toolbar'><toolitem name='newArmyButton' action='newArmyButton'/><toolitem name='openArmyButton' action='openArmyButton'/><toolitem name='saveArmyButton' action='saveArmyButton'/><separator/><toolitem name='undoActionButton' action='undoActionButton'/><toolitem name='redoActionButton' action='redoActionButton'/><separator/></toolbar></ui>");
  12.168 -			this.toolbar = ((global::Gtk.Toolbar)(this.UIManager.GetWidget("/toolbar")));
  12.169 -			this.toolbar.HeightRequest = 36;
  12.170 -			this.toolbar.Name = "toolbar";
  12.171 -			this.toolbar.ShowArrow = false;
  12.172 -			this.toolbar.ToolbarStyle = ((global::Gtk.ToolbarStyle)(0));
  12.173 -			this.toolbar.IconSize = ((global::Gtk.IconSize)(3));
  12.174 -			this.vbox1.Add(this.toolbar);
  12.175 -			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.toolbar]));
  12.176 -			w3.Position = 1;
  12.177 -			w3.Expand = false;
  12.178 -			w3.Fill = false;
  12.179 -			// Container child vbox1.Gtk.Box+BoxChild
  12.180 -			this.hpaned2 = new global::Gtk.HPaned();
  12.181 -			this.hpaned2.CanFocus = true;
  12.182 -			this.hpaned2.Name = "hpaned2";
  12.183 -			this.hpaned2.Position = 178;
  12.184 -			// Container child hpaned2.Gtk.Paned+PanedChild
  12.185 -			this.treeUnits = new global::Gtk.TreeView();
  12.186 -			this.treeUnits.CanFocus = true;
  12.187 -			this.treeUnits.Name = "treeUnits";
  12.188 -			this.hpaned2.Add(this.treeUnits);
  12.189 -			global::Gtk.Paned.PanedChild w4 = ((global::Gtk.Paned.PanedChild)(this.hpaned2[this.treeUnits]));
  12.190 -			w4.Resize = false;
  12.191 -			// Container child hpaned2.Gtk.Paned+PanedChild
  12.192 -			this.unitsNotebook = new global::Gtk.Notebook();
  12.193 -			this.unitsNotebook.CanFocus = true;
  12.194 -			this.unitsNotebook.Name = "unitsNotebook";
  12.195 -			this.unitsNotebook.CurrentPage = -1;
  12.196 -			this.unitsNotebook.Scrollable = true;
  12.197 -			this.hpaned2.Add(this.unitsNotebook);
  12.198 -			this.vbox1.Add(this.hpaned2);
  12.199 -			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.hpaned2]));
  12.200 -			w6.Position = 2;
  12.201 -			// Container child vbox1.Gtk.Box+BoxChild
  12.202 -			this.statusbar1 = new global::Gtk.Statusbar();
  12.203 -			this.statusbar1.Name = "statusbar1";
  12.204 -			this.statusbar1.Spacing = 2;
  12.205 -			this.vbox1.Add(this.statusbar1);
  12.206 -			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.statusbar1]));
  12.207 -			w7.Position = 3;
  12.208 -			w7.Expand = false;
  12.209 -			w7.Fill = false;
  12.210 -			this.Add(this.vbox1);
  12.211 -			if ((this.Child != null))
  12.212 -			{
  12.213 -				this.Child.ShowAll();
  12.214 -			}
  12.215 -			this.DefaultWidth = 832;
  12.216 -			this.DefaultHeight = 659;
  12.217 -			this.hpaned2.Hide();
  12.218 -			this.Show();
  12.219 -			this.miCreateArmy.Activated += new global::System.EventHandler(this.OnCreateArmyActivated);
  12.220 -			this.miOpenArmy.Activated += new global::System.EventHandler(this.OnOpenArmyActivated);
  12.221 -			this.miSaveArmy.Activated += new global::System.EventHandler(this.OnSaveArmyActivated);
  12.222 -			this.miSaveArmyAs.Activated += new global::System.EventHandler(this.OnSaveArmyAsActivated);
  12.223 -			this.miCloseArmy.Activated += new global::System.EventHandler(this.OnCloseArmyActivated);
  12.224 -			this.refreshAction.Activated += new global::System.EventHandler(this.OnReloadFilesActivated);
  12.225 -			this.miExit.Activated += new global::System.EventHandler(this.OnExitActivated);
  12.226 -			this.newArmyButton.Activated += new global::System.EventHandler(this.newTBButtonActivated);
  12.227 -			this.openArmyButton.Activated += new global::System.EventHandler(this.openTBButtonActivated);
  12.228 -			this.saveArmyButton.Activated += new global::System.EventHandler(this.saveTBButtonActivated);
  12.229 -			this.undoActionButton.Activated += new global::System.EventHandler(this.undoTBButtonActivated);
  12.230 -			this.redoActionButton.Activated += new global::System.EventHandler(this.redoTBButtonActivated);
  12.231 -			this.miExportAsBasicHtml.Activated += new global::System.EventHandler(this.OnMiExportAsBasicHtmlActivated);
  12.232 -			this.treeUnits.RowActivated += new global::Gtk.RowActivatedHandler(this.ArmyRowActivated);
  12.233 -			this.treeUnits.PopupMenu += new global::Gtk.PopupMenuHandler(this.OnTreeUnitsPopupMenu);
  12.234 -			this.treeUnits.ButtonPressEvent += new global::Gtk.ButtonPressEventHandler(this.UnitTreeButtonPressed);
  12.235 -			this.unitsNotebook.Removed += new global::Gtk.RemovedHandler(this.NotebookPageRemoved);
  12.236 -		}
  12.237 -	}
  12.238 -}
    13.1 --- a/gtk-gui/IBBoard.WarFoundry.GTK.FrmNewArmy.cs	Tue Nov 23 21:03:46 2010 +0000
    13.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.3 @@ -1,229 +0,0 @@
    13.4 -
    13.5 -// This file has been generated by the GUI designer. Do not modify.
    13.6 -namespace IBBoard.WarFoundry.GTK
    13.7 -{
    13.8 -	public partial class FrmNewArmy
    13.9 -	{
   13.10 -		private global::Gtk.Table table1;
   13.11 -
   13.12 -		private global::Gtk.ScrolledWindow GtkScrolledWindow;
   13.13 -
   13.14 -		private global::Gtk.TreeView lstRaces;
   13.15 -
   13.16 -		private global::Gtk.HBox hbox2;
   13.17 -
   13.18 -		private global::Gtk.SpinButton sbPointsValue;
   13.19 -
   13.20 -		private global::Gtk.Label label1;
   13.21 -
   13.22 -		private global::Gtk.Label label2;
   13.23 -
   13.24 -		private global::Gtk.Label label3;
   13.25 -
   13.26 -		private global::Gtk.Label label4;
   13.27 -
   13.28 -		private global::Gtk.ComboBoxEntry systemCombo;
   13.29 -
   13.30 -		private global::Gtk.Entry txtArmyName;
   13.31 -
   13.32 -		private global::Gtk.Button bttnCancel;
   13.33 -
   13.34 -		private global::Gtk.Button bttnCreate;
   13.35 -
   13.36 -		protected virtual void Build()
   13.37 -		{
   13.38 -			global::Stetic.Gui.Initialize(this);
   13.39 -			// Widget IBBoard.WarFoundry.GTK.FrmNewArmy
   13.40 -			this.Events = ((global::Gdk.EventMask)(256));
   13.41 -			this.Name = "IBBoard.WarFoundry.GTK.FrmNewArmy";
   13.42 -			this.Title = global::Mono.Unix.Catalog.GetString("Create new army");
   13.43 -			this.Icon = global::Stetic.IconLoader.LoadIcon(this, "gtk-new", global::Gtk.IconSize.Menu);
   13.44 -			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
   13.45 -			this.SkipPagerHint = true;
   13.46 -			this.SkipTaskbarHint = true;
   13.47 -			// Internal child IBBoard.WarFoundry.GTK.FrmNewArmy.VBox
   13.48 -			global::Gtk.VBox w1 = this.VBox;
   13.49 -			w1.CanFocus = true;
   13.50 -			w1.Events = ((global::Gdk.EventMask)(256));
   13.51 -			w1.Name = "dialog_VBox";
   13.52 -			w1.BorderWidth = ((uint)(2));
   13.53 -			// Container child dialog_VBox.Gtk.Box+BoxChild
   13.54 -			this.table1 = new global::Gtk.Table(((uint)(4)), ((uint)(2)), false);
   13.55 -			this.table1.Name = "table1";
   13.56 -			this.table1.RowSpacing = ((uint)(6));
   13.57 -			this.table1.ColumnSpacing = ((uint)(6));
   13.58 -			// Container child table1.Gtk.Table+TableChild
   13.59 -			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow();
   13.60 -			this.GtkScrolledWindow.Name = "GtkScrolledWindow";
   13.61 -			this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));
   13.62 -			// Container child GtkScrolledWindow.Gtk.Container+ContainerChild
   13.63 -			this.lstRaces = new global::Gtk.TreeView();
   13.64 -			this.lstRaces.HeightRequest = 150;
   13.65 -			this.lstRaces.CanFocus = true;
   13.66 -			this.lstRaces.Name = "lstRaces";
   13.67 -			this.lstRaces.HeadersVisible = false;
   13.68 -			this.lstRaces.RulesHint = true;
   13.69 -			this.GtkScrolledWindow.Add(this.lstRaces);
   13.70 -			this.table1.Add(this.GtkScrolledWindow);
   13.71 -			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1[this.GtkScrolledWindow]));
   13.72 -			w3.TopAttach = ((uint)(1));
   13.73 -			w3.BottomAttach = ((uint)(2));
   13.74 -			w3.LeftAttach = ((uint)(1));
   13.75 -			w3.RightAttach = ((uint)(2));
   13.76 -			w3.XOptions = ((global::Gtk.AttachOptions)(4));
   13.77 -			w3.YOptions = ((global::Gtk.AttachOptions)(4));
   13.78 -			// Container child table1.Gtk.Table+TableChild
   13.79 -			this.hbox2 = new global::Gtk.HBox();
   13.80 -			this.hbox2.Name = "hbox2";
   13.81 -			// Container child hbox2.Gtk.Box+BoxChild
   13.82 -			this.sbPointsValue = new global::Gtk.SpinButton(0, 2000000000, 100);
   13.83 -			this.sbPointsValue.WidthRequest = 150;
   13.84 -			this.sbPointsValue.CanFocus = true;
   13.85 -			this.sbPointsValue.Name = "sbPointsValue";
   13.86 -			this.sbPointsValue.Adjustment.PageIncrement = 1000;
   13.87 -			this.sbPointsValue.ClimbRate = 100;
   13.88 -			this.sbPointsValue.Numeric = true;
   13.89 -			this.sbPointsValue.Value = 1000;
   13.90 -			this.hbox2.Add(this.sbPointsValue);
   13.91 -			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.sbPointsValue]));
   13.92 -			w4.Position = 0;
   13.93 -			w4.Expand = false;
   13.94 -			w4.Fill = false;
   13.95 -			this.table1.Add(this.hbox2);
   13.96 -			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1[this.hbox2]));
   13.97 -			w5.TopAttach = ((uint)(3));
   13.98 -			w5.BottomAttach = ((uint)(4));
   13.99 -			w5.LeftAttach = ((uint)(1));
  13.100 -			w5.RightAttach = ((uint)(2));
  13.101 -			w5.XOptions = ((global::Gtk.AttachOptions)(4));
  13.102 -			w5.YOptions = ((global::Gtk.AttachOptions)(4));
  13.103 -			// Container child table1.Gtk.Table+TableChild
  13.104 -			this.label1 = new global::Gtk.Label();
  13.105 -			this.label1.Name = "label1";
  13.106 -			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("Race");
  13.107 -			this.table1.Add(this.label1);
  13.108 -			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1[this.label1]));
  13.109 -			w6.TopAttach = ((uint)(1));
  13.110 -			w6.BottomAttach = ((uint)(2));
  13.111 -			w6.XOptions = ((global::Gtk.AttachOptions)(4));
  13.112 -			w6.YOptions = ((global::Gtk.AttachOptions)(4));
  13.113 -			// Container child table1.Gtk.Table+TableChild
  13.114 -			this.label2 = new global::Gtk.Label();
  13.115 -			this.label2.Name = "label2";
  13.116 -			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString("Army name");
  13.117 -			this.table1.Add(this.label2);
  13.118 -			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1[this.label2]));
  13.119 -			w7.TopAttach = ((uint)(2));
  13.120 -			w7.BottomAttach = ((uint)(3));
  13.121 -			w7.XOptions = ((global::Gtk.AttachOptions)(4));
  13.122 -			w7.YOptions = ((global::Gtk.AttachOptions)(4));
  13.123 -			// Container child table1.Gtk.Table+TableChild
  13.124 -			this.label3 = new global::Gtk.Label();
  13.125 -			this.label3.Name = "label3";
  13.126 -			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString("Points value");
  13.127 -			this.table1.Add(this.label3);
  13.128 -			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table1[this.label3]));
  13.129 -			w8.TopAttach = ((uint)(3));
  13.130 -			w8.BottomAttach = ((uint)(4));
  13.131 -			w8.XOptions = ((global::Gtk.AttachOptions)(4));
  13.132 -			w8.YOptions = ((global::Gtk.AttachOptions)(4));
  13.133 -			// Container child table1.Gtk.Table+TableChild
  13.134 -			this.label4 = new global::Gtk.Label();
  13.135 -			this.label4.Name = "label4";
  13.136 -			this.label4.LabelProp = global::Mono.Unix.Catalog.GetString("game system");
  13.137 -			this.table1.Add(this.label4);
  13.138 -			global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table1[this.label4]));
  13.139 -			w9.XOptions = ((global::Gtk.AttachOptions)(4));
  13.140 -			w9.YOptions = ((global::Gtk.AttachOptions)(4));
  13.141 -			// Container child table1.Gtk.Table+TableChild
  13.142 -			this.systemCombo = global::Gtk.ComboBoxEntry.NewText();
  13.143 -			this.systemCombo.Name = "systemCombo";
  13.144 -			this.table1.Add(this.systemCombo);
  13.145 -			global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table1[this.systemCombo]));
  13.146 -			w10.LeftAttach = ((uint)(1));
  13.147 -			w10.RightAttach = ((uint)(2));
  13.148 -			w10.YOptions = ((global::Gtk.AttachOptions)(4));
  13.149 -			// Container child table1.Gtk.Table+TableChild
  13.150 -			this.txtArmyName = new global::Gtk.Entry();
  13.151 -			this.txtArmyName.CanFocus = true;
  13.152 -			this.txtArmyName.Name = "txtArmyName";
  13.153 -			this.txtArmyName.IsEditable = true;
  13.154 -			this.txtArmyName.InvisibleChar = '•';
  13.155 -			this.table1.Add(this.txtArmyName);
  13.156 -			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1[this.txtArmyName]));
  13.157 -			w11.TopAttach = ((uint)(2));
  13.158 -			w11.BottomAttach = ((uint)(3));
  13.159 -			w11.LeftAttach = ((uint)(1));
  13.160 -			w11.RightAttach = ((uint)(2));
  13.161 -			w11.XOptions = ((global::Gtk.AttachOptions)(4));
  13.162 -			w11.YOptions = ((global::Gtk.AttachOptions)(4));
  13.163 -			w1.Add(this.table1);
  13.164 -			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(w1[this.table1]));
  13.165 -			w12.Position = 0;
  13.166 -			w12.Expand = false;
  13.167 -			w12.Fill = false;
  13.168 -			w12.Padding = ((uint)(6));
  13.169 -			// Internal child IBBoard.WarFoundry.GTK.FrmNewArmy.ActionArea
  13.170 -			global::Gtk.HButtonBox w13 = this.ActionArea;
  13.171 -			w13.CanFocus = true;
  13.172 -			w13.Events = ((global::Gdk.EventMask)(256));
  13.173 -			w13.Name = "WarFoundrySharp.FrmNewArmy_ActionArea";
  13.174 -			w13.Spacing = 6;
  13.175 -			w13.BorderWidth = ((uint)(5));
  13.176 -			w13.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
  13.177 -			// Container child WarFoundrySharp.FrmNewArmy_ActionArea.Gtk.ButtonBox+ButtonBoxChild
  13.178 -			this.bttnCancel = new global::Gtk.Button();
  13.179 -			this.bttnCancel.CanFocus = true;
  13.180 -			this.bttnCancel.Name = "bttnCancel";
  13.181 -			this.bttnCancel.UseStock = true;
  13.182 -			this.bttnCancel.UseUnderline = true;
  13.183 -			this.bttnCancel.Label = "gtk-cancel";
  13.184 -			this.AddActionWidget(this.bttnCancel, -6);
  13.185 -			global::Gtk.ButtonBox.ButtonBoxChild w14 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w13[this.bttnCancel]));
  13.186 -			w14.Expand = false;
  13.187 -			w14.Fill = false;
  13.188 -			// Container child WarFoundrySharp.FrmNewArmy_ActionArea.Gtk.ButtonBox+ButtonBoxChild
  13.189 -			this.bttnCreate = new global::Gtk.Button();
  13.190 -			this.bttnCreate.Sensitive = false;
  13.191 -			this.bttnCreate.CanDefault = true;
  13.192 -			this.bttnCreate.CanFocus = true;
  13.193 -			this.bttnCreate.Name = "bttnCreate";
  13.194 -			this.bttnCreate.UseUnderline = true;
  13.195 -			// Container child bttnCreate.Gtk.Container+ContainerChild
  13.196 -			global::Gtk.Alignment w15 = new global::Gtk.Alignment(0.5f, 0.5f, 0f, 0f);
  13.197 -			// Container child GtkAlignment.Gtk.Container+ContainerChild
  13.198 -			global::Gtk.HBox w16 = new global::Gtk.HBox();
  13.199 -			w16.Spacing = 2;
  13.200 -			// Container child GtkHBox.Gtk.Container+ContainerChild
  13.201 -			global::Gtk.Image w17 = new global::Gtk.Image();
  13.202 -			w17.Pixbuf = global::Stetic.IconLoader.LoadIcon(this, "gtk-ok", global::Gtk.IconSize.Menu);
  13.203 -			w16.Add(w17);
  13.204 -			// Container child GtkHBox.Gtk.Container+ContainerChild
  13.205 -			global::Gtk.Label w19 = new global::Gtk.Label();
  13.206 -			w19.LabelProp = global::Mono.Unix.Catalog.GetString("C_reate");
  13.207 -			w19.UseUnderline = true;
  13.208 -			w16.Add(w19);
  13.209 -			w15.Add(w16);
  13.210 -			this.bttnCreate.Add(w15);
  13.211 -			this.AddActionWidget(this.bttnCreate, -5);
  13.212 -			global::Gtk.ButtonBox.ButtonBoxChild w23 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w13[this.bttnCreate]));
  13.213 -			w23.Position = 1;
  13.214 -			w23.Expand = false;
  13.215 -			w23.Fill = false;
  13.216 -			if ((this.Child != null))
  13.217 -			{
  13.218 -				this.Child.ShowAll();
  13.219 -			}
  13.220 -			this.DefaultWidth = 370;
  13.221 -			this.DefaultHeight = 348;
  13.222 -			this.Show();
  13.223 -			this.txtArmyName.Changed += new global::System.EventHandler(this.OnTextChanged);
  13.224 -			this.systemCombo.Changed += new global::System.EventHandler(this.OnSystemComboChanged);
  13.225 -			this.sbPointsValue.ChangeValue += new global::Gtk.ChangeValueHandler(this.OnSpinChangeValue);
  13.226 -			this.sbPointsValue.ValueChanged += new global::System.EventHandler(this.OnSpinValueChanged);
  13.227 -			this.sbPointsValue.Changed += new global::System.EventHandler(this.OnSpinValueChanged);
  13.228 -			this.bttnCancel.Clicked += new global::System.EventHandler(this.OnCancelClicked);
  13.229 -			this.bttnCreate.Clicked += new global::System.EventHandler(this.OnCreateClicked);
  13.230 -		}
  13.231 -	}
  13.232 -}
    14.1 --- a/gtk-gui/IBBoard.WarFoundry.GTK.FrmNewUnit.cs	Tue Nov 23 21:03:46 2010 +0000
    14.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.3 @@ -1,133 +0,0 @@
    14.4 -
    14.5 -// This file has been generated by the GUI designer. Do not modify.
    14.6 -namespace IBBoard.WarFoundry.GTK
    14.7 -{
    14.8 -	public partial class FrmNewUnit
    14.9 -	{
   14.10 -		private global::Gtk.VBox vbox2;
   14.11 -
   14.12 -		private global::Gtk.HBox hbox1;
   14.13 -
   14.14 -		private global::Gtk.Label label1;
   14.15 -
   14.16 -		private global::Gtk.ScrolledWindow GtkScrolledWindow;
   14.17 -
   14.18 -		private global::Gtk.TreeView lstUnitTypes;
   14.19 -
   14.20 -		private global::Gtk.Label lblNewUnitWarning;
   14.21 -
   14.22 -		private global::Gtk.Button buttonCancel;
   14.23 -
   14.24 -		private global::Gtk.Button buttonOk;
   14.25 -
   14.26 -		protected virtual void Build()
   14.27 -		{
   14.28 -			global::Stetic.Gui.Initialize(this);
   14.29 -			// Widget IBBoard.WarFoundry.GTK.FrmNewUnit
   14.30 -			this.Name = "IBBoard.WarFoundry.GTK.FrmNewUnit";
   14.31 -			this.Title = global::Mono.Unix.Catalog.GetString("Add new unit");
   14.32 -			this.Icon = global::Stetic.IconLoader.LoadIcon(this, "gtk-new", global::Gtk.IconSize.Menu);
   14.33 -			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
   14.34 -			this.Modal = true;
   14.35 -			this.SkipPagerHint = true;
   14.36 -			this.SkipTaskbarHint = true;
   14.37 -			// Internal child IBBoard.WarFoundry.GTK.FrmNewUnit.VBox
   14.38 -			global::Gtk.VBox w1 = this.VBox;
   14.39 -			w1.Name = "dialog1_VBox";
   14.40 -			w1.BorderWidth = ((uint)(2));
   14.41 -			// Container child dialog1_VBox.Gtk.Box+BoxChild
   14.42 -			this.vbox2 = new global::Gtk.VBox();
   14.43 -			this.vbox2.Name = "vbox2";
   14.44 -			this.vbox2.Spacing = 6;
   14.45 -			// Container child vbox2.Gtk.Box+BoxChild
   14.46 -			this.hbox1 = new global::Gtk.HBox();
   14.47 -			this.hbox1.Name = "hbox1";
   14.48 -			this.hbox1.Spacing = 6;
   14.49 -			// Container child hbox1.Gtk.Box+BoxChild
   14.50 -			this.label1 = new global::Gtk.Label();
   14.51 -			this.label1.Name = "label1";
   14.52 -			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("Unit Type:");
   14.53 -			this.hbox1.Add(this.label1);
   14.54 -			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.label1]));
   14.55 -			w2.Position = 0;
   14.56 -			w2.Expand = false;
   14.57 -			w2.Fill = false;
   14.58 -			// Container child hbox1.Gtk.Box+BoxChild
   14.59 -			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow();
   14.60 -			this.GtkScrolledWindow.Name = "GtkScrolledWindow";
   14.61 -			this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));
   14.62 -			// Container child GtkScrolledWindow.Gtk.Container+ContainerChild
   14.63 -			this.lstUnitTypes = new global::Gtk.TreeView();
   14.64 -			this.lstUnitTypes.HeightRequest = 150;
   14.65 -			this.lstUnitTypes.CanFocus = true;
   14.66 -			this.lstUnitTypes.Name = "lstUnitTypes";
   14.67 -			this.lstUnitTypes.HeadersVisible = false;
   14.68 -			this.GtkScrolledWindow.Add(this.lstUnitTypes);
   14.69 -			this.hbox1.Add(this.GtkScrolledWindow);
   14.70 -			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.GtkScrolledWindow]));
   14.71 -			w4.Position = 1;
   14.72 -			this.vbox2.Add(this.hbox1);
   14.73 -			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.hbox1]));
   14.74 -			w5.Position = 0;
   14.75 -			w5.Expand = false;
   14.76 -			w5.Fill = false;
   14.77 -			// Container child vbox2.Gtk.Box+BoxChild
   14.78 -			this.lblNewUnitWarning = new global::Gtk.Label();
   14.79 -			this.lblNewUnitWarning.Name = "lblNewUnitWarning";
   14.80 -			this.lblNewUnitWarning.Xalign = 0f;
   14.81 -			this.lblNewUnitWarning.Yalign = 0f;
   14.82 -			this.vbox2.Add(this.lblNewUnitWarning);
   14.83 -			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.lblNewUnitWarning]));
   14.84 -			w6.Position = 1;
   14.85 -			w6.Expand = false;
   14.86 -			w6.Fill = false;
   14.87 -			w1.Add(this.vbox2);
   14.88 -			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(w1[this.vbox2]));
   14.89 -			w7.Position = 0;
   14.90 -			w7.Expand = false;
   14.91 -			w7.Fill = false;
   14.92 -			// Internal child IBBoard.WarFoundry.GTK.FrmNewUnit.ActionArea
   14.93 -			global::Gtk.HButtonBox w8 = this.ActionArea;
   14.94 -			w8.Name = "dialog1_ActionArea";
   14.95 -			w8.Spacing = 6;
   14.96 -			w8.BorderWidth = ((uint)(5));
   14.97 -			w8.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
   14.98 -			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
   14.99 -			this.buttonCancel = new global::Gtk.Button();
  14.100 -			this.buttonCancel.CanDefault = true;
  14.101 -			this.buttonCancel.CanFocus = true;
  14.102 -			this.buttonCancel.Name = "buttonCancel";
  14.103 -			this.buttonCancel.UseStock = true;
  14.104 -			this.buttonCancel.UseUnderline = true;
  14.105 -			this.buttonCancel.Label = "gtk-cancel";
  14.106 -			this.AddActionWidget(this.buttonCancel, -6);
  14.107 -			global::Gtk.ButtonBox.ButtonBoxChild w9 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w8[this.buttonCancel]));
  14.108 -			w9.Expand = false;
  14.109 -			w9.Fill = false;
  14.110 -			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
  14.111 -			this.buttonOk = new global::Gtk.Button();
  14.112 -			this.buttonOk.Sensitive = false;
  14.113 -			this.buttonOk.CanDefault = true;
  14.114 -			this.buttonOk.CanFocus = true;
  14.115 -			this.buttonOk.Name = "buttonOk";
  14.116 -			this.buttonOk.UseStock = true;
  14.117 -			this.buttonOk.UseUnderline = true;
  14.118 -			this.buttonOk.Label = "gtk-ok";
  14.119 -			this.AddActionWidget(this.buttonOk, -5);
  14.120 -			global::Gtk.ButtonBox.ButtonBoxChild w10 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w8[this.buttonOk]));
  14.121 -			w10.Position = 1;
  14.122 -			w10.Expand = false;
  14.123 -			w10.Fill = false;
  14.124 -			if ((this.Child != null))
  14.125 -			{
  14.126 -				this.Child.ShowAll();
  14.127 -			}
  14.128 -			this.DefaultWidth = 400;
  14.129 -			this.DefaultHeight = 318;
  14.130 -			this.Show();
  14.131 -			this.lstUnitTypes.RowActivated += new global::Gtk.RowActivatedHandler(this.OnRowActivated);
  14.132 -			this.buttonCancel.Activated += new global::System.EventHandler(this.OnButtonCancelActivated);
  14.133 -			this.buttonOk.Clicked += new global::System.EventHandler(this.OnButtonOkClicked);
  14.134 -		}
  14.135 -	}
  14.136 -}
    15.1 --- a/gtk-gui/IBBoard.WarFoundry.GTK.Widgets.UnitDisplayWidget.cs	Tue Nov 23 21:03:46 2010 +0000
    15.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.3 @@ -1,262 +0,0 @@
    15.4 -
    15.5 -// This file has been generated by the GUI designer. Do not modify.
    15.6 -namespace IBBoard.WarFoundry.GTK.Widgets
    15.7 -{
    15.8 -	public partial class UnitDisplayWidget
    15.9 -	{
   15.10 -		private global::Gtk.VBox vbox1;
   15.11 -				private global::Gtk.HBox hbox1;
   15.12 -				private global::Gtk.Entry unitName;
   15.13 -				private global::Gtk.SpinButton unitSize;
   15.14 -				private global::Gtk.ScrolledWindow statsScrollPanel;
   15.15 -				private global::Gtk.VBox statsRepeatBox;
   15.16 -				private global::Gtk.HSeparator hseparator1;
   15.17 -				private global::Gtk.HBox hbox2;
   15.18 -				private global::Gtk.Table table1;
   15.19 -				private global::Gtk.Label equipmentLabel;
   15.20 -				private global::Gtk.ScrolledWindow GtkScrolledWindow2;
   15.21 -				private global::Gtk.NodeView equipmentList;
   15.22 -				private global::Gtk.ScrolledWindow GtkScrolledWindow3;
   15.23 -				private global::Gtk.TextView notesView;
   15.24 -				private global::Gtk.ScrolledWindow GtkScrolledWindow4;
   15.25 -				private global::Gtk.NodeView abilitiesList;
   15.26 -				private global::Gtk.Label lblAbilities;
   15.27 -				private global::Gtk.Label lblNotes;
   15.28 -				private global::Gtk.VBox vbox3;
   15.29 -				private global::Gtk.Button bttnAddEquipment;
   15.30 -				private global::Gtk.Button bttnEditEquipment;
   15.31 -				private global::Gtk.Button bttnReplaceEquipment;
   15.32 -				private global::Gtk.Button bttnRemoveEquipment;
   15.33 -		
   15.34 -		protected virtual void Build()
   15.35 -		{
   15.36 -			global::Stetic.Gui.Initialize(this);
   15.37 -			// Widget IBBoard.WarFoundry.GTK.Widgets.UnitDisplayWidget
   15.38 -			global::Stetic.BinContainer.Attach(this);
   15.39 -			this.Name = "IBBoard.WarFoundry.GTK.Widgets.UnitDisplayWidget";
   15.40 -			// Container child IBBoard.WarFoundry.GTK.Widgets.UnitDisplayWidget.Gtk.Container+ContainerChild
   15.41 -			this.vbox1 = new global::Gtk.VBox();
   15.42 -			this.vbox1.Name = "vbox1";
   15.43 -			this.vbox1.Spacing = 6;
   15.44 -			// Container child vbox1.Gtk.Box+BoxChild
   15.45 -			this.hbox1 = new global::Gtk.HBox();
   15.46 -			this.hbox1.Name = "hbox1";
   15.47 -			this.hbox1.Spacing = 6;
   15.48 -			// Container child hbox1.Gtk.Box+BoxChild
   15.49 -			this.unitName = new global::Gtk.Entry();
   15.50 -			this.unitName.CanFocus = true;
   15.51 -			this.unitName.Name = "unitName";
   15.52 -			this.unitName.IsEditable = true;
   15.53 -			this.unitName.InvisibleChar = '•';
   15.54 -			this.hbox1.Add(this.unitName);
   15.55 -			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.unitName]));
   15.56 -			w1.Position = 0;
   15.57 -			// Container child hbox1.Gtk.Box+BoxChild
   15.58 -			this.unitSize = new global::Gtk.SpinButton(0, 100, 1);
   15.59 -			this.unitSize.CanFocus = true;
   15.60 -			this.unitSize.Name = "unitSize";
   15.61 -			this.unitSize.Adjustment.PageIncrement = 10;
   15.62 -			this.unitSize.ClimbRate = 1;
   15.63 -			this.unitSize.Numeric = true;
   15.64 -			this.hbox1.Add(this.unitSize);
   15.65 -			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.unitSize]));
   15.66 -			w2.Position = 1;
   15.67 -			w2.Expand = false;
   15.68 -			w2.Fill = false;
   15.69 -			this.vbox1.Add(this.hbox1);
   15.70 -			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.hbox1]));
   15.71 -			w3.Position = 0;
   15.72 -			w3.Expand = false;
   15.73 -			w3.Fill = false;
   15.74 -			// Container child vbox1.Gtk.Box+BoxChild
   15.75 -			this.statsScrollPanel = new global::Gtk.ScrolledWindow();
   15.76 -			this.statsScrollPanel.CanFocus = true;
   15.77 -			this.statsScrollPanel.Name = "statsScrollPanel";
   15.78 -			this.statsScrollPanel.ShadowType = ((global::Gtk.ShadowType)(1));
   15.79 -			// Container child statsScrollPanel.Gtk.Container+ContainerChild
   15.80 -			global::Gtk.Viewport w4 = new global::Gtk.Viewport();
   15.81 -			w4.ShadowType = ((global::Gtk.ShadowType)(0));
   15.82 -			// Container child GtkViewport.Gtk.Container+ContainerChild
   15.83 -			this.statsRepeatBox = new global::Gtk.VBox();
   15.84 -			this.statsRepeatBox.Name = "statsRepeatBox";
   15.85 -			this.statsRepeatBox.Spacing = 6;
   15.86 -			w4.Add(this.statsRepeatBox);
   15.87 -			this.statsScrollPanel.Add(w4);
   15.88 -			this.vbox1.Add(this.statsScrollPanel);
   15.89 -			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.statsScrollPanel]));
   15.90 -			w7.Position = 1;
   15.91 -			// Container child vbox1.Gtk.Box+BoxChild
   15.92 -			this.hseparator1 = new global::Gtk.HSeparator();
   15.93 -			this.hseparator1.Name = "hseparator1";
   15.94 -			this.vbox1.Add(this.hseparator1);
   15.95 -			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.hseparator1]));
   15.96 -			w8.Position = 2;
   15.97 -			w8.Expand = false;
   15.98 -			w8.Fill = false;
   15.99 -			// Container child vbox1.Gtk.Box+BoxChild
  15.100 -			this.hbox2 = new global::Gtk.HBox();
  15.101 -			this.hbox2.Name = "hbox2";
  15.102 -			this.hbox2.Spacing = 6;
  15.103 -			// Container child hbox2.Gtk.Box+BoxChild
  15.104 -			this.table1 = new global::Gtk.Table(((uint)(3)), ((uint)(2)), false);
  15.105 -			this.table1.Name = "table1";
  15.106 -			this.table1.RowSpacing = ((uint)(6));
  15.107 -			this.table1.ColumnSpacing = ((uint)(6));
  15.108 -			// Container child table1.Gtk.Table+TableChild
  15.109 -			this.equipmentLabel = new global::Gtk.Label();
  15.110 -			this.equipmentLabel.Name = "equipmentLabel";
  15.111 -			this.equipmentLabel.LabelProp = global::Mono.Unix.Catalog.GetString("equipment:");
  15.112 -			this.table1.Add(this.equipmentLabel);
  15.113 -			global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table1[this.equipmentLabel]));
  15.114 -			w9.XOptions = ((global::Gtk.AttachOptions)(4));
  15.115 -			w9.YOptions = ((global::Gtk.AttachOptions)(4));
  15.116 -			// Container child table1.Gtk.Table+TableChild
  15.117 -			this.GtkScrolledWindow2 = new global::Gtk.ScrolledWindow();
  15.118 -			this.GtkScrolledWindow2.Name = "GtkScrolledWindow2";
  15.119 -			this.GtkScrolledWindow2.ShadowType = ((global::Gtk.ShadowType)(1));
  15.120 -			// Container child GtkScrolledWindow2.Gtk.Container+ContainerChild
  15.121 -			this.equipmentList = new global::Gtk.NodeView();
  15.122 -			this.equipmentList.CanFocus = true;
  15.123 -			this.equipmentList.Name = "equipmentList";
  15.124 -			this.equipmentList.HeadersVisible = false;
  15.125 -			this.GtkScrolledWindow2.Add(this.equipmentList);
  15.126 -			this.table1.Add(this.GtkScrolledWindow2);
  15.127 -			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1[this.GtkScrolledWindow2]));
  15.128 -			w11.LeftAttach = ((uint)(1));
  15.129 -			w11.RightAttach = ((uint)(2));
  15.130 -			w11.YOptions = ((global::Gtk.AttachOptions)(4));
  15.131 -			// Container child table1.Gtk.Table+TableChild
  15.132 -			this.GtkScrolledWindow3 = new global::Gtk.ScrolledWindow();
  15.133 -			this.GtkScrolledWindow3.Name = "GtkScrolledWindow3";
  15.134 -			this.GtkScrolledWindow3.ShadowType = ((global::Gtk.ShadowType)(1));
  15.135 -			// Container child GtkScrolledWindow3.Gtk.Container+ContainerChild
  15.136 -			this.notesView = new global::Gtk.TextView();
  15.137 -			this.notesView.CanFocus = true;
  15.138 -			this.notesView.Name = "notesView";
  15.139 -			this.notesView.Editable = false;
  15.140 -			this.GtkScrolledWindow3.Add(this.notesView);
  15.141 -			this.table1.Add(this.GtkScrolledWindow3);
  15.142 -			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1[this.GtkScrolledWindow3]));
  15.143 -			w13.TopAttach = ((uint)(2));
  15.144 -			w13.BottomAttach = ((uint)(3));
  15.145 -			w13.LeftAttach = ((uint)(1));
  15.146 -			w13.RightAttach = ((uint)(2));
  15.147 -			w13.YOptions = ((global::Gtk.AttachOptions)(4));
  15.148 -			// Container child table1.Gtk.Table+TableChild
  15.149 -			this.GtkScrolledWindow4 = new global::Gtk.ScrolledWindow();
  15.150 -			this.GtkScrolledWindow4.Name = "GtkScrolledWindow4";
  15.151 -			this.GtkScrolledWindow4.ShadowType = ((global::Gtk.ShadowType)(1));
  15.152 -			// Container child GtkScrolledWindow4.Gtk.Container+ContainerChild
  15.153 -			this.abilitiesList = new global::Gtk.NodeView();
  15.154 -			this.abilitiesList.CanFocus = true;
  15.155 -			this.abilitiesList.Name = "abilitiesList";
  15.156 -			this.abilitiesList.HeadersVisible = false;
  15.157 -			this.GtkScrolledWindow4.Add(this.abilitiesList);
  15.158 -			this.table1.Add(this.GtkScrolledWindow4);
  15.159 -			global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table1[this.GtkScrolledWindow4]));
  15.160 -			w15.TopAttach = ((uint)(1));
  15.161 -			w15.BottomAttach = ((uint)(2));
  15.162 -			w15.LeftAttach = ((uint)(1));
  15.163 -			w15.RightAttach = ((uint)(2));
  15.164 -			w15.YOptions = ((global::Gtk.AttachOptions)(4));
  15.165 -			// Container child table1.Gtk.Table+TableChild
  15.166 -			this.lblAbilities = new global::Gtk.Label();
  15.167 -			this.lblAbilities.Name = "lblAbilities";
  15.168 -			this.lblAbilities.LabelProp = global::Mono.Unix.Catalog.GetString("abilities:");
  15.169 -			this.table1.Add(this.lblAbilities);
  15.170 -			global::Gtk.Table.TableChild w16 = ((global::Gtk.Table.TableChild)(this.table1[this.lblAbilities]));
  15.171 -			w16.TopAttach = ((uint)(1));
  15.172 -			w16.BottomAttach = ((uint)(2));
  15.173 -			w16.XOptions = ((global::Gtk.AttachOptions)(4));
  15.174 -			w16.YOptions = ((global::Gtk.AttachOptions)(4));
  15.175 -			// Container child table1.Gtk.Table+TableChild
  15.176 -			this.lblNotes = new global::Gtk.Label();
  15.177 -			this.lblNotes.Name = "lblNotes";
  15.178 -			this.lblNotes.LabelProp = global::Mono.Unix.Catalog.GetString("notes:");
  15.179 -			this.table1.Add(this.lblNotes);
  15.180 -			global::Gtk.Table.TableChild w17 = ((global::Gtk.Table.TableChild)(this.table1[this.lblNotes]));
  15.181 -			w17.TopAttach = ((uint)(2));
  15.182 -			w17.BottomAttach = ((uint)(3));
  15.183 -			w17.XOptions = ((global::Gtk.AttachOptions)(4));
  15.184 -			w17.YOptions = ((global::Gtk.AttachOptions)(4));
  15.185 -			this.hbox2.Add(this.table1);
  15.186 -			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.table1]));
  15.187 -			w18.Position = 0;
  15.188 -			// Container child hbox2.Gtk.Box+BoxChild
  15.189 -			this.vbox3 = new global::Gtk.VBox();
  15.190 -			this.vbox3.Name = "vbox3";
  15.191 -			this.vbox3.Spacing = 6;
  15.192 -			// Container child vbox3.Gtk.Box+BoxChild
  15.193 -			this.bttnAddEquipment = new global::Gtk.Button();
  15.194 -			this.bttnAddEquipment.CanFocus = true;
  15.195 -			this.bttnAddEquipment.Name = "bttnAddEquipment";
  15.196 -			this.bttnAddEquipment.UseUnderline = true;
  15.197 -			this.bttnAddEquipment.Label = global::Mono.Unix.Catalog.GetString("Add");
  15.198 -			this.vbox3.Add(this.bttnAddEquipment);
  15.199 -			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.bttnAddEquipment]));
  15.200 -			w19.Position = 0;
  15.201 -			w19.Expand = false;
  15.202 -			w19.Fill = false;
  15.203 -			// Container child vbox3.Gtk.Box+BoxChild
  15.204 -			this.bttnEditEquipment = new global::Gtk.Button();
  15.205 -			this.bttnEditEquipment.Sensitive = false;
  15.206 -			this.bttnEditEquipment.CanFocus = true;
  15.207 -			this.bttnEditEquipment.Name = "bttnEditEquipment";
  15.208 -			this.bttnEditEquipment.UseUnderline = true;
  15.209 -			this.bttnEditEquipment.Label = global::Mono.Unix.Catalog.GetString("Edit");
  15.210 -			this.vbox3.Add(this.bttnEditEquipment);
  15.211 -			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.bttnEditEquipment]));
  15.212 -			w20.Position = 1;
  15.213 -			w20.Expand = false;
  15.214 -			w20.Fill = false;
  15.215 -			// Container child vbox3.Gtk.Box+BoxChild
  15.216 -			this.bttnReplaceEquipment = new global::Gtk.Button();
  15.217 -			this.bttnReplaceEquipment.Sensitive = false;
  15.218 -			this.bttnReplaceEquipment.CanFocus = true;
  15.219 -			this.bttnReplaceEquipment.Name = "bttnReplaceEquipment";
  15.220 -			this.bttnReplaceEquipment.UseUnderline = true;
  15.221 -			this.bttnReplaceEquipment.Label = global::Mono.Unix.Catalog.GetString("Replace");
  15.222 -			this.vbox3.Add(this.bttnReplaceEquipment);
  15.223 -			global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.bttnReplaceEquipment]));
  15.224 -			w21.Position = 2;
  15.225 -			w21.Expand = false;
  15.226 -			w21.Fill = false;
  15.227 -			// Container child vbox3.Gtk.Box+BoxChild
  15.228 -			this.bttnRemoveEquipment = new global::Gtk.Button();
  15.229 -			this.bttnRemoveEquipment.Sensitive = false;
  15.230 -			this.bttnRemoveEquipment.CanFocus = true;
  15.231 -			this.bttnRemoveEquipment.Name = "bttnRemoveEquipment";
  15.232 -			this.bttnRemoveEquipment.UseUnderline = true;
  15.233 -			this.bttnRemoveEquipment.Label = global::Mono.Unix.Catalog.GetString("Remove");
  15.234 -			this.vbox3.Add(this.bttnRemoveEquipment);
  15.235 -			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.bttnRemoveEquipment]));
  15.236 -			w22.Position = 3;
  15.237 -			w22.Expand = false;
  15.238 -			w22.Fill = false;
  15.239 -			this.hbox2.Add(this.vbox3);
  15.240 -			global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.vbox3]));
  15.241 -			w23.Position = 1;
  15.242 -			w23.Expand = false;
  15.243 -			w23.Fill = false;
  15.244 -			this.vbox1.Add(this.hbox2);
  15.245 -			global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.hbox2]));
  15.246 -			w24.Position = 3;
  15.247 -			w24.Expand = false;
  15.248 -			w24.Fill = false;
  15.249 -			this.Add(this.vbox1);
  15.250 -			if ((this.Child != null))
  15.251 -			{
  15.252 -				this.Child.ShowAll();
  15.253 -			}
  15.254 -			this.Show();
  15.255 -			this.unitName.FocusOutEvent += new global::Gtk.FocusOutEventHandler(this.OnUnitNameFocusOut);
  15.256 -			this.unitName.KeyPressEvent += new global::Gtk.KeyPressEventHandler(this.OnUnitNameKeyPress);
  15.257 -			this.unitSize.FocusOutEvent += new global::Gtk.FocusOutEventHandler(this.OnUnitSizeFocusOut);
  15.258 -			this.unitSize.KeyPressEvent += new global::Gtk.KeyPressEventHandler(this.OnUnitSizeKeyPress);
  15.259 -			this.bttnAddEquipment.Clicked += new global::System.EventHandler(this.OnBttnAddEquipmentClicked);
  15.260 -			this.bttnEditEquipment.Clicked += new global::System.EventHandler(this.HandleEditButtonClicked);
  15.261 -			this.bttnReplaceEquipment.Clicked += new global::System.EventHandler(this.HandleReplaceButtonClicked);
  15.262 -			this.bttnRemoveEquipment.Clicked += new global::System.EventHandler(this.HandleRemoveButtonActivated);
  15.263 -		}
  15.264 -	}
  15.265 -}
    16.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.2 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmAbout.cs	Sat Dec 18 16:42:51 2010 +0000
    16.3 @@ -0,0 +1,105 @@
    16.4 +
    16.5 +// This file has been generated by the GUI designer. Do not modify.
    16.6 +namespace IBBoard.WarFoundry.GUI.GTK
    16.7 +{
    16.8 +	public partial class FrmAbout
    16.9 +	{
   16.10 +		private global::Gtk.Image image1;
   16.11 +		private global::Gtk.Label label1;
   16.12 +		private global::Gtk.Label label4;
   16.13 +		private global::Gtk.Label label2;
   16.14 +		private global::Gtk.Label label3;
   16.15 +		private global::Gtk.Button buttonOk;
   16.16 +
   16.17 +		protected virtual void Build()
   16.18 +		{
   16.19 +			global::Stetic.Gui.Initialize(this);
   16.20 +			// Widget IBBoard.WarFoundry.GUI.GTK.FrmAbout
   16.21 +			this.Name = "IBBoard.WarFoundry.GUI.GTK.FrmAbout";
   16.22 +			this.Title = global::Mono.Unix.Catalog.GetString("About WarFoundry");
   16.23 +			this.TypeHint = ((global::Gdk.WindowTypeHint)(1));
   16.24 +			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
   16.25 +			this.Resizable = false;
   16.26 +			this.AllowGrow = false;
   16.27 +			// Internal child IBBoard.WarFoundry.GUI.GTK.FrmAbout.VBox
   16.28 +			global::Gtk.VBox w1 = this.VBox;
   16.29 +			w1.Name = "dialog1_VBox";
   16.30 +			w1.BorderWidth = ((uint)(2));
   16.31 +			// Container child dialog1_VBox.Gtk.Box+BoxChild
   16.32 +			this.image1 = new global::Gtk.Image();
   16.33 +			this.image1.Name = "image1";
   16.34 +			this.image1.Pixbuf = global::Gdk.Pixbuf.LoadFromResource("IBBoard.WarFoundry.GUI.GTK.App-lrg.png");
   16.35 +			w1.Add(this.image1);
   16.36 +			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(w1[this.image1]));
   16.37 +			w2.Position = 0;
   16.38 +			w2.Expand = false;
   16.39 +			w2.Fill = false;
   16.40 +			// Container child dialog1_VBox.Gtk.Box+BoxChild
   16.41 +			this.label1 = new global::Gtk.Label();
   16.42 +			this.label1.Name = "label1";
   16.43 +			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("<span font_size=\"x-large\" weight=\"bold\">WarFoundry v0.1 Beta 1</span>");
   16.44 +			this.label1.UseMarkup = true;
   16.45 +			w1.Add(this.label1);
   16.46 +			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(w1[this.label1]));
   16.47 +			w3.Position = 1;
   16.48 +			w3.Expand = false;
   16.49 +			w3.Fill = false;
   16.50 +			// Container child dialog1_VBox.Gtk.Box+BoxChild
   16.51 +			this.label4 = new global::Gtk.Label();
   16.52 +			this.label4.Name = "label4";
   16.53 +			this.label4.LabelProp = global::Mono.Unix.Catalog.GetString("WarFoundry is an open-source army creation tool that lets you create rosters for multiple game systems.");
   16.54 +			this.label4.Wrap = true;
   16.55 +			this.label4.Justify = ((global::Gtk.Justification)(2));
   16.56 +			w1.Add(this.label4);
   16.57 +			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(w1[this.label4]));
   16.58 +			w4.Position = 2;
   16.59 +			w4.Expand = false;
   16.60 +			w4.Fill = false;
   16.61 +			// Container child dialog1_VBox.Gtk.Box+BoxChild
   16.62 +			this.label2 = new global::Gtk.Label();
   16.63 +			this.label2.Name = "label2";
   16.64 +			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString("© 2007-2010, IBBoard and others");
   16.65 +			w1.Add(this.label2);
   16.66 +			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(w1[this.label2]));
   16.67 +			w5.Position = 3;
   16.68 +			w5.Expand = false;
   16.69 +			w5.Fill = false;
   16.70 +			// Container child dialog1_VBox.Gtk.Box+BoxChild
   16.71 +			this.label3 = new global::Gtk.Label();
   16.72 +			this.label3.Name = "label3";
   16.73 +			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString("<a href=\"http://warfoundry.co.uk\">http://warfoundry.co.uk</a>");
   16.74 +			this.label3.UseMarkup = true;
   16.75 +			w1.Add(this.label3);
   16.76 +			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(w1[this.label3]));
   16.77 +			w6.Position = 4;
   16.78 +			w6.Expand = false;
   16.79 +			w6.Fill = false;
   16.80 +			// Internal child IBBoard.WarFoundry.GUI.GTK.FrmAbout.ActionArea
   16.81 +			global::Gtk.HButtonBox w7 = this.ActionArea;
   16.82 +			w7.Name = "dialog1_ActionArea";
   16.83 +			w7.Spacing = 10;
   16.84 +			w7.BorderWidth = ((uint)(5));
   16.85 +			w7.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
   16.86 +			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
   16.87 +			this.buttonOk = new global::Gtk.Button();
   16.88 +			this.buttonOk.CanDefault = true;
   16.89 +			this.buttonOk.CanFocus = true;
   16.90 +			this.buttonOk.Name = "buttonOk";
   16.91 +			this.buttonOk.UseStock = true;
   16.92 +			this.buttonOk.UseUnderline = true;
   16.93 +			this.buttonOk.Label = "gtk-ok";
   16.94 +			this.AddActionWidget(this.buttonOk, -5);
   16.95 +			global::Gtk.ButtonBox.ButtonBoxChild w8 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w7[this.buttonOk]));
   16.96 +			w8.Expand = false;
   16.97 +			w8.Fill = false;
   16.98 +			if ((this.Child != null))
   16.99 +			{
  16.100 +				this.Child.ShowAll();
  16.101 +			}
  16.102 +			this.DefaultWidth = 305;
  16.103 +			this.DefaultHeight = 300;
  16.104 +			this.Show();
  16.105 +			this.buttonOk.Activated += new global::System.EventHandler(this.OkayClicked);
  16.106 +		}
  16.107 +	}
  16.108 +}
    17.1 --- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmAddEquipment.cs	Tue Nov 23 21:03:46 2010 +0000
    17.2 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmAddEquipment.cs	Sat Dec 18 16:42:51 2010 +0000
    17.3 @@ -5,22 +5,22 @@
    17.4  	public partial class FrmAddEquipment
    17.5  	{
    17.6  		private global::Gtk.Table table1;
    17.7 -				private global::Gtk.ScrolledWindow GtkScrolledWindow;
    17.8 -				private global::Gtk.TreeView lstEquipment;
    17.9 -				private global::Gtk.HBox hbox2;
   17.10 -				private global::Gtk.Table table2;
   17.11 -				private global::Gtk.Label lblEquipAll;
   17.12 -				private global::Gtk.Label lblPercent;
   17.13 -				private global::Gtk.SpinButton numericAmount;
   17.14 -				private global::Gtk.SpinButton percentageAmount;
   17.15 -				private global::Gtk.RadioButton rbEquipAll;
   17.16 -				private global::Gtk.RadioButton rbEquipNumeric;
   17.17 -				private global::Gtk.RadioButton rbEquipPercent;
   17.18 -				private global::Gtk.Label lblEquipAmount;
   17.19 -				private global::Gtk.Label lblEquipment;
   17.20 -				private global::Gtk.Button buttonCancel;
   17.21 -				private global::Gtk.Button buttonOk;
   17.22 -		
   17.23 +		private global::Gtk.ScrolledWindow GtkScrolledWindow;
   17.24 +		private global::Gtk.TreeView lstEquipment;
   17.25 +		private global::Gtk.HBox hbox2;
   17.26 +		private global::Gtk.Table table2;
   17.27 +		private global::Gtk.Label lblEquipAll;
   17.28 +		private global::Gtk.Label lblPercent;
   17.29 +		private global::Gtk.SpinButton numericAmount;
   17.30 +		private global::Gtk.SpinButton percentageAmount;
   17.31 +		private global::Gtk.RadioButton rbEquipAll;
   17.32 +		private global::Gtk.RadioButton rbEquipNumeric;
   17.33 +		private global::Gtk.RadioButton rbEquipPercent;
   17.34 +		private global::Gtk.Label lblEquipAmount;
   17.35 +		private global::Gtk.Label lblEquipment;
   17.36 +		private global::Gtk.Button buttonCancel;
   17.37 +		private global::Gtk.Button buttonOk;
   17.38 +
   17.39  		protected virtual void Build()
   17.40  		{
   17.41  			global::Stetic.Gui.Initialize(this);
    18.1 --- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmEditEquipment.cs	Tue Nov 23 21:03:46 2010 +0000
    18.2 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmEditEquipment.cs	Sat Dec 18 16:42:51 2010 +0000
    18.3 @@ -5,19 +5,19 @@
    18.4  	public partial class FrmEditEquipment
    18.5  	{
    18.6  		private global::Gtk.Table table1;
    18.7 -				private global::Gtk.HBox hbox2;
    18.8 -				private global::Gtk.Table table2;
    18.9 -				private global::Gtk.Label lblEquipAll;
   18.10 -				private global::Gtk.Label lblPercent;
   18.11 -				private global::Gtk.SpinButton numericAmount;
   18.12 -				private global::Gtk.SpinButton percentageAmount;
   18.13 -				private global::Gtk.RadioButton rbEquipAll;
   18.14 -				private global::Gtk.RadioButton rbEquipNumeric;
   18.15 -				private global::Gtk.RadioButton rbEquipPercent;
   18.16 -				private global::Gtk.Label lblEquipAmount;
   18.17 -				private global::Gtk.Button buttonCancel;
   18.18 -				private global::Gtk.Button buttonOk;
   18.19 -		
   18.20 +		private global::Gtk.HBox hbox2;
   18.21 +		private global::Gtk.Table table2;
   18.22 +		private global::Gtk.Label lblEquipAll;
   18.23 +		private global::Gtk.Label lblPercent;
   18.24 +		private global::Gtk.SpinButton numericAmount;
   18.25 +		private global::Gtk.SpinButton percentageAmount;
   18.26 +		private global::Gtk.RadioButton rbEquipAll;
   18.27 +		private global::Gtk.RadioButton rbEquipNumeric;
   18.28 +		private global::Gtk.RadioButton rbEquipPercent;
   18.29 +		private global::Gtk.Label lblEquipAmount;
   18.30 +		private global::Gtk.Button buttonCancel;
   18.31 +		private global::Gtk.Button buttonOk;
   18.32 +
   18.33  		protected virtual void Build()
   18.34  		{
   18.35  			global::Stetic.Gui.Initialize(this);
    19.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.2 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmMainWindow.cs	Sat Dec 18 16:42:51 2010 +0000
    19.3 @@ -0,0 +1,206 @@
    19.4 +
    19.5 +// This file has been generated by the GUI designer. Do not modify.
    19.6 +namespace IBBoard.WarFoundry.GUI.GTK
    19.7 +{
    19.8 +	public partial class FrmMainWindow
    19.9 +	{
   19.10 +		private global::Gtk.UIManager UIManager;
   19.11 +		private global::Gtk.Action menuFile;
   19.12 +		private global::Gtk.Action miCreateArmy;
   19.13 +		private global::Gtk.Action miOpenArmy;
   19.14 +		private global::Gtk.Action miSaveArmy;
   19.15 +		private global::Gtk.Action miSaveArmyAs;
   19.16 +		private global::Gtk.Action miCloseArmy;
   19.17 +		private global::Gtk.Action refreshAction;
   19.18 +		private global::Gtk.Action miExit;
   19.19 +		private global::Gtk.Action menuEdit;
   19.20 +		private global::Gtk.Action miUndo;
   19.21 +		private global::Gtk.Action miRedo;
   19.22 +		private global::Gtk.Action menuHelp;
   19.23 +		private global::Gtk.Action miAbout;
   19.24 +		private global::Gtk.Action miDebugInformation;
   19.25 +		private global::Gtk.Action newArmyButton;
   19.26 +		private global::Gtk.Action openArmyButton;
   19.27 +		private global::Gtk.Action saveArmyButton;
   19.28 +		private global::Gtk.Action undoActionButton;
   19.29 +		private global::Gtk.Action redoActionButton;
   19.30 +		private global::Gtk.Action goDown;
   19.31 +		private global::Gtk.Action add;
   19.32 +		private global::Gtk.Action miExportArmy;
   19.33 +		private global::Gtk.Action miExportAsBasicHtml;
   19.34 +		private global::Gtk.VBox vbox1;
   19.35 +		private global::Gtk.MenuBar menubar1;
   19.36 +		private global::Gtk.Toolbar toolbar;
   19.37 +		private global::Gtk.HPaned hpaned2;
   19.38 +		private global::Gtk.TreeView treeUnits;
   19.39 +		private global::Gtk.Notebook unitsNotebook;
   19.40 +		private global::Gtk.Statusbar statusbar1;
   19.41 +
   19.42 +		protected virtual void Build()
   19.43 +		{
   19.44 +			global::Stetic.Gui.Initialize(this);
   19.45 +			// Widget IBBoard.WarFoundry.GUI.GTK.FrmMainWindow
   19.46 +			this.UIManager = new global::Gtk.UIManager();
   19.47 +			global::Gtk.ActionGroup w1 = new global::Gtk.ActionGroup("Default");
   19.48 +			this.menuFile = new global::Gtk.Action("menuFile", global::Mono.Unix.Catalog.GetString("File"), null, null);
   19.49 +			this.menuFile.ShortLabel = global::Mono.Unix.Catalog.GetString("File");
   19.50 +			w1.Add(this.menuFile, null);
   19.51 +			this.miCreateArmy = new global::Gtk.Action("miCreateArmy", global::Mono.Unix.Catalog.GetString("Create army"), null, "gtk-new");
   19.52 +			this.miCreateArmy.ShortLabel = global::Mono.Unix.Catalog.GetString("Create army");
   19.53 +			w1.Add(this.miCreateArmy, null);
   19.54 +			this.miOpenArmy = new global::Gtk.Action("miOpenArmy", global::Mono.Unix.Catalog.GetString("Open army"), null, "gtk-open");
   19.55 +			this.miOpenArmy.ShortLabel = global::Mono.Unix.Catalog.GetString("Open army");
   19.56 +			w1.Add(this.miOpenArmy, null);
   19.57 +			this.miSaveArmy = new global::Gtk.Action("miSaveArmy", global::Mono.Unix.Catalog.GetString("Save army"), null, "gtk-save");
   19.58 +			this.miSaveArmy.Sensitive = false;
   19.59 +			this.miSaveArmy.ShortLabel = global::Mono.Unix.Catalog.GetString("Save army");
   19.60 +			w1.Add(this.miSaveArmy, null);
   19.61 +			this.miSaveArmyAs = new global::Gtk.Action("miSaveArmyAs", global::Mono.Unix.Catalog.GetString("Save army as"), null, "gtk-save-as");
   19.62 +			this.miSaveArmyAs.Sensitive = false;
   19.63 +			this.miSaveArmyAs.ShortLabel = global::Mono.Unix.Catalog.GetString("Save army as");
   19.64 +			w1.Add(this.miSaveArmyAs, null);
   19.65 +			this.miCloseArmy = new global::Gtk.Action("miCloseArmy", global::Mono.Unix.Catalog.GetString("Close army"), null, "gtk-close");
   19.66 +			this.miCloseArmy.Sensitive = false;
   19.67 +			this.miCloseArmy.ShortLabel = global::Mono.Unix.Catalog.GetString("Close army");
   19.68 +			w1.Add(this.miCloseArmy, null);
   19.69 +			this.refreshAction = new global::Gtk.Action("refreshAction", global::Mono.Unix.Catalog.GetString("Reload files"), null, "gtk-refresh");
   19.70 +			this.refreshAction.ShortLabel = global::Mono.Unix.Catalog.GetString("Reload files");
   19.71 +			w1.Add(this.refreshAction, null);
   19.72 +			this.miExit = new global::Gtk.Action("miExit", global::Mono.Unix.Catalog.GetString("Exit"), null, "gtk-quit");
   19.73 +			this.miExit.ShortLabel = global::Mono.Unix.Catalog.GetString("Exit");
   19.74 +			w1.Add(this.miExit, null);
   19.75 +			this.menuEdit = new global::Gtk.Action("menuEdit", global::Mono.Unix.Catalog.GetString("Edit"), null, null);
   19.76 +			this.menuEdit.ShortLabel = global::Mono.Unix.Catalog.GetString("Edit");
   19.77 +			w1.Add(this.menuEdit, null);
   19.78 +			this.miUndo = new global::Gtk.Action("miUndo", global::Mono.Unix.Catalog.GetString("Undo"), null, "gtk-undo");
   19.79 +			this.miUndo.Sensitive = false;
   19.80 +			this.miUndo.ShortLabel = global::Mono.Unix.Catalog.GetString("Undo");
   19.81 +			w1.Add(this.miUndo, null);
   19.82 +			this.miRedo = new global::Gtk.Action("miRedo", global::Mono.Unix.Catalog.GetString("Redo"), null, "gtk-redo");
   19.83 +			this.miRedo.Sensitive = false;
   19.84 +			this.miRedo.ShortLabel = global::Mono.Unix.Catalog.GetString("Redo");
   19.85 +			w1.Add(this.miRedo, null);
   19.86 +			this.menuHelp = new global::Gtk.Action("menuHelp", global::Mono.Unix.Catalog.GetString("Help"), null, null);
   19.87 +			this.menuHelp.ShortLabel = global::Mono.Unix.Catalog.GetString("Help");
   19.88 +			w1.Add(this.menuHelp, null);
   19.89 +			this.miAbout = new global::Gtk.Action("miAbout", global::Mono.Unix.Catalog.GetString("About"), null, "gtk-about");
   19.90 +			this.miAbout.ShortLabel = global::Mono.Unix.Catalog.GetString("About");
   19.91 +			w1.Add(this.miAbout, null);
   19.92 +			this.miDebugInformation = new global::Gtk.Action("miDebugInformation", global::Mono.Unix.Catalog.GetString("Debug Information"), null, null);
   19.93 +			this.miDebugInformation.ShortLabel = global::Mono.Unix.Catalog.GetString("Debug Information");
   19.94 +			w1.Add(this.miDebugInformation, null);
   19.95 +			this.newArmyButton = new global::Gtk.Action("newArmyButton", null, null, "gtk-new");
   19.96 +			w1.Add(this.newArmyButton, null);
   19.97 +			this.openArmyButton = new global::Gtk.Action("openArmyButton", null, null, "gtk-open");
   19.98 +			w1.Add(this.openArmyButton, null);
   19.99 +			this.saveArmyButton = new global::Gtk.Action("saveArmyButton", null, null, "gtk-save");
  19.100 +			this.saveArmyButton.Sensitive = false;
  19.101 +			w1.Add(this.saveArmyButton, null);
  19.102 +			this.undoActionButton = new global::Gtk.Action("undoActionButton", null, null, "gtk-undo");
  19.103 +			this.undoActionButton.Sensitive = false;
  19.104 +			w1.Add(this.undoActionButton, null);
  19.105 +			this.redoActionButton = new global::Gtk.Action("redoActionButton", null, null, "gtk-redo");
  19.106 +			this.redoActionButton.Sensitive = false;
  19.107 +			w1.Add(this.redoActionButton, null);
  19.108 +			this.goDown = new global::Gtk.Action("goDown", null, null, null);
  19.109 +			w1.Add(this.goDown, null);
  19.110 +			this.add = new global::Gtk.Action("add", null, null, "gtk-add");
  19.111 +			w1.Add(this.add, null);
  19.112 +			this.miExportArmy = new global::Gtk.Action("miExportArmy", global::Mono.Unix.Catalog.GetString("Export army as..."), null, "gtk-convert");
  19.113 +			this.miExportArmy.Sensitive = false;
  19.114 +			this.miExportArmy.ShortLabel = global::Mono.Unix.Catalog.GetString("Export army");
  19.115 +			w1.Add(this.miExportArmy, null);
  19.116 +			this.miExportAsBasicHtml = new global::Gtk.Action("miExportAsBasicHtml", global::Mono.Unix.Catalog.GetString("Basic HTML"), null, null);
  19.117 +			this.miExportAsBasicHtml.ShortLabel = global::Mono.Unix.Catalog.GetString("Basic HTML");
  19.118 +			w1.Add(this.miExportAsBasicHtml, null);
  19.119 +			this.UIManager.InsertActionGroup(w1, 0);
  19.120 +			this.AddAccelGroup(this.UIManager.AccelGroup);
  19.121 +			this.Name = "IBBoard.WarFoundry.GUI.GTK.FrmMainWindow";
  19.122 +			this.Title = global::Mono.Unix.Catalog.GetString("MainWindow");
  19.123 +			this.Icon = global::Gdk.Pixbuf.LoadFromResource("App.ico");
  19.124 +			// Container child IBBoard.WarFoundry.GUI.GTK.FrmMainWindow.Gtk.Container+ContainerChild
  19.125 +			this.vbox1 = new global::Gtk.VBox();
  19.126 +			this.vbox1.Name = "vbox1";
  19.127 +			// Container child vbox1.Gtk.Box+BoxChild
  19.128 +			this.UIManager.AddUiFromString("<ui><menubar name='menubar1'><menu name='menuFile' action='menuFile'><menuitem name='miCreateArmy' action='miCreateArmy'/><menuitem name='miOpenArmy' action='miOpenArmy'/><menuitem name='miSaveArmy' action='miSaveArmy'/><menuitem name='miSaveArmyAs' action='miSaveArmyAs'/><menu name='miExportArmy' action='miExportArmy'><menuitem name='miExportAsBasicHtml' action='miExportAsBasicHtml'/></menu><menuitem name='miCloseArmy' action='miCloseArmy'/><separator/><menuitem name='refreshAction' action='refreshAction'/><separator/><menuitem name='miExit' action='miExit'/></menu><menu name='menuEdit' action='menuEdit'><menuitem name='miUndo' action='miUndo'/><menuitem name='miRedo' action='miRedo'/></menu><menu name='menuHelp' action='menuHelp'><menuitem name='miAbout' action='miAbout'/></menu></menubar></ui>");
  19.129 +			this.menubar1 = ((global::Gtk.MenuBar)(this.UIManager.GetWidget("/menubar1")));
  19.130 +			this.menubar1.Name = "menubar1";
  19.131 +			this.vbox1.Add(this.menubar1);
  19.132 +			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.menubar1]));
  19.133 +			w2.Position = 0;
  19.134 +			w2.Expand = false;
  19.135 +			w2.Fill = false;
  19.136 +			// Container child vbox1.Gtk.Box+BoxChild
  19.137 +			this.UIManager.AddUiFromString("<ui><toolbar name='toolbar'><toolitem name='newArmyButton' action='newArmyButton'/><toolitem name='openArmyButton' action='openArmyButton'/><toolitem name='saveArmyButton' action='saveArmyButton'/><separator/><toolitem name='undoActionButton' action='undoActionButton'/><toolitem name='redoActionButton' action='redoActionButton'/><separator/></toolbar></ui>");
  19.138 +			this.toolbar = ((global::Gtk.Toolbar)(this.UIManager.GetWidget("/toolbar")));
  19.139 +			this.toolbar.HeightRequest = 36;
  19.140 +			this.toolbar.Name = "toolbar";
  19.141 +			this.toolbar.ShowArrow = false;
  19.142 +			this.toolbar.ToolbarStyle = ((global::Gtk.ToolbarStyle)(0));
  19.143 +			this.toolbar.IconSize = ((global::Gtk.IconSize)(3));
  19.144 +			this.vbox1.Add(this.toolbar);
  19.145 +			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.toolbar]));
  19.146 +			w3.Position = 1;
  19.147 +			w3.Expand = false;
  19.148 +			w3.Fill = false;
  19.149 +			// Container child vbox1.Gtk.Box+BoxChild
  19.150 +			this.hpaned2 = new global::Gtk.HPaned();
  19.151 +			this.hpaned2.CanFocus = true;
  19.152 +			this.hpaned2.Name = "hpaned2";
  19.153 +			this.hpaned2.Position = 178;
  19.154 +			// Container child hpaned2.Gtk.Paned+PanedChild
  19.155 +			this.treeUnits = new global::Gtk.TreeView();
  19.156 +			this.treeUnits.CanFocus = true;
  19.157 +			this.treeUnits.Name = "treeUnits";
  19.158 +			this.hpaned2.Add(this.treeUnits);
  19.159 +			global::Gtk.Paned.PanedChild w4 = ((global::Gtk.Paned.PanedChild)(this.hpaned2[this.treeUnits]));
  19.160 +			w4.Resize = false;
  19.161 +			// Container child hpaned2.Gtk.Paned+PanedChild
  19.162 +			this.unitsNotebook = new global::Gtk.Notebook();
  19.163 +			this.unitsNotebook.CanFocus = true;
  19.164 +			this.unitsNotebook.Name = "unitsNotebook";
  19.165 +			this.unitsNotebook.CurrentPage = -1;
  19.166 +			this.unitsNotebook.Scrollable = true;
  19.167 +			this.hpaned2.Add(this.unitsNotebook);
  19.168 +			this.vbox1.Add(this.hpaned2);
  19.169 +			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.hpaned2]));
  19.170 +			w6.Position = 2;
  19.171 +			// Container child vbox1.Gtk.Box+BoxChild
  19.172 +			this.statusbar1 = new global::Gtk.Statusbar();
  19.173 +			this.statusbar1.Name = "statusbar1";
  19.174 +			this.statusbar1.Spacing = 2;
  19.175 +			this.vbox1.Add(this.statusbar1);
  19.176 +			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.statusbar1]));
  19.177 +			w7.Position = 3;
  19.178 +			w7.Expand = false;
  19.179 +			w7.Fill = false;
  19.180 +			this.Add(this.vbox1);
  19.181 +			if ((this.Child != null))
  19.182 +			{
  19.183 +				this.Child.ShowAll();
  19.184 +			}
  19.185 +			this.DefaultWidth = 832;
  19.186 +			this.DefaultHeight = 659;
  19.187 +			this.hpaned2.Hide();
  19.188 +			this.Show();
  19.189 +			this.miCreateArmy.Activated += new global::System.EventHandler(this.OnCreateArmyActivated);
  19.190 +			this.miOpenArmy.Activated += new global::System.EventHandler(this.OnOpenArmyActivated);
  19.191 +			this.miSaveArmy.Activated += new global::System.EventHandler(this.OnSaveArmyActivated);
  19.192 +			this.miSaveArmyAs.Activated += new global::System.EventHandler(this.OnSaveArmyAsActivated);
  19.193 +			this.miCloseArmy.Activated += new global::System.EventHandler(this.OnCloseArmyActivated);
  19.194 +			this.refreshAction.Activated += new global::System.EventHandler(this.OnReloadFilesActivated);
  19.195 +			this.miExit.Activated += new global::System.EventHandler(this.OnExitActivated);
  19.196 +			this.miAbout.Activated += new global::System.EventHandler(this.HelpAboutActivated);
  19.197 +			this.newArmyButton.Activated += new global::System.EventHandler(this.newTBButtonActivated);
  19.198 +			this.openArmyButton.Activated += new global::System.EventHandler(this.openTBButtonActivated);
  19.199 +			this.saveArmyButton.Activated += new global::System.EventHandler(this.saveTBButtonActivated);
  19.200 +			this.undoActionButton.Activated += new global::System.EventHandler(this.undoTBButtonActivated);
  19.201 +			this.redoActionButton.Activated += new global::System.EventHandler(this.redoTBButtonActivated);
  19.202 +			this.miExportAsBasicHtml.Activated += new global::System.EventHandler(this.OnMiExportAsBasicHtmlActivated);
  19.203 +			this.treeUnits.RowActivated += new global::Gtk.RowActivatedHandler(this.ArmyRowActivated);
  19.204 +			this.treeUnits.PopupMenu += new global::Gtk.PopupMenuHandler(this.OnTreeUnitsPopupMenu);
  19.205 +			this.treeUnits.ButtonPressEvent += new global::Gtk.ButtonPressEventHandler(this.UnitTreeButtonPressed);
  19.206 +			this.unitsNotebook.Removed += new global::Gtk.RemovedHandler(this.NotebookPageRemoved);
  19.207 +		}
  19.208 +	}
  19.209 +}
    20.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    20.2 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewArmy.cs	Sat Dec 18 16:42:51 2010 +0000
    20.3 @@ -0,0 +1,217 @@
    20.4 +
    20.5 +// This file has been generated by the GUI designer. Do not modify.
    20.6 +namespace IBBoard.WarFoundry.GUI.GTK
    20.7 +{
    20.8 +	public partial class FrmNewArmy
    20.9 +	{
   20.10 +		private global::Gtk.Table table1;
   20.11 +		private global::Gtk.ScrolledWindow GtkScrolledWindow;
   20.12 +		private global::Gtk.TreeView lstRaces;
   20.13 +		private global::Gtk.HBox hbox2;
   20.14 +		private global::Gtk.SpinButton sbPointsValue;
   20.15 +		private global::Gtk.Label label1;
   20.16 +		private global::Gtk.Label label2;
   20.17 +		private global::Gtk.Label label3;
   20.18 +		private global::Gtk.Label label4;
   20.19 +		private global::Gtk.ComboBoxEntry systemCombo;
   20.20 +		private global::Gtk.Entry txtArmyName;
   20.21 +		private global::Gtk.Button bttnCancel;
   20.22 +		private global::Gtk.Button bttnCreate;
   20.23 +
   20.24 +		protected virtual void Build()
   20.25 +		{
   20.26 +			global::Stetic.Gui.Initialize(this);
   20.27 +			// Widget IBBoard.WarFoundry.GUI.GTK.FrmNewArmy
   20.28 +			this.Events = ((global::Gdk.EventMask)(256));
   20.29 +			this.Name = "IBBoard.WarFoundry.GUI.GTK.FrmNewArmy";
   20.30 +			this.Title = global::Mono.Unix.Catalog.GetString("Create new army");
   20.31 +			this.Icon = global::Stetic.IconLoader.LoadIcon(this, "gtk-new", global::Gtk.IconSize.Menu);
   20.32 +			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
   20.33 +			this.SkipPagerHint = true;
   20.34 +			this.SkipTaskbarHint = true;
   20.35 +			// Internal child IBBoard.WarFoundry.GUI.GTK.FrmNewArmy.VBox
   20.36 +			global::Gtk.VBox w1 = this.VBox;
   20.37 +			w1.CanFocus = true;
   20.38 +			w1.Events = ((global::Gdk.EventMask)(256));
   20.39 +			w1.Name = "dialog_VBox";
   20.40 +			w1.BorderWidth = ((uint)(2));
   20.41 +			// Container child dialog_VBox.Gtk.Box+BoxChild
   20.42 +			this.table1 = new global::Gtk.Table(((uint)(4)), ((uint)(2)), false);
   20.43 +			this.table1.Name = "table1";
   20.44 +			this.table1.RowSpacing = ((uint)(6));
   20.45 +			this.table1.ColumnSpacing = ((uint)(6));
   20.46 +			// Container child table1.Gtk.Table+TableChild
   20.47 +			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow();
   20.48 +			this.GtkScrolledWindow.Name = "GtkScrolledWindow";
   20.49 +			this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));
   20.50 +			// Container child GtkScrolledWindow.Gtk.Container+ContainerChild
   20.51 +			this.lstRaces = new global::Gtk.TreeView();
   20.52 +			this.lstRaces.HeightRequest = 150;
   20.53 +			this.lstRaces.CanFocus = true;
   20.54 +			this.lstRaces.Name = "lstRaces";
   20.55 +			this.lstRaces.HeadersVisible = false;
   20.56 +			this.lstRaces.RulesHint = true;
   20.57 +			this.GtkScrolledWindow.Add(this.lstRaces);
   20.58 +			this.table1.Add(this.GtkScrolledWindow);
   20.59 +			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1[this.GtkScrolledWindow]));
   20.60 +			w3.TopAttach = ((uint)(1));
   20.61 +			w3.BottomAttach = ((uint)(2));
   20.62 +			w3.LeftAttach = ((uint)(1));
   20.63 +			w3.RightAttach = ((uint)(2));
   20.64 +			w3.XOptions = ((global::Gtk.AttachOptions)(4));
   20.65 +			w3.YOptions = ((global::Gtk.AttachOptions)(4));
   20.66 +			// Container child table1.Gtk.Table+TableChild
   20.67 +			this.hbox2 = new global::Gtk.HBox();
   20.68 +			this.hbox2.Name = "hbox2";
   20.69 +			// Container child hbox2.Gtk.Box+BoxChild
   20.70 +			this.sbPointsValue = new global::Gtk.SpinButton(0, 2000000000, 100);
   20.71 +			this.sbPointsValue.WidthRequest = 150;
   20.72 +			this.sbPointsValue.CanFocus = true;
   20.73 +			this.sbPointsValue.Name = "sbPointsValue";
   20.74 +			this.sbPointsValue.Adjustment.PageIncrement = 1000;
   20.75 +			this.sbPointsValue.ClimbRate = 100;
   20.76 +			this.sbPointsValue.Numeric = true;
   20.77 +			this.sbPointsValue.Value = 1000;
   20.78 +			this.hbox2.Add(this.sbPointsValue);
   20.79 +			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.sbPointsValue]));
   20.80 +			w4.Position = 0;
   20.81 +			w4.Expand = false;
   20.82 +			w4.Fill = false;
   20.83 +			this.table1.Add(this.hbox2);
   20.84 +			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1[this.hbox2]));
   20.85 +			w5.TopAttach = ((uint)(3));
   20.86 +			w5.BottomAttach = ((uint)(4));
   20.87 +			w5.LeftAttach = ((uint)(1));
   20.88 +			w5.RightAttach = ((uint)(2));
   20.89 +			w5.XOptions = ((global::Gtk.AttachOptions)(4));
   20.90 +			w5.YOptions = ((global::Gtk.AttachOptions)(4));
   20.91 +			// Container child table1.Gtk.Table+TableChild
   20.92 +			this.label1 = new global::Gtk.Label();
   20.93 +			this.label1.Name = "label1";
   20.94 +			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("Race");
   20.95 +			this.table1.Add(this.label1);
   20.96 +			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1[this.label1]));
   20.97 +			w6.TopAttach = ((uint)(1));
   20.98 +			w6.BottomAttach = ((uint)(2));
   20.99 +			w6.XOptions = ((global::Gtk.AttachOptions)(4));
  20.100 +			w6.YOptions = ((global::Gtk.AttachOptions)(4));
  20.101 +			// Container child table1.Gtk.Table+TableChild
  20.102 +			this.label2 = new global::Gtk.Label();
  20.103 +			this.label2.Name = "label2";
  20.104 +			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString("Army name");
  20.105 +			this.table1.Add(this.label2);
  20.106 +			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1[this.label2]));
  20.107 +			w7.TopAttach = ((uint)(2));
  20.108 +			w7.BottomAttach = ((uint)(3));
  20.109 +			w7.XOptions = ((global::Gtk.AttachOptions)(4));
  20.110 +			w7.YOptions = ((global::Gtk.AttachOptions)(4));
  20.111 +			// Container child table1.Gtk.Table+TableChild
  20.112 +			this.label3 = new global::Gtk.Label();
  20.113 +			this.label3.Name = "label3";
  20.114 +			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString("Points value");
  20.115 +			this.table1.Add(this.label3);
  20.116 +			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.table1[this.label3]));
  20.117 +			w8.TopAttach = ((uint)(3));
  20.118 +			w8.BottomAttach = ((uint)(4));
  20.119 +			w8.XOptions = ((global::Gtk.AttachOptions)(4));
  20.120 +			w8.YOptions = ((global::Gtk.AttachOptions)(4));
  20.121 +			// Container child table1.Gtk.Table+TableChild
  20.122 +			this.label4 = new global::Gtk.Label();
  20.123 +			this.label4.Name = "label4";
  20.124 +			this.label4.LabelProp = global::Mono.Unix.Catalog.GetString("game system");
  20.125 +			this.table1.Add(this.label4);
  20.126 +			global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table1[this.label4]));
  20.127 +			w9.XOptions = ((global::Gtk.AttachOptions)(4));
  20.128 +			w9.YOptions = ((global::Gtk.AttachOptions)(4));
  20.129 +			// Container child table1.Gtk.Table+TableChild
  20.130 +			this.systemCombo = global::Gtk.ComboBoxEntry.NewText();
  20.131 +			this.systemCombo.Name = "systemCombo";
  20.132 +			this.table1.Add(this.systemCombo);
  20.133 +			global::Gtk.Table.TableChild w10 = ((global::Gtk.Table.TableChild)(this.table1[this.systemCombo]));
  20.134 +			w10.LeftAttach = ((uint)(1));
  20.135 +			w10.RightAttach = ((uint)(2));
  20.136 +			w10.YOptions = ((global::Gtk.AttachOptions)(4));
  20.137 +			// Container child table1.Gtk.Table+TableChild
  20.138 +			this.txtArmyName = new global::Gtk.Entry();
  20.139 +			this.txtArmyName.CanFocus = true;
  20.140 +			this.txtArmyName.Name = "txtArmyName";
  20.141 +			this.txtArmyName.IsEditable = true;
  20.142 +			this.txtArmyName.InvisibleChar = '•';
  20.143 +			this.table1.Add(this.txtArmyName);
  20.144 +			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1[this.txtArmyName]));
  20.145 +			w11.TopAttach = ((uint)(2));
  20.146 +			w11.BottomAttach = ((uint)(3));
  20.147 +			w11.LeftAttach = ((uint)(1));
  20.148 +			w11.RightAttach = ((uint)(2));
  20.149 +			w11.XOptions = ((global::Gtk.AttachOptions)(4));
  20.150 +			w11.YOptions = ((global::Gtk.AttachOptions)(4));
  20.151 +			w1.Add(this.table1);
  20.152 +			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(w1[this.table1]));
  20.153 +			w12.Position = 0;
  20.154 +			w12.Expand = false;
  20.155 +			w12.Fill = false;
  20.156 +			w12.Padding = ((uint)(6));
  20.157 +			// Internal child IBBoard.WarFoundry.GUI.GTK.FrmNewArmy.ActionArea
  20.158 +			global::Gtk.HButtonBox w13 = this.ActionArea;
  20.159 +			w13.CanFocus = true;
  20.160 +			w13.Events = ((global::Gdk.EventMask)(256));
  20.161 +			w13.Name = "WarFoundrySharp.FrmNewArmy_ActionArea";
  20.162 +			w13.Spacing = 6;
  20.163 +			w13.BorderWidth = ((uint)(5));
  20.164 +			w13.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
  20.165 +			// Container child WarFoundrySharp.FrmNewArmy_ActionArea.Gtk.ButtonBox+ButtonBoxChild
  20.166 +			this.bttnCancel = new global::Gtk.Button();
  20.167 +			this.bttnCancel.CanFocus = true;
  20.168 +			this.bttnCancel.Name = "bttnCancel";
  20.169 +			this.bttnCancel.UseStock = true;
  20.170 +			this.bttnCancel.UseUnderline = true;
  20.171 +			this.bttnCancel.Label = "gtk-cancel";
  20.172 +			this.AddActionWidget(this.bttnCancel, -6);
  20.173 +			global::Gtk.ButtonBox.ButtonBoxChild w14 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w13[this.bttnCancel]));
  20.174 +			w14.Expand = false;
  20.175 +			w14.Fill = false;
  20.176 +			// Container child WarFoundrySharp.FrmNewArmy_ActionArea.Gtk.ButtonBox+ButtonBoxChild
  20.177 +			this.bttnCreate = new global::Gtk.Button();
  20.178 +			this.bttnCreate.Sensitive = false;
  20.179 +			this.bttnCreate.CanDefault = true;
  20.180 +			this.bttnCreate.CanFocus = true;
  20.181 +			this.bttnCreate.Name = "bttnCreate";
  20.182 +			this.bttnCreate.UseUnderline = true;
  20.183 +			// Container child bttnCreate.Gtk.Container+ContainerChild
  20.184 +			global::Gtk.Alignment w15 = new global::Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
  20.185 +			// Container child GtkAlignment.Gtk.Container+ContainerChild
  20.186 +			global::Gtk.HBox w16 = new global::Gtk.HBox();
  20.187 +			w16.Spacing = 2;
  20.188 +			// Container child GtkHBox.Gtk.Container+ContainerChild
  20.189 +			global::Gtk.Image w17 = new global::Gtk.Image();
  20.190 +			w17.Pixbuf = global::Stetic.IconLoader.LoadIcon(this, "gtk-ok", global::Gtk.IconSize.Menu);
  20.191 +			w16.Add(w17);
  20.192 +			// Container child GtkHBox.Gtk.Container+ContainerChild
  20.193 +			global::Gtk.Label w19 = new global::Gtk.Label();
  20.194 +			w19.LabelProp = global::Mono.Unix.Catalog.GetString("C_reate");
  20.195 +			w19.UseUnderline = true;
  20.196 +			w16.Add(w19);
  20.197 +			w15.Add(w16);
  20.198 +			this.bttnCreate.Add(w15);
  20.199 +			this.AddActionWidget(this.bttnCreate, -5);
  20.200 +			global::Gtk.ButtonBox.ButtonBoxChild w23 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w13[this.bttnCreate]));
  20.201 +			w23.Position = 1;
  20.202 +			w23.Expand = false;
  20.203 +			w23.Fill = false;
  20.204 +			if ((this.Child != null))
  20.205 +			{
  20.206 +				this.Child.ShowAll();
  20.207 +			}
  20.208 +			this.DefaultWidth = 370;
  20.209 +			this.DefaultHeight = 348;
  20.210 +			this.Show();
  20.211 +			this.txtArmyName.Changed += new global::System.EventHandler(this.OnTextChanged);
  20.212 +			this.systemCombo.Changed += new global::System.EventHandler(this.OnSystemComboChanged);
  20.213 +			this.sbPointsValue.ChangeValue += new global::Gtk.ChangeValueHandler(this.OnSpinChangeValue);
  20.214 +			this.sbPointsValue.ValueChanged += new global::System.EventHandler(this.OnSpinValueChanged);
  20.215 +			this.sbPointsValue.Changed += new global::System.EventHandler(this.OnSpinValueChanged);
  20.216 +			this.bttnCancel.Clicked += new global::System.EventHandler(this.OnCancelClicked);
  20.217 +			this.bttnCreate.Clicked += new global::System.EventHandler(this.OnCreateClicked);
  20.218 +		}
  20.219 +	}
  20.220 +}
    21.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    21.2 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmNewUnit.cs	Sat Dec 18 16:42:51 2010 +0000
    21.3 @@ -0,0 +1,126 @@
    21.4 +
    21.5 +// This file has been generated by the GUI designer. Do not modify.
    21.6 +namespace IBBoard.WarFoundry.GUI.GTK
    21.7 +{
    21.8 +	public partial class FrmNewUnit
    21.9 +	{
   21.10 +		private global::Gtk.VBox vbox2;
   21.11 +		private global::Gtk.HBox hbox1;
   21.12 +		private global::Gtk.Label label1;
   21.13 +		private global::Gtk.ScrolledWindow GtkScrolledWindow;
   21.14 +		private global::Gtk.TreeView lstUnitTypes;
   21.15 +		private global::Gtk.Label lblNewUnitWarning;
   21.16 +		private global::Gtk.Button buttonCancel;
   21.17 +		private global::Gtk.Button buttonOk;
   21.18 +
   21.19 +		protected virtual void Build()
   21.20 +		{
   21.21 +			global::Stetic.Gui.Initialize(this);
   21.22 +			// Widget IBBoard.WarFoundry.GUI.GTK.FrmNewUnit
   21.23 +			this.Name = "IBBoard.WarFoundry.GUI.GTK.FrmNewUnit";
   21.24 +			this.Title = global::Mono.Unix.Catalog.GetString("Add new unit");
   21.25 +			this.Icon = global::Stetic.IconLoader.LoadIcon(this, "gtk-new", global::Gtk.IconSize.Menu);
   21.26 +			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
   21.27 +			this.Modal = true;
   21.28 +			this.SkipPagerHint = true;
   21.29 +			this.SkipTaskbarHint = true;
   21.30 +			// Internal child IBBoard.WarFoundry.GUI.GTK.FrmNewUnit.VBox
   21.31 +			global::Gtk.VBox w1 = this.VBox;
   21.32 +			w1.Name = "dialog1_VBox";
   21.33 +			w1.BorderWidth = ((uint)(2));
   21.34 +			// Container child dialog1_VBox.Gtk.Box+BoxChild
   21.35 +			this.vbox2 = new global::Gtk.VBox();
   21.36 +			this.vbox2.Name = "vbox2";
   21.37 +			this.vbox2.Spacing = 6;
   21.38 +			// Container child vbox2.Gtk.Box+BoxChild
   21.39 +			this.hbox1 = new global::Gtk.HBox();
   21.40 +			this.hbox1.Name = "hbox1";
   21.41 +			this.hbox1.Spacing = 6;
   21.42 +			// Container child hbox1.Gtk.Box+BoxChild
   21.43 +			this.label1 = new global::Gtk.Label();
   21.44 +			this.label1.Name = "label1";
   21.45 +			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString("Unit Type:");
   21.46 +			this.hbox1.Add(this.label1);
   21.47 +			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.label1]));
   21.48 +			w2.Position = 0;
   21.49 +			w2.Expand = false;
   21.50 +			w2.Fill = false;
   21.51 +			// Container child hbox1.Gtk.Box+BoxChild
   21.52 +			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow();
   21.53 +			this.GtkScrolledWindow.Name = "GtkScrolledWindow";
   21.54 +			this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));
   21.55 +			// Container child GtkScrolledWindow.Gtk.Container+ContainerChild
   21.56 +			this.lstUnitTypes = new global::Gtk.TreeView();
   21.57 +			this.lstUnitTypes.HeightRequest = 150;
   21.58 +			this.lstUnitTypes.CanFocus = true;
   21.59 +			this.lstUnitTypes.Name = "lstUnitTypes";
   21.60 +			this.lstUnitTypes.HeadersVisible = false;
   21.61 +			this.GtkScrolledWindow.Add(this.lstUnitTypes);
   21.62 +			this.hbox1.Add(this.GtkScrolledWindow);
   21.63 +			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.GtkScrolledWindow]));
   21.64 +			w4.Position = 1;
   21.65 +			this.vbox2.Add(this.hbox1);
   21.66 +			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.hbox1]));
   21.67 +			w5.Position = 0;
   21.68 +			w5.Expand = false;
   21.69 +			w5.Fill = false;
   21.70 +			// Container child vbox2.Gtk.Box+BoxChild
   21.71 +			this.lblNewUnitWarning = new global::Gtk.Label();
   21.72 +			this.lblNewUnitWarning.Name = "lblNewUnitWarning";
   21.73 +			this.lblNewUnitWarning.Xalign = 0F;
   21.74 +			this.lblNewUnitWarning.Yalign = 0F;
   21.75 +			this.vbox2.Add(this.lblNewUnitWarning);
   21.76 +			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.lblNewUnitWarning]));
   21.77 +			w6.Position = 1;
   21.78 +			w6.Expand = false;
   21.79 +			w6.Fill = false;
   21.80 +			w1.Add(this.vbox2);
   21.81 +			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(w1[this.vbox2]));
   21.82 +			w7.Position = 0;
   21.83 +			w7.Expand = false;
   21.84 +			w7.Fill = false;
   21.85 +			// Internal child IBBoard.WarFoundry.GUI.GTK.FrmNewUnit.ActionArea
   21.86 +			global::Gtk.HButtonBox w8 = this.ActionArea;
   21.87 +			w8.Name = "dialog1_ActionArea";
   21.88 +			w8.Spacing = 6;
   21.89 +			w8.BorderWidth = ((uint)(5));
   21.90 +			w8.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
   21.91 +			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
   21.92 +			this.buttonCancel = new global::Gtk.Button();
   21.93 +			this.buttonCancel.CanDefault = true;
   21.94 +			this.buttonCancel.CanFocus = true;
   21.95 +			this.buttonCancel.Name = "buttonCancel";
   21.96 +			this.buttonCancel.UseStock = true;
   21.97 +			this.buttonCancel.UseUnderline = true;
   21.98 +			this.buttonCancel.Label = "gtk-cancel";
   21.99 +			this.AddActionWidget(this.buttonCancel, -6);
  21.100 +			global::Gtk.ButtonBox.ButtonBoxChild w9 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w8[this.buttonCancel]));
  21.101 +			w9.Expand = false;
  21.102 +			w9.Fill = false;
  21.103 +			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
  21.104 +			this.buttonOk = new global::Gtk.Button();
  21.105 +			this.buttonOk.Sensitive = false;
  21.106 +			this.buttonOk.CanDefault = true;
  21.107 +			this.buttonOk.CanFocus = true;
  21.108 +			this.buttonOk.Name = "buttonOk";
  21.109 +			this.buttonOk.UseStock = true;
  21.110 +			this.buttonOk.UseUnderline = true;
  21.111 +			this.buttonOk.Label = "gtk-ok";
  21.112 +			this.AddActionWidget(this.buttonOk, -5);
  21.113 +			global::Gtk.ButtonBox.ButtonBoxChild w10 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w8[this.buttonOk]));
  21.114 +			w10.Position = 1;
  21.115 +			w10.Expand = false;
  21.116 +			w10.Fill = false;
  21.117 +			if ((this.Child != null))
  21.118 +			{
  21.119 +				this.Child.ShowAll();
  21.120 +			}
  21.121 +			this.DefaultWidth = 400;
  21.122 +			this.DefaultHeight = 318;
  21.123 +			this.Show();
  21.124 +			this.lstUnitTypes.RowActivated += new global::Gtk.RowActivatedHandler(this.OnRowActivated);
  21.125 +			this.buttonCancel.Activated += new global::System.EventHandler(this.OnButtonCancelActivated);
  21.126 +			this.buttonOk.Clicked += new global::System.EventHandler(this.OnButtonOkClicked);
  21.127 +		}
  21.128 +	}
  21.129 +}
    22.1 --- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmReplaceEquipment.cs	Tue Nov 23 21:03:46 2010 +0000
    22.2 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmReplaceEquipment.cs	Sat Dec 18 16:42:51 2010 +0000
    22.3 @@ -5,22 +5,22 @@
    22.4  	public partial class FrmReplaceEquipment
    22.5  	{
    22.6  		private global::Gtk.Table table1;
    22.7 -				private global::Gtk.ScrolledWindow GtkScrolledWindow;
    22.8 -				private global::Gtk.TreeView lstEquipment;
    22.9 -				private global::Gtk.HBox hbox2;
   22.10 -				private global::Gtk.Table table2;
   22.11 -				private global::Gtk.Label lblEquipAll;
   22.12 -				private global::Gtk.Label lblPercent;
   22.13 -				private global::Gtk.SpinButton numericAmount;
   22.14 -				private global::Gtk.SpinButton percentageAmount;
   22.15 -				private global::Gtk.RadioButton rbEquipAll;
   22.16 -				private global::Gtk.RadioButton rbEquipNumeric;
   22.17 -				private global::Gtk.RadioButton rbEquipPercent;
   22.18 -				private global::Gtk.Label lblEquipAmount;
   22.19 -				private global::Gtk.Label lblEquipment;
   22.20 -				private global::Gtk.Button buttonCancel;
   22.21 -				private global::Gtk.Button buttonOk;
   22.22 -		
   22.23 +		private global::Gtk.ScrolledWindow GtkScrolledWindow;
   22.24 +		private global::Gtk.TreeView lstEquipment;
   22.25 +		private global::Gtk.HBox hbox2;
   22.26 +		private global::Gtk.Table table2;
   22.27 +		private global::Gtk.Label lblEquipAll;
   22.28 +		private global::Gtk.Label lblPercent;
   22.29 +		private global::Gtk.SpinButton numericAmount;
   22.30 +		private global::Gtk.SpinButton percentageAmount;
   22.31 +		private global::Gtk.RadioButton rbEquipAll;
   22.32 +		private global::Gtk.RadioButton rbEquipNumeric;
   22.33 +		private global::Gtk.RadioButton rbEquipPercent;
   22.34 +		private global::Gtk.Label lblEquipAmount;
   22.35 +		private global::Gtk.Label lblEquipment;
   22.36 +		private global::Gtk.Button buttonCancel;
   22.37 +		private global::Gtk.Button buttonOk;
   22.38 +
   22.39  		protected virtual void Build()
   22.40  		{
   22.41  			global::Stetic.Gui.Initialize(this);
    23.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    23.2 +++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.Widgets.UnitDisplayWidget.cs	Sat Dec 18 16:42:51 2010 +0000
    23.3 @@ -0,0 +1,262 @@
    23.4 +
    23.5 +// This file has been generated by the GUI designer. Do not modify.
    23.6 +namespace IBBoard.WarFoundry.GUI.GTK.Widgets
    23.7 +{
    23.8 +	public partial class UnitDisplayWidget
    23.9 +	{
   23.10 +		private global::Gtk.VBox vbox1;
   23.11 +		private global::Gtk.HBox hbox1;
   23.12 +		private global::Gtk.Entry unitName;
   23.13 +		private global::Gtk.SpinButton unitSize;
   23.14 +		private global::Gtk.ScrolledWindow statsScrollPanel;
   23.15 +		private global::Gtk.VBox statsRepeatBox;
   23.16 +		private global::Gtk.HSeparator hseparator1;
   23.17 +		private global::Gtk.HBox hbox2;
   23.18 +		private global::Gtk.Table table1;
   23.19 +		private global::Gtk.Label equipmentLabel;
   23.20 +		private global::Gtk.ScrolledWindow GtkScrolledWindow2;
   23.21 +		private global::Gtk.NodeView equipmentList;
   23.22 +		private global::Gtk.ScrolledWindow GtkScrolledWindow3;
   23.23 +		private global::Gtk.TextView notesView;
   23.24 +		private global::Gtk.ScrolledWindow GtkScrolledWindow4;
   23.25 +		private global::Gtk.NodeView abilitiesList;
   23.26 +		private global::Gtk.Label lblAbilities;
   23.27 +		private global::Gtk.Label lblNotes;
   23.28 +		private global::Gtk.VBox vbox3;
   23.29 +		private global::Gtk.Button bttnAddEquipment;
   23.30 +		private global::Gtk.Button bttnEditEquipment;
   23.31 +		private global::Gtk.Button bttnReplaceEquipment;
   23.32 +		private global::Gtk.Button bttnRemoveEquipment;
   23.33 +
   23.34 +		protected virtual void Build()
   23.35 +		{
   23.36 +			global::Stetic.Gui.Initialize(this);
   23.37 +			// Widget IBBoard.WarFoundry.GUI.GTK.Widgets.UnitDisplayWidget
   23.38 +			global::Stetic.BinContainer.Attach(this);
   23.39 +			this.Name = "IBBoard.WarFoundry.GUI.GTK.Widgets.UnitDisplayWidget";
   23.40 +			// Container child IBBoard.WarFoundry.GUI.GTK.Widgets.UnitDisplayWidget.Gtk.Container+ContainerChild
   23.41 +			this.vbox1 = new global::Gtk.VBox();
   23.42 +			this.vbox1.Name = "vbox1";
   23.43 +			this.vbox1.Spacing = 6;
   23.44 +			// Container child vbox1.Gtk.Box+BoxChild
   23.45 +			this.hbox1 = new global::Gtk.HBox();
   23.46 +			this.hbox1.Name = "hbox1";
   23.47 +			this.hbox1.Spacing = 6;
   23.48 +			// Container child hbox1.Gtk.Box+BoxChild
   23.49 +			this.unitName = new global::Gtk.Entry();
   23.50 +			this.unitName.CanFocus = true;
   23.51 +			this.unitName.Name = "unitName";
   23.52 +			this.unitName.IsEditable = true;
   23.53 +			this.unitName.InvisibleChar = '•';
   23.54 +			this.hbox1.Add(this.unitName);
   23.55 +			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.unitName]));
   23.56 +			w1.Position = 0;
   23.57 +			// Container child hbox1.Gtk.Box+BoxChild
   23.58 +			this.unitSize = new global::Gtk.SpinButton(0, 100, 1);
   23.59 +			this.unitSize.CanFocus = true;
   23.60 +			this.unitSize.Name = "unitSize";
   23.61 +			this.unitSize.Adjustment.PageIncrement = 10;
   23.62 +			this.unitSize.ClimbRate = 1;
   23.63 +			this.unitSize.Numeric = true;
   23.64 +			this.hbox1.Add(this.unitSize);
   23.65 +			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.unitSize]));
   23.66 +			w2.Position = 1;
   23.67 +			w2.Expand = false;
   23.68 +			w2.Fill = false;
   23.69 +			this.vbox1.Add(this.hbox1);
   23.70 +			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.hbox1]));
   23.71 +			w3.Position = 0;
   23.72 +			w3.Expand = false;
   23.73 +			w3.Fill = false;
   23.74 +			// Container child vbox1.Gtk.Box+BoxChild
   23.75 +			this.statsScrollPanel = new global::Gtk.ScrolledWindow();
   23.76 +			this.statsScrollPanel.CanFocus = true;
   23.77 +			this.statsScrollPanel.Name = "statsScrollPanel";
   23.78 +			this.statsScrollPanel.ShadowType = ((global::Gtk.ShadowType)(1));
   23.79 +			// Container child statsScrollPanel.Gtk.Container+ContainerChild
   23.80 +			global::Gtk.Viewport w4 = new global::Gtk.Viewport();
   23.81 +			w4.ShadowType = ((global::Gtk.ShadowType)(0));
   23.82 +			// Container child GtkViewport.Gtk.Container+ContainerChild
   23.83 +			this.statsRepeatBox = new global::Gtk.VBox();
   23.84 +			this.statsRepeatBox.Name = "statsRepeatBox";
   23.85 +			this.statsRepeatBox.Spacing = 6;
   23.86 +			w4.Add(this.statsRepeatBox);
   23.87 +			this.statsScrollPanel.Add(w4);
   23.88 +			this.vbox1.Add(this.statsScrollPanel);
   23.89 +			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.statsScrollPanel]));
   23.90 +			w7.Position = 1;
   23.91 +			// Container child vbox1.Gtk.Box+BoxChild
   23.92 +			this.hseparator1 = new global::Gtk.HSeparator();
   23.93 +			this.hseparator1.Name = "hseparator1";
   23.94 +			this.vbox1.Add(this.hseparator1);
   23.95 +			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.hseparator1]));
   23.96 +			w8.Position = 2;
   23.97 +			w8.Expand = false;
   23.98 +			w8.Fill = false;
   23.99 +			// Container child vbox1.Gtk.Box+BoxChild
  23.100 +			this.hbox2 = new global::Gtk.HBox();
  23.101 +			this.hbox2.Name = "hbox2";
  23.102 +			this.hbox2.Spacing = 6;
  23.103 +			// Container child hbox2.Gtk.Box+BoxChild
  23.104 +			this.table1 = new global::Gtk.Table(((uint)(3)), ((uint)(2)), false);
  23.105 +			this.table1.Name = "table1";
  23.106 +			this.table1.RowSpacing = ((uint)(6));
  23.107 +			this.table1.ColumnSpacing = ((uint)(6));
  23.108 +			// Container child table1.Gtk.Table+TableChild
  23.109 +			this.equipmentLabel = new global::Gtk.Label();
  23.110 +			this.equipmentLabel.Name = "equipmentLabel";
  23.111 +			this.equipmentLabel.LabelProp = global::Mono.Unix.Catalog.GetString("equipment:");
  23.112 +			this.table1.Add(this.equipmentLabel);
  23.113 +			global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.table1[this.equipmentLabel]));
  23.114 +			w9.XOptions = ((global::Gtk.AttachOptions)(4));
  23.115 +			w9.YOptions = ((global::Gtk.AttachOptions)(4));
  23.116 +			// Container child table1.Gtk.Table+TableChild
  23.117 +			this.GtkScrolledWindow2 = new global::Gtk.ScrolledWindow();
  23.118 +			this.GtkScrolledWindow2.Name = "GtkScrolledWindow2";
  23.119 +			this.GtkScrolledWindow2.ShadowType = ((global::Gtk.ShadowType)(1));
  23.120 +			// Container child GtkScrolledWindow2.Gtk.Container+ContainerChild
  23.121 +			this.equipmentList = new global::Gtk.NodeView();
  23.122 +			this.equipmentList.CanFocus = true;
  23.123 +			this.equipmentList.Name = "equipmentList";
  23.124 +			this.equipmentList.HeadersVisible = false;
  23.125 +			this.GtkScrolledWindow2.Add(this.equipmentList);
  23.126 +			this.table1.Add(this.GtkScrolledWindow2);
  23.127 +			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1[this.GtkScrolledWindow2]));
  23.128 +			w11.LeftAttach = ((uint)(1));
  23.129 +			w11.RightAttach = ((uint)(2));
  23.130 +			w11.YOptions = ((global::Gtk.AttachOptions)(4));
  23.131 +			// Container child table1.Gtk.Table+TableChild
  23.132 +			this.GtkScrolledWindow3 = new global::Gtk.ScrolledWindow();
  23.133 +			this.GtkScrolledWindow3.Name = "GtkScrolledWindow3";
  23.134 +			this.GtkScrolledWindow3.ShadowType = ((global::Gtk.ShadowType)(1));
  23.135 +			// Container child GtkScrolledWindow3.Gtk.Container+ContainerChild
  23.136 +			this.notesView = new global::Gtk.TextView();
  23.137 +			this.notesView.CanFocus = true;
  23.138 +			this.notesView.Name = "notesView";
  23.139 +			this.notesView.Editable = false;
  23.140 +			this.GtkScrolledWindow3.Add(this.notesView);
  23.141 +			this.table1.Add(this.GtkScrolledWindow3);
  23.142 +			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1[this.GtkScrolledWindow3]));
  23.143 +			w13.TopAttach = ((uint)(2));
  23.144 +			w13.BottomAttach = ((uint)(3));
  23.145 +			w13.LeftAttach = ((uint)(1));
  23.146 +			w13.RightAttach = ((uint)(2));
  23.147 +			w13.YOptions = ((global::Gtk.AttachOptions)(4));
  23.148 +			// Container child table1.Gtk.Table+TableChild
  23.149 +			this.GtkScrolledWindow4 = new global::Gtk.ScrolledWindow();
  23.150 +			this.GtkScrolledWindow4.Name = "GtkScrolledWindow4";
  23.151 +			this.GtkScrolledWindow4.ShadowType = ((global::Gtk.ShadowType)(1));
  23.152 +			// Container child GtkScrolledWindow4.Gtk.Container+ContainerChild
  23.153 +			this.abilitiesList = new global::Gtk.NodeView();
  23.154 +			this.abilitiesList.CanFocus = true;
  23.155 +			this.abilitiesList.Name = "abilitiesList";
  23.156 +			this.abilitiesList.HeadersVisible = false;
  23.157 +			this.GtkScrolledWindow4.Add(this.abilitiesList);
  23.158 +			this.table1.Add(this.GtkScrolledWindow4);
  23.159 +			global::Gtk.Table.TableChild w15 = ((global::Gtk.Table.TableChild)(this.table1[this.GtkScrolledWindow4]));
  23.160 +			w15.TopAttach = ((uint)(1));
  23.161 +			w15.BottomAttach = ((uint)(2));
  23.162 +			w15.LeftAttach = ((uint)(1));
  23.163 +			w15.RightAttach = ((uint)(2));
  23.164 +			w15.YOptions = ((global::Gtk.AttachOptions)(4));
  23.165 +			// Container child table1.Gtk.Table+TableChild
  23.166 +			this.lblAbilities = new global::Gtk.Label();
  23.167 +			this.lblAbilities.Name = "lblAbilities";
  23.168 +			this.lblAbilities.LabelProp = global::Mono.Unix.Catalog.GetString("abilities:");
  23.169 +			this.table1.Add(this.lblAbilities);
  23.170 +			global::Gtk.Table.TableChild w16 = ((global::Gtk.Table.TableChild)(this.table1[this.lblAbilities]));
  23.171 +			w16.TopAttach = ((uint)(1));
  23.172 +			w16.BottomAttach = ((uint)(2));
  23.173 +			w16.XOptions = ((global::Gtk.AttachOptions)(4));
  23.174 +			w16.YOptions = ((global::Gtk.AttachOptions)(4));
  23.175 +			// Container child table1.Gtk.Table+TableChild
  23.176 +			this.lblNotes = new global::Gtk.Label();
  23.177 +			this.lblNotes.Name = "lblNotes";
  23.178 +			this.lblNotes.LabelProp = global::Mono.Unix.Catalog.GetString("notes:");
  23.179 +			this.table1.Add(this.lblNotes);
  23.180 +			global::Gtk.Table.TableChild w17 = ((global::Gtk.Table.TableChild)(this.table1[this.lblNotes]));
  23.181 +			w17.TopAttach = ((uint)(2));
  23.182 +			w17.BottomAttach = ((uint)(3));
  23.183 +			w17.XOptions = ((global::Gtk.AttachOptions)(4));
  23.184 +			w17.YOptions = ((global::Gtk.AttachOptions)(4));
  23.185 +			this.hbox2.Add(this.table1);
  23.186 +			global::Gtk.Box.BoxChild w18 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.table1]));
  23.187 +			w18.Position = 0;
  23.188 +			// Container child hbox2.Gtk.Box+BoxChild
  23.189 +			this.vbox3 = new global::Gtk.VBox();
  23.190 +			this.vbox3.Name = "vbox3";
  23.191 +			this.vbox3.Spacing = 6;
  23.192 +			// Container child vbox3.Gtk.Box+BoxChild
  23.193 +			this.bttnAddEquipment = new global::Gtk.Button();
  23.194 +			this.bttnAddEquipment.CanFocus = true;
  23.195 +			this.bttnAddEquipment.Name = "bttnAddEquipment";
  23.196 +			this.bttnAddEquipment.UseUnderline = true;
  23.197 +			this.bttnAddEquipment.Label = global::Mono.Unix.Catalog.GetString("Add");
  23.198 +			this.vbox3.Add(this.bttnAddEquipment);
  23.199 +			global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.bttnAddEquipment]));
  23.200 +			w19.Position = 0;
  23.201 +			w19.Expand = false;
  23.202 +			w19.Fill = false;
  23.203 +			// Container child vbox3.Gtk.Box+BoxChild
  23.204 +			this.bttnEditEquipment = new global::Gtk.Button();
  23.205 +			this.bttnEditEquipment.Sensitive = false;
  23.206 +			this.bttnEditEquipment.CanFocus = true;
  23.207 +			this.bttnEditEquipment.Name = "bttnEditEquipment";
  23.208 +			this.bttnEditEquipment.UseUnderline = true;
  23.209 +			this.bttnEditEquipment.Label = global::Mono.Unix.Catalog.GetString("Edit");
  23.210 +			this.vbox3.Add(this.bttnEditEquipment);
  23.211 +			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.bttnEditEquipment]));
  23.212 +			w20.Position = 1;
  23.213 +			w20.Expand = false;
  23.214 +			w20.Fill = false;
  23.215 +			// Container child vbox3.Gtk.Box+BoxChild
  23.216 +			this.bttnReplaceEquipment = new global::Gtk.Button();
  23.217 +			this.bttnReplaceEquipment.Sensitive = false;
  23.218 +			this.bttnReplaceEquipment.CanFocus = true;
  23.219 +			this.bttnReplaceEquipment.Name = "bttnReplaceEquipment";
  23.220 +			this.bttnReplaceEquipment.UseUnderline = true;
  23.221 +			this.bttnReplaceEquipment.Label = global::Mono.Unix.Catalog.GetString("Replace");
  23.222 +			this.vbox3.Add(this.bttnReplaceEquipment);
  23.223 +			global::Gtk.Box.BoxChild w21 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.bttnReplaceEquipment]));
  23.224 +			w21.Position = 2;
  23.225 +			w21.Expand = false;
  23.226 +			w21.Fill = false;
  23.227 +			// Container child vbox3.Gtk.Box+BoxChild
  23.228 +			this.bttnRemoveEquipment = new global::Gtk.Button();
  23.229 +			this.bttnRemoveEquipment.Sensitive = false;
  23.230 +			this.bttnRemoveEquipment.CanFocus = true;
  23.231 +			this.bttnRemoveEquipment.Name = "bttnRemoveEquipment";
  23.232 +			this.bttnRemoveEquipment.UseUnderline = true;
  23.233 +			this.bttnRemoveEquipment.Label = global::Mono.Unix.Catalog.GetString("Remove");
  23.234 +			this.vbox3.Add(this.bttnRemoveEquipment);
  23.235 +			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.bttnRemoveEquipment]));
  23.236 +			w22.Position = 3;
  23.237 +			w22.Expand = false;
  23.238 +			w22.Fill = false;
  23.239 +			this.hbox2.Add(this.vbox3);
  23.240 +			global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.vbox3]));
  23.241 +			w23.Position = 1;
  23.242 +			w23.Expand = false;
  23.243 +			w23.Fill = false;
  23.244 +			this.vbox1.Add(this.hbox2);
  23.245 +			global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.hbox2]));
  23.246 +			w24.Position = 3;
  23.247 +			w24.Expand = false;
  23.248 +			w24.Fill = false;
  23.249 +			this.Add(this.vbox1);
  23.250 +			if ((this.Child != null))
  23.251 +			{
  23.252 +				this.Child.ShowAll();
  23.253 +			}
  23.254 +			this.Show();
  23.255 +			this.unitName.FocusOutEvent += new global::Gtk.FocusOutEventHandler(this.OnUnitNameFocusOut);
  23.256 +			this.unitName.KeyPressEvent += new global::Gtk.KeyPressEventHandler(this.OnUnitNameKeyPress);
  23.257 +			this.unitSize.FocusOutEvent += new global::Gtk.FocusOutEventHandler(this.OnUnitSizeFocusOut);
  23.258 +			this.unitSize.KeyPressEvent += new global::Gtk.KeyPressEventHandler(this.OnUnitSizeKeyPress);
  23.259 +			this.bttnAddEquipment.Clicked += new global::System.EventHandler(this.OnBttnAddEquipmentClicked);
  23.260 +			this.bttnEditEquipment.Clicked += new global::System.EventHandler(this.HandleEditButtonClicked);
  23.261 +			this.bttnReplaceEquipment.Clicked += new global::System.EventHandler(this.HandleReplaceButtonClicked);
  23.262 +			this.bttnRemoveEquipment.Clicked += new global::System.EventHandler(this.HandleRemoveButtonActivated);
  23.263 +		}
  23.264 +	}
  23.265 +}
    24.1 --- a/gtk-gui/generated.cs	Tue Nov 23 21:03:46 2010 +0000
    24.2 +++ b/gtk-gui/generated.cs	Sat Dec 18 16:42:51 2010 +0000
    24.3 @@ -6,7 +6,7 @@
    24.4  	{
    24.5  		private static bool initialized;
    24.6  
    24.7 -		static internal void Initialize(Gtk.Widget iconRenderer)
    24.8 +		internal static void Initialize(Gtk.Widget iconRenderer)
    24.9  		{
   24.10  			if ((Stetic.Gui.initialized == false))
   24.11  			{
   24.12 @@ -24,12 +24,11 @@
   24.13  			{
   24.14  				return res;
   24.15  			}
   24.16 -
   24.17  			else
   24.18  			{
   24.19  				int sz;
   24.20  				int sy;
   24.21 -				global::Gtk.Icon.SizeLookup(size, out sz, out sy);
   24.22 +				global::Gtk.Icon.SizeLookup(size, out  sz, out  sy);
   24.23  				try
   24.24  				{
   24.25  					return Gtk.IconTheme.Default.LoadIcon(name, sz, 0);
   24.26 @@ -40,7 +39,6 @@
   24.27  					{
   24.28  						return Stetic.IconLoader.LoadIcon(widget, "gtk-missing-image", size);
   24.29  					}
   24.30 -
   24.31  					else
   24.32  					{
   24.33  						Gdk.Pixmap pmap = new Gdk.Pixmap(Gdk.Screen.Default.RootWindow, sz, sz);
   24.34 @@ -63,7 +61,6 @@
   24.35  	internal class BinContainer
   24.36  	{
   24.37  		private Gtk.Widget child;
   24.38 -
   24.39  		private Gtk.UIManager uimanager;
   24.40  
   24.41  		public static BinContainer Attach(Gtk.Bin bin)
    25.1 --- a/gtk-gui/gui.stetic	Tue Nov 23 21:03:46 2010 +0000
    25.2 +++ b/gtk-gui/gui.stetic	Sat Dec 18 16:42:51 2010 +0000
    25.3 @@ -5,10 +5,10 @@
    25.4      <target-gtk-version>2.12</target-gtk-version>
    25.5    </configuration>
    25.6    <import>
    25.7 -    <widget-library name="../../IBBoard.GtkSharp/bin/Debug/IBBoard.GtkSharp.dll" />
    25.8 -    <widget-library name="../bin/Debug/WarFoundryGTK.exe" internal="true" />
    25.9 +    <widget-library name="../../IBBoard.GtkSharp/bin/Release/IBBoard.GtkSharp.dll" />
   25.10 +    <widget-library name="../bin/Release/WarFoundry-GTK.exe" internal="true" />
   25.11    </import>
   25.12 -  <widget class="Gtk.Window" id="IBBoard.WarFoundry.GTK.FrmMainWindow" design-size="832 659">
   25.13 +  <widget class="Gtk.Window" id="IBBoard.WarFoundry.GUI.GTK.FrmMainWindow" design-size="832 659">
   25.14      <action-group name="Default">
   25.15        <action id="menuFile">
   25.16          <property name="Type">Action</property>
   25.17 @@ -96,6 +96,7 @@
   25.18          <property name="Label" translatable="yes">About</property>
   25.19          <property name="ShortLabel" translatable="yes">About</property>
   25.20          <property name="StockId">gtk-about</property>
   25.21 +        <signal name="Activated" handler="HelpAboutActivated" />
   25.22        </action>
   25.23        <action id="miDebugInformation">
   25.24          <property name="Type">Action</property>
   25.25 @@ -188,7 +189,6 @@
   25.26                </node>
   25.27                <node type="Menu" action="menuHelp">
   25.28                  <node type="Menuitem" action="miAbout" />
   25.29 -                <node type="Menuitem" action="miDebugInformation" />
   25.30                </node>
   25.31              </node>
   25.32            </widget>
   25.33 @@ -277,7 +277,7 @@
   25.34        </widget>
   25.35      </child>
   25.36    </widget>
   25.37 -  <widget class="Gtk.Dialog" id="IBBoard.WarFoundry.GTK.FrmNewArmy" design-size="370 348">
   25.38 +  <widget class="Gtk.Dialog" id="IBBoard.WarFoundry.GUI.GTK.FrmNewArmy" design-size="370 348">
   25.39      <property name="MemberName" />
   25.40      <property name="Events">ButtonPressMask</property>
   25.41      <property name="Title" translatable="yes">Create new army</property>
   25.42 @@ -552,7 +552,7 @@
   25.43        </widget>
   25.44      </child>
   25.45    </widget>
   25.46 -  <widget class="Gtk.Dialog" id="IBBoard.WarFoundry.GTK.FrmNewUnit" design-size="400 318">
   25.47 +  <widget class="Gtk.Dialog" id="IBBoard.WarFoundry.GUI.GTK.FrmNewUnit" design-size="400 318">
   25.48      <property name="MemberName" />
   25.49      <property name="Title" translatable="yes">Add new unit</property>
   25.50      <property name="Icon">stock:gtk-new Menu</property>
   25.51 @@ -683,7 +683,7 @@
   25.52        </widget>
   25.53      </child>
   25.54    </widget>
   25.55 -  <widget class="Gtk.Bin" id="IBBoard.WarFoundry.GTK.Widgets.UnitDisplayWidget" design-size="649 458">
   25.56 +  <widget class="Gtk.Bin" id="IBBoard.WarFoundry.GUI.GTK.Widgets.UnitDisplayWidget" design-size="649 458">
   25.57      <property name="MemberName" />
   25.58      <child>
   25.59        <widget class="Gtk.VBox" id="vbox1">
   25.60 @@ -2015,4 +2015,110 @@
   25.61        </widget>
   25.62      </child>
   25.63    </widget>
   25.64 +  <widget class="Gtk.Dialog" id="IBBoard.WarFoundry.GUI.GTK.FrmAbout" design-size="305 300">
   25.65 +    <property name="MemberName" />
   25.66 +    <property name="Title" translatable="yes">About WarFoundry</property>
   25.67 +    <property name="TypeHint">Dialog</property>
   25.68 +    <property name="WindowPosition">CenterOnParent</property>
   25.69 +    <property name="Resizable">False</property>
   25.70 +    <property name="AllowGrow">False</property>
   25.71 +    <property name="Buttons">1</property>
   25.72 +    <property name="HelpButton">False</property>
   25.73 +    <child internal-child="VBox">
   25.74 +      <widget class="Gtk.VBox" id="dialog1_VBox">
   25.75 +        <property name="MemberName" />
   25.76 +        <property name="BorderWidth">2</property>
   25.77 +        <child>
   25.78 +          <widget class="Gtk.Image" id="image1">
   25.79 +            <property name="MemberName" />
   25.80 +            <property name="Pixbuf">resource:IBBoard.WarFoundry.GUI.GTK.App-lrg.png</property>
   25.81 +          </widget>
   25.82 +          <packing>
   25.83 +            <property name="Position">0</property>
   25.84 +            <property name="AutoSize">True</property>
   25.85 +            <property name="Expand">False</property>
   25.86 +            <property name="Fill">False</property>
   25.87 +          </packing>
   25.88 +        </child>
   25.89 +        <child>
   25.90 +          <widget class="Gtk.Label" id="label1">
   25.91 +            <property name="MemberName" />
   25.92 +            <property name="LabelProp" translatable="yes">&lt;span font_size="x-large" weight="bold"&gt;WarFoundry v0.1 Beta 1&lt;/span&gt;</property>
   25.93 +            <property name="UseMarkup">True</property>
   25.94 +          </widget>
   25.95 +          <packing>
   25.96 +            <property name="Position">1</property>
   25.97 +            <property name="AutoSize">True</property>
   25.98 +            <property name="Expand">False</property>
   25.99 +            <property name="Fill">False</property>
  25.100 +          </packing>
  25.101 +        </child>
  25.102 +        <child>
  25.103 +          <widget class="Gtk.Label" id="label4">
  25.104 +            <property name="MemberName" />
  25.105 +            <property name="LabelProp" translatable="yes">WarFoundry is an open-source army creation tool that lets you create rosters for multiple game systems.</property>
  25.106 +            <property name="Wrap">True</property>
  25.107 +            <property name="Justify">Center</property>
  25.108 +          </widget>
  25.109 +          <packing>
  25.110 +            <property name="Position">2</property>
  25.111 +            <property name="AutoSize">True</property>
  25.112 +            <property name="Expand">False</property>
  25.113 +            <property name="Fill">False</property>
  25.114 +          </packing>
  25.115 +        </child>
  25.116 +        <child>
  25.117 +          <widget class="Gtk.Label" id="label2">
  25.118 +            <property name="MemberName" />
  25.119 +            <property name="LabelProp" translatable="yes">© 2007-2010, IBBoard and others</property>
  25.120 +          </widget>
  25.121 +          <packing>
  25.122 +            <property name="Position">3</property>
  25.123 +            <property name="AutoSize">True</property>
  25.124 +            <property name="Expand">False</property>
  25.125 +            <property name="Fill">False</property>
  25.126 +          </packing>
  25.127 +        </child>
  25.128 +        <child>
  25.129 +          <widget class="Gtk.Label" id="label3">
  25.130 +            <property name="MemberName" />
  25.131 +            <property name="LabelProp" translatable="yes">&lt;a href="http://warfoundry.co.uk"&gt;http://warfoundry.co.uk&lt;/a&gt;</property>
  25.132 +            <property name="UseMarkup">True</property>
  25.133 +          </widget>
  25.134 +          <packing>
  25.135 +            <property name="Position">4</property>
  25.136 +            <property name="AutoSize">True</property>
  25.137 +            <property name="Expand">False</property>
  25.138 +            <property name="Fill">False</property>
  25.139 +          </packing>
  25.140 +        </child>
  25.141 +      </widget>
  25.142 +    </child>
  25.143 +    <child internal-child="ActionArea">
  25.144 +      <widget class="Gtk.HButtonBox" id="dialog1_ActionArea">
  25.145 +        <property name="MemberName" />
  25.146 +        <property name="Spacing">10</property>
  25.147 +        <property name="BorderWidth">5</property>
  25.148 +        <property name="Size">1</property>
  25.149 +        <property name="LayoutStyle">End</property>
  25.150 +        <child>
  25.151 +          <widget class="Gtk.Button" id="buttonOk">
  25.152 +            <property name="MemberName" />
  25.153 +            <property name="CanDefault">True</property>
  25.154 +            <property name="CanFocus">True</property>
  25.155 +            <property name="UseStock">True</property>
  25.156 +            <property name="Type">StockItem</property>
  25.157 +            <property name="StockId">gtk-ok</property>
  25.158 +            <property name="ResponseId">-5</property>
  25.159 +            <signal name="Activated" handler="OkayClicked" />
  25.160 +            <property name="label">gtk-ok</property>
  25.161 +          </widget>
  25.162 +          <packing>
  25.163 +            <property name="Expand">False</property>
  25.164 +            <property name="Fill">False</property>
  25.165 +          </packing>
  25.166 +        </child>
  25.167 +      </widget>
  25.168 +    </child>
  25.169 +  </widget>
  25.170  </stetic-interface>
  25.171 \ No newline at end of file
    26.1 --- a/gtk-gui/objects.xml	Tue Nov 23 21:03:46 2010 +0000
    26.2 +++ b/gtk-gui/objects.xml	Sat Dec 18 16:42:51 2010 +0000
    26.3 @@ -1,5 +1,5 @@
    26.4  <objects attr-sync="on">
    26.5 -  <object type="IBBoard.WarFoundry.GTK.Widgets.UnitDisplayWidget" palette-category="WarFoundry GTK# GUI" allow-children="false" base-type="Gtk.Bin">
    26.6 +  <object type="IBBoard.WarFoundry.GUI.GTK.Widgets.UnitDisplayWidget" palette-category="WarFoundry GTK# GUI" allow-children="false" base-type="Gtk.Bin">
    26.7      <itemgroups />
    26.8      <signals />
    26.9    </object>