changeset 196:15148d255e50

* First stab at displaying new unit requirements no-open-ticket
author IBBoard <dev@ibboard.co.uk>
date Sun, 01 May 2011 11:05:29 +0000
parents 983d96be91f5
children 10ba2c5340b2
files FrmMain.cs FrmMain.resx
diffstat 2 files changed, 361 insertions(+), 386 deletions(-) [+]
line diff
     1.1 --- a/FrmMain.cs	Sun May 01 10:51:30 2011 +0000
     1.2 +++ b/FrmMain.cs	Sun May 01 11:05:29 2011 +0000
     1.3 @@ -24,6 +24,7 @@
     1.4  using IBBoard.WarFoundry.API.Commands;
     1.5  using IBBoard.WarFoundry.API.Exporters;
     1.6  using IBBoard.WarFoundry.API.Objects;
     1.7 +using IBBoard.WarFoundry.API.Objects.Requirement;
     1.8  using IBBoard.WarFoundry.API.Util;
     1.9  using IBBoard.WarFoundry.API.Savers;
    1.10  using IBBoard.WarFoundry.API.Savers.Xml;
    1.11 @@ -70,8 +71,7 @@
    1.12  		private IBBoard.Windows.Forms.ColorableStatusBarPanel sbPointsPanel;
    1.13  		private System.Windows.Forms.ContextMenu undoMenu;
    1.14  		private System.Windows.Forms.ContextMenu redoMenu;
    1.15 -		private IBBoard.Windows.Forms.ColorableStatusBar statusBar;
    1.16 -		private System.Windows.Forms.Timer statusBarTimer;
    1.17 +        private IBBoard.Windows.Forms.ColorableStatusBar statusBar;
    1.18  		private MenuStrip menuStrip;
    1.19  		private IBBToolStripMenuItem menuFile;
    1.20  		private IBBToolStripMenuItem miNewArmy;
    1.21 @@ -251,78 +251,72 @@
    1.22  		/// </summary>
    1.23  		private void InitializeComponent()
    1.24  		{
    1.25 -			this.components = new System.ComponentModel.Container();
    1.26 -			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain));
    1.27 -			this.undoMenu = new System.Windows.Forms.ContextMenu();
    1.28 -			this.redoMenu = new System.Windows.Forms.ContextMenu();
    1.29 -			this.mainMenu = new System.Windows.Forms.MainMenu(this.components);
    1.30 -			this.openArmyDialog = new System.Windows.Forms.OpenFileDialog();
    1.31 -			this.saveArmyDialog = new System.Windows.Forms.SaveFileDialog();
    1.32 -			this.statusBarTimer = new System.Windows.Forms.Timer(this.components);
    1.33 -			this.menuStrip = new System.Windows.Forms.MenuStrip();
    1.34 -			this.menuFile = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
    1.35 -			this.miNewArmy = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
    1.36 -			this.miOpenArmy = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
    1.37 -			this.miSaveArmy = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
    1.38 -			this.miSaveArmyAs = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
    1.39 -			this.miExportArmyAs = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
    1.40 -			this.miExportArmyAsBasicHTML = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
    1.41 -			this.miCloseArmy = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
    1.42 -			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
    1.43 -			this.miReloadFiles = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
    1.44 -			this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
    1.45 -			this.miExit = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
    1.46 -			this.menuEdit = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
    1.47 -			this.miUndo = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
    1.48 -			this.miRedo = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
    1.49 -			this.menuHelp = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
    1.50 -			this.miAbout = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
    1.51 -			this.mainToolStrip = new System.Windows.Forms.ToolStrip();
    1.52 -			this.bttnNewArmy = new IBBoard.Windows.Forms.IBBToolStripButton();
    1.53 -			this.bttnOpenArmy = new IBBoard.Windows.Forms.IBBToolStripButton();
    1.54 -			this.bttnSaveArmy = new IBBoard.Windows.Forms.IBBToolStripButton();
    1.55 -			this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
    1.56 -			this.bttnUndo = new IBBoard.Windows.Forms.IBBToolStripSplitButton();
    1.57 -			this.bttnRedo = new IBBoard.Windows.Forms.IBBToolStripSplitButton();
    1.58 -			this.catToolStrip = new System.Windows.Forms.ToolStrip();
    1.59 -			this.statusBar = new IBBoard.Windows.Forms.ColorableStatusBar();
    1.60 -			this.sbMainPanel = new IBBoard.Windows.Forms.ColorableStatusBarPanel();
    1.61 -			this.sbErrorPanel = new IBBoard.Windows.Forms.ColorableStatusBarPanel();
    1.62 -			this.sbPointsPanel = new IBBoard.Windows.Forms.ColorableStatusBarPanel();
    1.63 -			this.toolStripPanel = new System.Windows.Forms.ToolStripPanel();
    1.64 -			this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
    1.65 -			this.miPreferences = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
    1.66 -			this.menuStrip.SuspendLayout();
    1.67 -			this.mainToolStrip.SuspendLayout();
    1.68 -			((System.ComponentModel.ISupportInitialize) (this.sbMainPanel)).BeginInit();
    1.69 -			((System.ComponentModel.ISupportInitialize) (this.sbErrorPanel)).BeginInit();
    1.70 -			((System.ComponentModel.ISupportInitialize) (this.sbPointsPanel)).BeginInit();
    1.71 -			this.SuspendLayout();
    1.72 -			// 
    1.73 -			// saveArmyDialog
    1.74 -			// 
    1.75 -			this.saveArmyDialog.Title = "Translatable:saveArmyDialog";
    1.76 -			// 
    1.77 -			// statusBarTimer
    1.78 -			// 
    1.79 -			this.statusBarTimer.Interval = 5000;
    1.80 -			this.statusBarTimer.Tick += new System.EventHandler(this.statusBarTimer_Tick);
    1.81 -			// 
    1.82 -			// menuStrip
    1.83 -			// 
    1.84 -			this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
    1.85 +            this.components = new System.ComponentModel.Container();
    1.86 +            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain));
    1.87 +            this.undoMenu = new System.Windows.Forms.ContextMenu();
    1.88 +            this.redoMenu = new System.Windows.Forms.ContextMenu();
    1.89 +            this.mainMenu = new System.Windows.Forms.MainMenu(this.components);
    1.90 +            this.openArmyDialog = new System.Windows.Forms.OpenFileDialog();
    1.91 +            this.saveArmyDialog = new System.Windows.Forms.SaveFileDialog();
    1.92 +            this.menuStrip = new System.Windows.Forms.MenuStrip();
    1.93 +            this.menuFile = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
    1.94 +            this.miNewArmy = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
    1.95 +            this.miOpenArmy = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
    1.96 +            this.miSaveArmy = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
    1.97 +            this.miSaveArmyAs = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
    1.98 +            this.miExportArmyAs = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
    1.99 +            this.miExportArmyAsBasicHTML = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
   1.100 +            this.miCloseArmy = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
   1.101 +            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
   1.102 +            this.miReloadFiles = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
   1.103 +            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
   1.104 +            this.miExit = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
   1.105 +            this.menuEdit = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
   1.106 +            this.miUndo = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
   1.107 +            this.miRedo = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
   1.108 +            this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
   1.109 +            this.miPreferences = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
   1.110 +            this.menuHelp = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
   1.111 +            this.miAbout = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
   1.112 +            this.mainToolStrip = new System.Windows.Forms.ToolStrip();
   1.113 +            this.bttnNewArmy = new IBBoard.Windows.Forms.IBBToolStripButton();
   1.114 +            this.bttnOpenArmy = new IBBoard.Windows.Forms.IBBToolStripButton();
   1.115 +            this.bttnSaveArmy = new IBBoard.Windows.Forms.IBBToolStripButton();
   1.116 +            this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
   1.117 +            this.bttnUndo = new IBBoard.Windows.Forms.IBBToolStripSplitButton();
   1.118 +            this.bttnRedo = new IBBoard.Windows.Forms.IBBToolStripSplitButton();
   1.119 +            this.catToolStrip = new System.Windows.Forms.ToolStrip();
   1.120 +            this.statusBar = new IBBoard.Windows.Forms.ColorableStatusBar();
   1.121 +            this.sbMainPanel = new IBBoard.Windows.Forms.ColorableStatusBarPanel();
   1.122 +            this.sbErrorPanel = new IBBoard.Windows.Forms.ColorableStatusBarPanel();
   1.123 +            this.sbPointsPanel = new IBBoard.Windows.Forms.ColorableStatusBarPanel();
   1.124 +            this.toolStripPanel = new System.Windows.Forms.ToolStripPanel();
   1.125 +            this.menuStrip.SuspendLayout();
   1.126 +            this.mainToolStrip.SuspendLayout();
   1.127 +            ((System.ComponentModel.ISupportInitialize)(this.sbMainPanel)).BeginInit();
   1.128 +            ((System.ComponentModel.ISupportInitialize)(this.sbErrorPanel)).BeginInit();
   1.129 +            ((System.ComponentModel.ISupportInitialize)(this.sbPointsPanel)).BeginInit();
   1.130 +            this.SuspendLayout();
   1.131 +            // 
   1.132 +            // saveArmyDialog
   1.133 +            // 
   1.134 +            this.saveArmyDialog.Title = "Translatable:saveArmyDialog";
   1.135 +            // 
   1.136 +            // menuStrip
   1.137 +            // 
   1.138 +            this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
   1.139              this.menuFile,
   1.140              this.menuEdit,
   1.141              this.menuHelp});
   1.142 -			this.menuStrip.Location = new System.Drawing.Point(0, 0);
   1.143 -			this.menuStrip.Name = "menuStrip";
   1.144 -			this.menuStrip.Size = new System.Drawing.Size(790, 24);
   1.145 -			this.menuStrip.TabIndex = 6;
   1.146 -			this.menuStrip.Text = "menuStrip1";
   1.147 -			// 
   1.148 -			// menuFile
   1.149 -			// 
   1.150 -			this.menuFile.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
   1.151 +            this.menuStrip.Location = new System.Drawing.Point(0, 0);
   1.152 +            this.menuStrip.Name = "menuStrip";
   1.153 +            this.menuStrip.Size = new System.Drawing.Size(790, 24);
   1.154 +            this.menuStrip.TabIndex = 6;
   1.155 +            this.menuStrip.Text = "menuStrip1";
   1.156 +            // 
   1.157 +            // menuFile
   1.158 +            // 
   1.159 +            this.menuFile.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
   1.160              this.miNewArmy,
   1.161              this.miOpenArmy,
   1.162              this.miSaveArmy,
   1.163 @@ -333,295 +327,295 @@
   1.164              this.miReloadFiles,
   1.165              this.toolStripSeparator2,
   1.166              this.miExit});
   1.167 -			this.menuFile.Name = "menuFile";
   1.168 -			this.menuFile.Size = new System.Drawing.Size(33, 20);
   1.169 -			this.menuFile.Text = "&file";
   1.170 -			// 
   1.171 -			// miNewArmy
   1.172 -			// 
   1.173 -			this.miNewArmy.Name = "miNewArmy";
   1.174 -			this.miNewArmy.Size = new System.Drawing.Size(164, 22);
   1.175 -			this.miNewArmy.Text = "&new army";
   1.176 -			this.miNewArmy.Click += new System.EventHandler(this.miNewArmy_Click);
   1.177 -			// 
   1.178 -			// miOpenArmy
   1.179 -			// 
   1.180 -			this.miOpenArmy.Name = "miOpenArmy";
   1.181 -			this.miOpenArmy.Size = new System.Drawing.Size(164, 22);
   1.182 -			this.miOpenArmy.Text = "&open army";
   1.183 -			this.miOpenArmy.Click += new System.EventHandler(this.miOpenArmy_Click);
   1.184 -			// 
   1.185 -			// miSaveArmy
   1.186 -			// 
   1.187 -			this.miSaveArmy.Enabled = false;
   1.188 -			this.miSaveArmy.Name = "miSaveArmy";
   1.189 -			this.miSaveArmy.Size = new System.Drawing.Size(164, 22);
   1.190 -			this.miSaveArmy.Text = "&save army";
   1.191 -			this.miSaveArmy.Click += new System.EventHandler(this.miSaveArmy_Click);
   1.192 -			// 
   1.193 -			// miSaveArmyAs
   1.194 -			// 
   1.195 -			this.miSaveArmyAs.Enabled = false;
   1.196 -			this.miSaveArmyAs.Name = "miSaveArmyAs";
   1.197 -			this.miSaveArmyAs.Size = new System.Drawing.Size(164, 22);
   1.198 -			this.miSaveArmyAs.Text = "save army &as...";
   1.199 -			this.miSaveArmyAs.Click += new System.EventHandler(this.miSaveArmyAs_Click);
   1.200 -			// 
   1.201 -			// miExportArmyAs
   1.202 -			// 
   1.203 -			this.miExportArmyAs.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
   1.204 +            this.menuFile.Name = "menuFile";
   1.205 +            this.menuFile.Size = new System.Drawing.Size(33, 20);
   1.206 +            this.menuFile.Text = "&file";
   1.207 +            // 
   1.208 +            // miNewArmy
   1.209 +            // 
   1.210 +            this.miNewArmy.Name = "miNewArmy";
   1.211 +            this.miNewArmy.Size = new System.Drawing.Size(164, 22);
   1.212 +            this.miNewArmy.Text = "&new army";
   1.213 +            this.miNewArmy.Click += new System.EventHandler(this.miNewArmy_Click);
   1.214 +            // 
   1.215 +            // miOpenArmy
   1.216 +            // 
   1.217 +            this.miOpenArmy.Name = "miOpenArmy";
   1.218 +            this.miOpenArmy.Size = new System.Drawing.Size(164, 22);
   1.219 +            this.miOpenArmy.Text = "&open army";
   1.220 +            this.miOpenArmy.Click += new System.EventHandler(this.miOpenArmy_Click);
   1.221 +            // 
   1.222 +            // miSaveArmy
   1.223 +            // 
   1.224 +            this.miSaveArmy.Enabled = false;
   1.225 +            this.miSaveArmy.Name = "miSaveArmy";
   1.226 +            this.miSaveArmy.Size = new System.Drawing.Size(164, 22);
   1.227 +            this.miSaveArmy.Text = "&save army";
   1.228 +            this.miSaveArmy.Click += new System.EventHandler(this.miSaveArmy_Click);
   1.229 +            // 
   1.230 +            // miSaveArmyAs
   1.231 +            // 
   1.232 +            this.miSaveArmyAs.Enabled = false;
   1.233 +            this.miSaveArmyAs.Name = "miSaveArmyAs";
   1.234 +            this.miSaveArmyAs.Size = new System.Drawing.Size(164, 22);
   1.235 +            this.miSaveArmyAs.Text = "save army &as...";
   1.236 +            this.miSaveArmyAs.Click += new System.EventHandler(this.miSaveArmyAs_Click);
   1.237 +            // 
   1.238 +            // miExportArmyAs
   1.239 +            // 
   1.240 +            this.miExportArmyAs.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
   1.241              this.miExportArmyAsBasicHTML});
   1.242 -			this.miExportArmyAs.Enabled = false;
   1.243 -			this.miExportArmyAs.Name = "miExportArmyAs";
   1.244 -			this.miExportArmyAs.Size = new System.Drawing.Size(164, 22);
   1.245 -			this.miExportArmyAs.Text = "export army as...";
   1.246 -			// 
   1.247 -			// miExportArmyAsBasicHTML
   1.248 -			// 
   1.249 -			this.miExportArmyAsBasicHTML.Name = "miExportArmyAsBasicHTML";
   1.250 -			this.miExportArmyAsBasicHTML.Size = new System.Drawing.Size(130, 22);
   1.251 -			this.miExportArmyAsBasicHTML.Text = "&basic html";
   1.252 -			this.miExportArmyAsBasicHTML.Click += new System.EventHandler(this.miExportArmyAsBasicHTML_Click);
   1.253 -			// 
   1.254 -			// miCloseArmy
   1.255 -			// 
   1.256 -			this.miCloseArmy.Enabled = false;
   1.257 -			this.miCloseArmy.Name = "miCloseArmy";
   1.258 -			this.miCloseArmy.Size = new System.Drawing.Size(164, 22);
   1.259 -			this.miCloseArmy.Text = "&close army";
   1.260 -			this.miCloseArmy.Click += new System.EventHandler(this.miCloseArmy_Click);
   1.261 -			// 
   1.262 -			// toolStripSeparator1
   1.263 -			// 
   1.264 -			this.toolStripSeparator1.Name = "toolStripSeparator1";
   1.265 -			this.toolStripSeparator1.Size = new System.Drawing.Size(161, 6);
   1.266 -			// 
   1.267 -			// miReloadFiles
   1.268 -			// 
   1.269 -			this.miReloadFiles.Name = "miReloadFiles";
   1.270 -			this.miReloadFiles.Size = new System.Drawing.Size(164, 22);
   1.271 -			this.miReloadFiles.Text = "&reload files";
   1.272 -			this.miReloadFiles.Click += new System.EventHandler(this.miReloadFiles_Click);
   1.273 -			// 
   1.274 -			// toolStripSeparator2
   1.275 -			// 
   1.276 -			this.toolStripSeparator2.Name = "toolStripSeparator2";
   1.277 -			this.toolStripSeparator2.Size = new System.Drawing.Size(161, 6);
   1.278 -			// 
   1.279 -			// miExit
   1.280 -			// 
   1.281 -			this.miExit.Name = "miExit";
   1.282 -			this.miExit.Size = new System.Drawing.Size(164, 22);
   1.283 -			this.miExit.Text = "e&xit";
   1.284 -			this.miExit.Click += new System.EventHandler(this.miExit_Click);
   1.285 -			// 
   1.286 -			// menuEdit
   1.287 -			// 
   1.288 -			this.menuEdit.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
   1.289 +            this.miExportArmyAs.Enabled = false;
   1.290 +            this.miExportArmyAs.Name = "miExportArmyAs";
   1.291 +            this.miExportArmyAs.Size = new System.Drawing.Size(164, 22);
   1.292 +            this.miExportArmyAs.Text = "export army as...";
   1.293 +            // 
   1.294 +            // miExportArmyAsBasicHTML
   1.295 +            // 
   1.296 +            this.miExportArmyAsBasicHTML.Name = "miExportArmyAsBasicHTML";
   1.297 +            this.miExportArmyAsBasicHTML.Size = new System.Drawing.Size(130, 22);
   1.298 +            this.miExportArmyAsBasicHTML.Text = "&basic html";
   1.299 +            this.miExportArmyAsBasicHTML.Click += new System.EventHandler(this.miExportArmyAsBasicHTML_Click);
   1.300 +            // 
   1.301 +            // miCloseArmy
   1.302 +            // 
   1.303 +            this.miCloseArmy.Enabled = false;
   1.304 +            this.miCloseArmy.Name = "miCloseArmy";
   1.305 +            this.miCloseArmy.Size = new System.Drawing.Size(164, 22);
   1.306 +            this.miCloseArmy.Text = "&close army";
   1.307 +            this.miCloseArmy.Click += new System.EventHandler(this.miCloseArmy_Click);
   1.308 +            // 
   1.309 +            // toolStripSeparator1
   1.310 +            // 
   1.311 +            this.toolStripSeparator1.Name = "toolStripSeparator1";
   1.312 +            this.toolStripSeparator1.Size = new System.Drawing.Size(161, 6);
   1.313 +            // 
   1.314 +            // miReloadFiles
   1.315 +            // 
   1.316 +            this.miReloadFiles.Name = "miReloadFiles";
   1.317 +            this.miReloadFiles.Size = new System.Drawing.Size(164, 22);
   1.318 +            this.miReloadFiles.Text = "&reload files";
   1.319 +            this.miReloadFiles.Click += new System.EventHandler(this.miReloadFiles_Click);
   1.320 +            // 
   1.321 +            // toolStripSeparator2
   1.322 +            // 
   1.323 +            this.toolStripSeparator2.Name = "toolStripSeparator2";
   1.324 +            this.toolStripSeparator2.Size = new System.Drawing.Size(161, 6);
   1.325 +            // 
   1.326 +            // miExit
   1.327 +            // 
   1.328 +            this.miExit.Name = "miExit";
   1.329 +            this.miExit.Size = new System.Drawing.Size(164, 22);
   1.330 +            this.miExit.Text = "e&xit";
   1.331 +            this.miExit.Click += new System.EventHandler(this.miExit_Click);
   1.332 +            // 
   1.333 +            // menuEdit
   1.334 +            // 
   1.335 +            this.menuEdit.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
   1.336              this.miUndo,
   1.337              this.miRedo,
   1.338              this.toolStripSeparator4,
   1.339              this.miPreferences});
   1.340 -			this.menuEdit.Name = "menuEdit";
   1.341 -			this.menuEdit.Size = new System.Drawing.Size(36, 20);
   1.342 -			this.menuEdit.Text = "&edit";
   1.343 -			// 
   1.344 -			// miUndo
   1.345 -			// 
   1.346 -			this.miUndo.Enabled = false;
   1.347 -			this.miUndo.Name = "miUndo";
   1.348 -			this.miUndo.Size = new System.Drawing.Size(152, 22);
   1.349 -			this.miUndo.Text = "&undo";
   1.350 -			this.miUndo.Click += new System.EventHandler(this.miUndo_Click);
   1.351 -			// 
   1.352 -			// miRedo
   1.353 -			// 
   1.354 -			this.miRedo.Enabled = false;
   1.355 -			this.miRedo.Name = "miRedo";
   1.356 -			this.miRedo.Size = new System.Drawing.Size(152, 22);
   1.357 -			this.miRedo.Text = "&redo";
   1.358 -			this.miRedo.Click += new System.EventHandler(this.miRedo_Click);
   1.359 -			// 
   1.360 -			// menuHelp
   1.361 -			// 
   1.362 -			this.menuHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
   1.363 +            this.menuEdit.Name = "menuEdit";
   1.364 +            this.menuEdit.Size = new System.Drawing.Size(36, 20);
   1.365 +            this.menuEdit.Text = "&edit";
   1.366 +            // 
   1.367 +            // miUndo
   1.368 +            // 
   1.369 +            this.miUndo.Enabled = false;
   1.370 +            this.miUndo.Name = "miUndo";
   1.371 +            this.miUndo.Size = new System.Drawing.Size(142, 22);
   1.372 +            this.miUndo.Text = "&undo";
   1.373 +            this.miUndo.Click += new System.EventHandler(this.miUndo_Click);
   1.374 +            // 
   1.375 +            // miRedo
   1.376 +            // 
   1.377 +            this.miRedo.Enabled = false;
   1.378 +            this.miRedo.Name = "miRedo";
   1.379 +            this.miRedo.Size = new System.Drawing.Size(142, 22);
   1.380 +            this.miRedo.Text = "&redo";
   1.381 +            this.miRedo.Click += new System.EventHandler(this.miRedo_Click);
   1.382 +            // 
   1.383 +            // toolStripSeparator4
   1.384 +            // 
   1.385 +            this.toolStripSeparator4.Name = "toolStripSeparator4";
   1.386 +            this.toolStripSeparator4.Size = new System.Drawing.Size(139, 6);
   1.387 +            // 
   1.388 +            // miPreferences
   1.389 +            // 
   1.390 +            this.miPreferences.Name = "miPreferences";
   1.391 +            this.miPreferences.Size = new System.Drawing.Size(142, 22);
   1.392 +            this.miPreferences.Text = "&preferences";
   1.393 +            this.miPreferences.Click += new System.EventHandler(this.miPreferences_Click);
   1.394 +            // 
   1.395 +            // menuHelp
   1.396 +            // 
   1.397 +            this.menuHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
   1.398              this.miAbout});
   1.399 -			this.menuHelp.Name = "menuHelp";
   1.400 -			this.menuHelp.Size = new System.Drawing.Size(39, 20);
   1.401 -			this.menuHelp.Text = "&help";
   1.402 -			// 
   1.403 -			// miAbout
   1.404 -			// 
   1.405 -			this.miAbout.Name = "miAbout";
   1.406 -			this.miAbout.Size = new System.Drawing.Size(109, 22);
   1.407 -			this.miAbout.Text = "&about";
   1.408 -			this.miAbout.Click += new System.EventHandler(this.miAbout_Click);
   1.409 -			// 
   1.410 -			// mainToolStrip
   1.411 -			// 
   1.412 -			this.mainToolStrip.Dock = System.Windows.Forms.DockStyle.None;
   1.413 -			this.mainToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
   1.414 +            this.menuHelp.Name = "menuHelp";
   1.415 +            this.menuHelp.Size = new System.Drawing.Size(39, 20);
   1.416 +            this.menuHelp.Text = "&help";
   1.417 +            // 
   1.418 +            // miAbout
   1.419 +            // 
   1.420 +            this.miAbout.Name = "miAbout";
   1.421 +            this.miAbout.Size = new System.Drawing.Size(109, 22);
   1.422 +            this.miAbout.Text = "&about";
   1.423 +            this.miAbout.Click += new System.EventHandler(this.miAbout_Click);
   1.424 +            // 
   1.425 +            // mainToolStrip
   1.426 +            // 
   1.427 +            this.mainToolStrip.Dock = System.Windows.Forms.DockStyle.None;
   1.428 +            this.mainToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
   1.429              this.bttnNewArmy,
   1.430              this.bttnOpenArmy,
   1.431              this.bttnSaveArmy,
   1.432              this.toolStripSeparator3,
   1.433              this.bttnUndo,
   1.434              this.bttnRedo});
   1.435 -			this.mainToolStrip.Location = new System.Drawing.Point(0, 24);
   1.436 -			this.mainToolStrip.Name = "mainToolStrip";
   1.437 -			this.mainToolStrip.Size = new System.Drawing.Size(151, 25);
   1.438 -			this.mainToolStrip.TabIndex = 8;
   1.439 -			// 
   1.440 -			// bttnNewArmy
   1.441 -			// 
   1.442 -			this.bttnNewArmy.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
   1.443 -			this.bttnNewArmy.Image = global::IBBoard.WarFoundry.GUI.WinForms.Properties.Resources.document_new;
   1.444 -			this.bttnNewArmy.ImageTransparentColor = System.Drawing.Color.Magenta;
   1.445 -			this.bttnNewArmy.Name = "bttnNewArmy";
   1.446 -			this.bttnNewArmy.Size = new System.Drawing.Size(23, 22);
   1.447 -			this.bttnNewArmy.Text = "new army";
   1.448 -			this.bttnNewArmy.Click += new System.EventHandler(this.miNewArmy_Click);
   1.449 -			// 
   1.450 -			// bttnOpenArmy
   1.451 -			// 
   1.452 -			this.bttnOpenArmy.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
   1.453 -			this.bttnOpenArmy.Image = global::IBBoard.WarFoundry.GUI.WinForms.Properties.Resources.document_open;
   1.454 -			this.bttnOpenArmy.ImageTransparentColor = System.Drawing.Color.Magenta;
   1.455 -			this.bttnOpenArmy.Name = "bttnOpenArmy";
   1.456 -			this.bttnOpenArmy.Size = new System.Drawing.Size(23, 22);
   1.457 -			this.bttnOpenArmy.Text = "open army";
   1.458 -			this.bttnOpenArmy.Click += new System.EventHandler(this.miOpenArmy_Click);
   1.459 -			// 
   1.460 -			// bttnSaveArmy
   1.461 -			// 
   1.462 -			this.bttnSaveArmy.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
   1.463 -			this.bttnSaveArmy.Enabled = false;
   1.464 -			this.bttnSaveArmy.Image = global::IBBoard.WarFoundry.GUI.WinForms.Properties.Resources.document_save;
   1.465 -			this.bttnSaveArmy.ImageTransparentColor = System.Drawing.Color.Magenta;
   1.466 -			this.bttnSaveArmy.Name = "bttnSaveArmy";
   1.467 -			this.bttnSaveArmy.Size = new System.Drawing.Size(23, 22);
   1.468 -			this.bttnSaveArmy.Text = "save army";
   1.469 -			this.bttnSaveArmy.Click += new System.EventHandler(this.miSaveArmy_Click);
   1.470 -			// 
   1.471 -			// toolStripSeparator3
   1.472 -			// 
   1.473 -			this.toolStripSeparator3.Name = "toolStripSeparator3";
   1.474 -			this.toolStripSeparator3.Size = new System.Drawing.Size(6, 25);
   1.475 -			// 
   1.476 -			// bttnUndo
   1.477 -			// 
   1.478 -			this.bttnUndo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
   1.479 -			this.bttnUndo.Enabled = false;
   1.480 -			this.bttnUndo.Image = global::IBBoard.WarFoundry.GUI.WinForms.Properties.Resources.edit_undo;
   1.481 -			this.bttnUndo.ImageTransparentColor = System.Drawing.Color.Magenta;
   1.482 -			this.bttnUndo.Name = "bttnUndo";
   1.483 -			this.bttnUndo.Size = new System.Drawing.Size(32, 22);
   1.484 -			this.bttnUndo.Text = "undo";
   1.485 -			this.bttnUndo.ButtonClick += new System.EventHandler(this.miUndo_Click);
   1.486 -			// 
   1.487 -			// bttnRedo
   1.488 -			// 
   1.489 -			this.bttnRedo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
   1.490 -			this.bttnRedo.Enabled = false;
   1.491 -			this.bttnRedo.Image = global::IBBoard.WarFoundry.GUI.WinForms.Properties.Resources.edit_redo;
   1.492 -			this.bttnRedo.ImageTransparentColor = System.Drawing.Color.Magenta;
   1.493 -			this.bttnRedo.Name = "bttnRedo";
   1.494 -			this.bttnRedo.Size = new System.Drawing.Size(32, 22);
   1.495 -			this.bttnRedo.Text = "redo";
   1.496 -			this.bttnRedo.ButtonClick += new System.EventHandler(this.miRedo_Click);
   1.497 -			// 
   1.498 -			// catToolStrip
   1.499 -			// 
   1.500 -			this.catToolStrip.Dock = System.Windows.Forms.DockStyle.None;
   1.501 -			this.catToolStrip.Location = new System.Drawing.Point(161, 24);
   1.502 -			this.catToolStrip.Name = "catToolStrip";
   1.503 -			this.catToolStrip.Size = new System.Drawing.Size(111, 25);
   1.504 -			this.catToolStrip.TabIndex = 9;
   1.505 -			this.catToolStrip.Visible = false;
   1.506 -			// 
   1.507 -			// statusBar
   1.508 -			// 
   1.509 -			this.statusBar.Location = new System.Drawing.Point(0, 586);
   1.510 -			this.statusBar.Name = "statusBar";
   1.511 -			this.statusBar.Panels.AddRange(new System.Windows.Forms.StatusBarPanel[] {
   1.512 +            this.mainToolStrip.Location = new System.Drawing.Point(0, 24);
   1.513 +            this.mainToolStrip.Name = "mainToolStrip";
   1.514 +            this.mainToolStrip.Size = new System.Drawing.Size(182, 25);
   1.515 +            this.mainToolStrip.TabIndex = 8;
   1.516 +            // 
   1.517 +            // bttnNewArmy
   1.518 +            // 
   1.519 +            this.bttnNewArmy.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
   1.520 +            this.bttnNewArmy.Image = global::IBBoard.WarFoundry.GUI.WinForms.Properties.Resources.document_new;
   1.521 +            this.bttnNewArmy.ImageTransparentColor = System.Drawing.Color.Magenta;
   1.522 +            this.bttnNewArmy.Name = "bttnNewArmy";
   1.523 +            this.bttnNewArmy.Size = new System.Drawing.Size(23, 22);
   1.524 +            this.bttnNewArmy.Text = "new army";
   1.525 +            this.bttnNewArmy.Click += new System.EventHandler(this.miNewArmy_Click);
   1.526 +            // 
   1.527 +            // bttnOpenArmy
   1.528 +            // 
   1.529 +            this.bttnOpenArmy.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
   1.530 +            this.bttnOpenArmy.Image = global::IBBoard.WarFoundry.GUI.WinForms.Properties.Resources.document_open;
   1.531 +            this.bttnOpenArmy.ImageTransparentColor = System.Drawing.Color.Magenta;
   1.532 +            this.bttnOpenArmy.Name = "bttnOpenArmy";
   1.533 +            this.bttnOpenArmy.Size = new System.Drawing.Size(23, 22);
   1.534 +            this.bttnOpenArmy.Text = "open army";
   1.535 +            this.bttnOpenArmy.Click += new System.EventHandler(this.miOpenArmy_Click);
   1.536 +            // 
   1.537 +            // bttnSaveArmy
   1.538 +            // 
   1.539 +            this.bttnSaveArmy.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
   1.540 +            this.bttnSaveArmy.Enabled = false;
   1.541 +            this.bttnSaveArmy.Image = global::IBBoard.WarFoundry.GUI.WinForms.Properties.Resources.document_save;
   1.542 +            this.bttnSaveArmy.ImageTransparentColor = System.Drawing.Color.Magenta;
   1.543 +            this.bttnSaveArmy.Name = "bttnSaveArmy";
   1.544 +            this.bttnSaveArmy.Size = new System.Drawing.Size(23, 22);
   1.545 +            this.bttnSaveArmy.Text = "save army";
   1.546 +            this.bttnSaveArmy.Click += new System.EventHandler(this.miSaveArmy_Click);
   1.547 +            // 
   1.548 +            // toolStripSeparator3
   1.549 +            // 
   1.550 +            this.toolStripSeparator3.Name = "toolStripSeparator3";
   1.551 +            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 25);
   1.552 +            // 
   1.553 +            // bttnUndo
   1.554 +            // 
   1.555 +            this.bttnUndo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
   1.556 +            this.bttnUndo.Enabled = false;
   1.557 +            this.bttnUndo.Image = global::IBBoard.WarFoundry.GUI.WinForms.Properties.Resources.edit_undo;
   1.558 +            this.bttnUndo.ImageTransparentColor = System.Drawing.Color.Magenta;
   1.559 +            this.bttnUndo.Name = "bttnUndo";
   1.560 +            this.bttnUndo.Size = new System.Drawing.Size(32, 22);
   1.561 +            this.bttnUndo.Text = "undo";
   1.562 +            this.bttnUndo.ButtonClick += new System.EventHandler(this.miUndo_Click);
   1.563 +            // 
   1.564 +            // bttnRedo
   1.565 +            // 
   1.566 +            this.bttnRedo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
   1.567 +            this.bttnRedo.Enabled = false;
   1.568 +            this.bttnRedo.Image = global::IBBoard.WarFoundry.GUI.WinForms.Properties.Resources.edit_redo;
   1.569 +            this.bttnRedo.ImageTransparentColor = System.Drawing.Color.Magenta;
   1.570 +            this.bttnRedo.Name = "bttnRedo";
   1.571 +            this.bttnRedo.Size = new System.Drawing.Size(32, 22);
   1.572 +            this.bttnRedo.Text = "redo";
   1.573 +            this.bttnRedo.ButtonClick += new System.EventHandler(this.miRedo_Click);
   1.574 +            // 
   1.575 +            // catToolStrip
   1.576 +            // 
   1.577 +            this.catToolStrip.Dock = System.Windows.Forms.DockStyle.None;
   1.578 +            this.catToolStrip.Location = new System.Drawing.Point(161, 24);
   1.579 +            this.catToolStrip.Name = "catToolStrip";
   1.580 +            this.catToolStrip.Size = new System.Drawing.Size(111, 25);
   1.581 +            this.catToolStrip.TabIndex = 9;
   1.582 +            this.catToolStrip.Visible = false;
   1.583 +            // 
   1.584 +            // statusBar
   1.585 +            // 
   1.586 +            this.statusBar.Location = new System.Drawing.Point(0, 586);
   1.587 +            this.statusBar.Name = "statusBar";
   1.588 +            this.statusBar.Panels.AddRange(new System.Windows.Forms.StatusBarPanel[] {
   1.589              this.sbMainPanel,
   1.590              this.sbErrorPanel,
   1.591              this.sbPointsPanel});
   1.592 -			this.statusBar.ShowPanels = true;
   1.593 -			this.statusBar.Size = new System.Drawing.Size(790, 22);
   1.594 -			this.statusBar.TabIndex = 1;
   1.595 -			this.statusBar.PanelClick += new System.Windows.Forms.StatusBarPanelClickEventHandler(this.statusBar_PanelClick);
   1.596 -			this.statusBar.DrawItem += new System.Windows.Forms.StatusBarDrawItemEventHandler(this.statusBar_DrawItem);
   1.597 -			// 
   1.598 -			// sbMainPanel
   1.599 -			// 
   1.600 -			this.sbMainPanel.AutoSize = System.Windows.Forms.StatusBarPanelAutoSize.Spring;
   1.601 -			this.sbMainPanel.Color = System.Drawing.SystemColors.WindowText;
   1.602 -			this.sbMainPanel.Name = "sbMainPanel";
   1.603 -			this.sbMainPanel.Style = System.Windows.Forms.StatusBarPanelStyle.OwnerDraw;
   1.604 -			this.sbMainPanel.Width = 473;
   1.605 -			// 
   1.606 -			// sbErrorPanel
   1.607 -			// 
   1.608 -			this.sbErrorPanel.Color = System.Drawing.SystemColors.WindowText;
   1.609 -			this.sbErrorPanel.Name = "sbErrorPanel";
   1.610 -			this.sbErrorPanel.Style = System.Windows.Forms.StatusBarPanelStyle.OwnerDraw;
   1.611 -			this.sbErrorPanel.Width = 150;
   1.612 -			// 
   1.613 -			// sbPointsPanel
   1.614 -			// 
   1.615 -			this.sbPointsPanel.Color = System.Drawing.SystemColors.WindowText;
   1.616 -			this.sbPointsPanel.Name = "sbPointsPanel";
   1.617 -			this.sbPointsPanel.Style = System.Windows.Forms.StatusBarPanelStyle.OwnerDraw;
   1.618 -			this.sbPointsPanel.ToolTipText = "current points total";
   1.619 -			this.sbPointsPanel.Width = 150;
   1.620 -			// 
   1.621 -			// toolStripPanel
   1.622 -			// 
   1.623 -			this.toolStripPanel.Dock = System.Windows.Forms.DockStyle.Top;
   1.624 -			this.toolStripPanel.Location = new System.Drawing.Point(0, 24);
   1.625 -			this.toolStripPanel.Name = "toolStripPanel";
   1.626 -			this.toolStripPanel.Orientation = System.Windows.Forms.Orientation.Horizontal;
   1.627 -			this.toolStripPanel.RowMargin = new System.Windows.Forms.Padding(3, 0, 0, 0);
   1.628 -			this.toolStripPanel.Size = new System.Drawing.Size(790, 0);
   1.629 -			// 
   1.630 -			// toolStripSeparator4
   1.631 -			// 
   1.632 -			this.toolStripSeparator4.Name = "toolStripSeparator4";
   1.633 -			this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6);
   1.634 -			// 
   1.635 -			// miPreferences
   1.636 -			// 
   1.637 -			this.miPreferences.Name = "miPreferences";
   1.638 -			this.miPreferences.Size = new System.Drawing.Size(152, 22);
   1.639 -			this.miPreferences.Text = "&preferences";
   1.640 -			this.miPreferences.Click += new System.EventHandler(this.miPreferences_Click);
   1.641 -			// 
   1.642 -			// FrmMain
   1.643 -			// 
   1.644 -			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
   1.645 -			this.ClientSize = new System.Drawing.Size(790, 608);
   1.646 -			this.Controls.Add(this.mainToolStrip);
   1.647 -			this.Controls.Add(this.toolStripPanel);
   1.648 -			this.Controls.Add(this.statusBar);
   1.649 -			this.Controls.Add(this.catToolStrip);
   1.650 -			this.Controls.Add(this.menuStrip);
   1.651 -			this.Icon = ((System.Drawing.Icon) (resources.GetObject("$this.Icon")));
   1.652 -			this.IsMdiContainer = true;
   1.653 -			this.MainMenuStrip = this.menuStrip;
   1.654 -			this.Menu = this.mainMenu;
   1.655 -			this.Name = "FrmMain";
   1.656 -			this.Text = "WarFoundry";
   1.657 -			this.Load += new System.EventHandler(this.FrmMain_Load);
   1.658 -			this.menuStrip.ResumeLayout(false);
   1.659 -			this.menuStrip.PerformLayout();
   1.660 -			this.mainToolStrip.ResumeLayout(false);
   1.661 -			this.mainToolStrip.PerformLayout();
   1.662 -			((System.ComponentModel.ISupportInitialize) (this.sbMainPanel)).EndInit();
   1.663 -			((System.ComponentModel.ISupportInitialize) (this.sbErrorPanel)).EndInit();
   1.664 -			((System.ComponentModel.ISupportInitialize) (this.sbPointsPanel)).EndInit();
   1.665 -			this.ResumeLayout(false);
   1.666 -			this.PerformLayout();
   1.667 +            this.statusBar.ShowPanels = true;
   1.668 +            this.statusBar.Size = new System.Drawing.Size(790, 22);
   1.669 +            this.statusBar.TabIndex = 1;
   1.670 +            this.statusBar.PanelClick += new System.Windows.Forms.StatusBarPanelClickEventHandler(this.statusBar_PanelClick);
   1.671 +            this.statusBar.DrawItem += new System.Windows.Forms.StatusBarDrawItemEventHandler(this.statusBar_DrawItem);
   1.672 +            // 
   1.673 +            // sbMainPanel
   1.674 +            // 
   1.675 +            this.sbMainPanel.AutoSize = System.Windows.Forms.StatusBarPanelAutoSize.Spring;
   1.676 +            this.sbMainPanel.Color = System.Drawing.SystemColors.WindowText;
   1.677 +            this.sbMainPanel.Name = "sbMainPanel";
   1.678 +            this.sbMainPanel.Style = System.Windows.Forms.StatusBarPanelStyle.OwnerDraw;
   1.679 +            this.sbMainPanel.Width = 473;
   1.680 +            // 
   1.681 +            // sbErrorPanel
   1.682 +            // 
   1.683 +            this.sbErrorPanel.Color = System.Drawing.SystemColors.WindowText;
   1.684 +            this.sbErrorPanel.Name = "sbErrorPanel";
   1.685 +            this.sbErrorPanel.Style = System.Windows.Forms.StatusBarPanelStyle.OwnerDraw;
   1.686 +            this.sbErrorPanel.Width = 150;
   1.687 +            // 
   1.688 +            // sbPointsPanel
   1.689 +            // 
   1.690 +            this.sbPointsPanel.Color = System.Drawing.SystemColors.WindowText;
   1.691 +            this.sbPointsPanel.Name = "sbPointsPanel";
   1.692 +            this.sbPointsPanel.Style = System.Windows.Forms.StatusBarPanelStyle.OwnerDraw;
   1.693 +            this.sbPointsPanel.ToolTipText = "current points total";
   1.694 +            this.sbPointsPanel.Width = 150;
   1.695 +            // 
   1.696 +            // toolStripPanel
   1.697 +            // 
   1.698 +            this.toolStripPanel.Dock = System.Windows.Forms.DockStyle.Top;
   1.699 +            this.toolStripPanel.Location = new System.Drawing.Point(0, 24);
   1.700 +            this.toolStripPanel.Name = "toolStripPanel";
   1.701 +            this.toolStripPanel.Orientation = System.Windows.Forms.Orientation.Horizontal;
   1.702 +            this.toolStripPanel.RowMargin = new System.Windows.Forms.Padding(3, 0, 0, 0);
   1.703 +            this.toolStripPanel.Size = new System.Drawing.Size(790, 0);
   1.704 +            // 
   1.705 +            // FrmMain
   1.706 +            // 
   1.707 +            this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
   1.708 +            this.ClientSize = new System.Drawing.Size(790, 608);
   1.709 +            this.Controls.Add(this.mainToolStrip);
   1.710 +            this.Controls.Add(this.toolStripPanel);
   1.711 +            this.Controls.Add(this.statusBar);
   1.712 +            this.Controls.Add(this.catToolStrip);
   1.713 +            this.Controls.Add(this.menuStrip);
   1.714 +            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
   1.715 +            this.IsMdiContainer = true;
   1.716 +            this.MainMenuStrip = this.menuStrip;
   1.717 +            this.Menu = this.mainMenu;
   1.718 +            this.Name = "FrmMain";
   1.719 +            this.Text = "WarFoundry";
   1.720 +            this.Load += new System.EventHandler(this.FrmMain_Load);
   1.721 +            this.menuStrip.ResumeLayout(false);
   1.722 +            this.menuStrip.PerformLayout();
   1.723 +            this.mainToolStrip.ResumeLayout(false);
   1.724 +            this.mainToolStrip.PerformLayout();
   1.725 +            ((System.ComponentModel.ISupportInitialize)(this.sbMainPanel)).EndInit();
   1.726 +            ((System.ComponentModel.ISupportInitialize)(this.sbErrorPanel)).EndInit();
   1.727 +            ((System.ComponentModel.ISupportInitialize)(this.sbPointsPanel)).EndInit();
   1.728 +            this.ResumeLayout(false);
   1.729 +            this.PerformLayout();
   1.730  
   1.731  		}
   1.732  		#endregion
   1.733 @@ -900,6 +894,7 @@
   1.734  			loadedFilePath = null;
   1.735  			miSaveArmy.Enabled = false;
   1.736  			bttnSaveArmy.Enabled = false;
   1.737 +            //TODO: Subscribe to an "army changed" event here
   1.738  			SetPointsPanelText();
   1.739  			SetAppTitle();
   1.740  		}
   1.741 @@ -1221,19 +1216,30 @@
   1.742  
   1.743  		private void FrmMain_UnitAddedMethod(object unitObj)
   1.744  		{
   1.745 +            ValidateArmy();
   1.746 +		}
   1.747 +
   1.748 +        private void ValidateArmy()
   1.749 +        {
   1.750 +            if (Validates.AsOkay(RequirementHandler.ValidateArmy(CurrentArmy)))
   1.751 +            {
   1.752 +                sbErrorPanel.Text = "";
   1.753 +                sbErrorPanel.Tag = "";
   1.754 +            }
   1.755 +            else
   1.756 +            {
   1.757 +                sbErrorPanel.Text = "Validation errors exist";
   1.758 +                sbErrorPanel.Tag = "One or more army requirements have not been met";
   1.759 +            }
   1.760 +        }
   1.761 +
   1.762 +		private void FrmMain_UnitRemovedMethod(object unitObj)
   1.763 +		{
   1.764 +            ValidateArmy();
   1.765 +
   1.766  			if (unitObj is Unit)
   1.767  			{
   1.768  				Unit unit = (Unit)unitObj;
   1.769 -				sbErrorPanel.Text = "";
   1.770 -			}
   1.771 -		}
   1.772 -
   1.773 -		private void FrmMain_UnitRemovedMethod(object unitObj)
   1.774 -		{
   1.775 -			if (unitObj is Unit)
   1.776 -			{
   1.777 -				Unit unit = (Unit)unitObj;
   1.778 -				sbErrorPanel.Text = "";
   1.779  
   1.780  				//check if window is open, and close it if it is
   1.781  				foreach (Form frm in this.MdiChildren)
   1.782 @@ -1250,27 +1256,6 @@
   1.783  			}
   1.784  		}
   1.785  
   1.786 -		/*private void FrmMain_FailedUnitRequirement(FailedUnitRequirement failedRequirement)
   1.787 -		{
   1.788 -			sbErrorPanel.Text = Translation.GetTranslation("UnitRequirementFailed", "Unit Requirement Failed");
   1.789 -			sbErrorPanel.Tag = failedRequirement.Description;
   1.790 -		}*/
   1.791 -
   1.792 -		/*public void MdiChildMoved()
   1.793 -		{
   1.794 -			Point mouseAt = PointToClient(ActiveMdiChild.Location);
   1.795 -
   1.796 -			if (Comparisons.ValueWithinAmount(pnlRight.Right, ActiveMdiChild.Right, 10))
   1.797 -			{
   1.798 -				pnlRight.Visible = true;
   1.799 -				//pnlRight.Container.Add(ActiveMdiChild);
   1.800 -			}
   1.801 -			else
   1.802 -			{
   1.803 -				pnlRight.Visible = false;
   1.804 -			}
   1.805 -		}*/
   1.806 -
   1.807  		private void miUndo_Click(object sender, System.EventArgs e)
   1.808  		{
   1.809  			UndoLastAction();
   1.810 @@ -1380,13 +1365,6 @@
   1.811  		{
   1.812  			WarFoundryLoader.GetDefault().LoadFiles();
   1.813  			sbMainPanel.Text = Translation.GetTranslation("GameSystemFilesReloaded", "Game system and race files reloaded");
   1.814 -			statusBarTimer.Enabled = true;
   1.815 -		}
   1.816 -
   1.817 -		private void statusBarTimer_Tick(object sender, System.EventArgs e)
   1.818 -		{
   1.819 -			sbMainPanel.Text = "";
   1.820 -			statusBarTimer.Enabled = false;
   1.821  		}
   1.822  
   1.823  		private void statusBar_PanelClick(object sender, StatusBarPanelClickEventArgs e)
     2.1 --- a/FrmMain.resx	Sun May 01 10:51:30 2011 +0000
     2.2 +++ b/FrmMain.resx	Sun May 01 11:05:29 2011 +0000
     2.3 @@ -132,9 +132,6 @@
     2.4    <metadata name="saveArmyDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     2.5      <value>573, 17</value>
     2.6    </metadata>
     2.7 -  <metadata name="statusBarTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     2.8 -    <value>707, 17</value>
     2.9 -  </metadata>
    2.10    <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    2.11      <value>835, 17</value>
    2.12    </metadata>