--- a/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmMainWindow.cs	Tue Dec 28 19:58:00 2010 +0000
+++ b/gtk-gui/IBBoard.WarFoundry.GUI.GTK.FrmMainWindow.cs	Tue Dec 28 20:20:16 2010 +0000
@@ -11,7 +11,7 @@
 		private global::Gtk.Action miSaveArmy;
 		private global::Gtk.Action miSaveArmyAs;
 		private global::Gtk.Action miCloseArmy;
-		private global::Gtk.Action refreshAction;
+		private global::Gtk.Action miReloadFiles;
 		private global::Gtk.Action miExit;
 		private global::Gtk.Action menuEdit;
 		private global::Gtk.Action miUndo;
@@ -19,11 +19,11 @@
 		private global::Gtk.Action menuHelp;
 		private global::Gtk.Action miAbout;
 		private global::Gtk.Action miDebugInformation;
-		private global::Gtk.Action newArmyButton;
-		private global::Gtk.Action openArmyButton;
-		private global::Gtk.Action saveArmyButton;
-		private global::Gtk.Action undoActionButton;
-		private global::Gtk.Action redoActionButton;
+		private global::Gtk.Action bttnNewArmy;
+		private global::Gtk.Action bttnOpenArmy;
+		private global::Gtk.Action bttnSaveArmy;
+		private global::Gtk.Action bttnUndo;
+		private global::Gtk.Action bttnRedo;
 		private global::Gtk.Action goDown;
 		private global::Gtk.Action add;
 		private global::Gtk.Action miExportArmyAs;
@@ -63,9 +63,9 @@
 			this.miCloseArmy.Sensitive = false;
 			this.miCloseArmy.ShortLabel = global::Mono.Unix.Catalog.GetString("Close army");
 			w1.Add(this.miCloseArmy, null);
-			this.refreshAction = new global::Gtk.Action("refreshAction", global::Mono.Unix.Catalog.GetString("Reload files"), null, "gtk-refresh");
-			this.refreshAction.ShortLabel = global::Mono.Unix.Catalog.GetString("Reload files");
-			w1.Add(this.refreshAction, null);
+			this.miReloadFiles = new global::Gtk.Action("miReloadFiles", global::Mono.Unix.Catalog.GetString("Reload files"), null, "gtk-refresh");
+			this.miReloadFiles.ShortLabel = global::Mono.Unix.Catalog.GetString("Reload files");
+			w1.Add(this.miReloadFiles, null);
 			this.miExit = new global::Gtk.Action("miExit", global::Mono.Unix.Catalog.GetString("Exit"), null, "gtk-quit");
 			this.miExit.ShortLabel = global::Mono.Unix.Catalog.GetString("Exit");
 			w1.Add(this.miExit, null);
@@ -89,19 +89,19 @@
 			this.miDebugInformation = new global::Gtk.Action("miDebugInformation", global::Mono.Unix.Catalog.GetString("Debug Information"), null, null);
 			this.miDebugInformation.ShortLabel = global::Mono.Unix.Catalog.GetString("Debug Information");
 			w1.Add(this.miDebugInformation, null);
-			this.newArmyButton = new global::Gtk.Action("newArmyButton", null, null, "gtk-new");
-			w1.Add(this.newArmyButton, null);
-			this.openArmyButton = new global::Gtk.Action("openArmyButton", null, null, "gtk-open");
-			w1.Add(this.openArmyButton, null);
-			this.saveArmyButton = new global::Gtk.Action("saveArmyButton", null, null, "gtk-save");
-			this.saveArmyButton.Sensitive = false;
-			w1.Add(this.saveArmyButton, null);
-			this.undoActionButton = new global::Gtk.Action("undoActionButton", null, null, "gtk-undo");
-			this.undoActionButton.Sensitive = false;
-			w1.Add(this.undoActionButton, null);
-			this.redoActionButton = new global::Gtk.Action("redoActionButton", null, null, "gtk-redo");
-			this.redoActionButton.Sensitive = false;
-			w1.Add(this.redoActionButton, null);
+			this.bttnNewArmy = new global::Gtk.Action("bttnNewArmy", null, null, "gtk-new");
+			w1.Add(this.bttnNewArmy, null);
+			this.bttnOpenArmy = new global::Gtk.Action("bttnOpenArmy", null, null, "gtk-open");
+			w1.Add(this.bttnOpenArmy, null);
+			this.bttnSaveArmy = new global::Gtk.Action("bttnSaveArmy", null, null, "gtk-save");
+			this.bttnSaveArmy.Sensitive = false;
+			w1.Add(this.bttnSaveArmy, null);
+			this.bttnUndo = new global::Gtk.Action("bttnUndo", null, null, "gtk-undo");
+			this.bttnUndo.Sensitive = false;
+			w1.Add(this.bttnUndo, null);
+			this.bttnRedo = new global::Gtk.Action("bttnRedo", null, null, "gtk-redo");
+			this.bttnRedo.Sensitive = false;
+			w1.Add(this.bttnRedo, null);
 			this.goDown = new global::Gtk.Action("goDown", null, null, null);
 			w1.Add(this.goDown, null);
 			this.add = new global::Gtk.Action("add", null, null, "gtk-add");
@@ -122,7 +122,7 @@
 			this.vbox1 = new global::Gtk.VBox();
 			this.vbox1.Name = "vbox1";
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.UIManager.AddUiFromString("<ui><menubar name='menubar1'><menu name='menuFile' action='menuFile'><menuitem name='miNewArmy' action='miNewArmy'/><menuitem name='miOpenArmy' action='miOpenArmy'/><menuitem name='miSaveArmy' action='miSaveArmy'/><menuitem name='miSaveArmyAs' action='miSaveArmyAs'/><menu name='miExportArmyAs' action='miExportArmyAs'><menuitem name='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>");
+			this.UIManager.AddUiFromString("<ui><menubar name='menubar1'><menu name='menuFile' action='menuFile'><menuitem name='miNewArmy' action='miNewArmy'/><menuitem name='miOpenArmy' action='miOpenArmy'/><menuitem name='miSaveArmy' action='miSaveArmy'/><menuitem name='miSaveArmyAs' action='miSaveArmyAs'/><menu name='miExportArmyAs' action='miExportArmyAs'><menuitem name='miExportAsBasicHtml' action='miExportAsBasicHtml'/></menu><menuitem name='miCloseArmy' action='miCloseArmy'/><separator/><menuitem name='miReloadFiles' action='miReloadFiles'/><separator/><menuitem name='miExit' action='miExit'/></menu><menu name='menuEdit' action='menuEdit'><menuitem name='miUndo' action='miUndo'/><menuitem name='miRedo' action='miRedo'/></menu><menu name='menuHelp' action='menuHelp'><menuitem name='miAbout' action='miAbout'/></menu></menubar></ui>");
 			this.menubar1 = ((global::Gtk.MenuBar)(this.UIManager.GetWidget("/menubar1")));
 			this.menubar1.Name = "menubar1";
 			this.vbox1.Add(this.menubar1);
@@ -131,7 +131,7 @@
 			w2.Expand = false;
 			w2.Fill = false;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.UIManager.AddUiFromString("<ui><toolbar name='toolbar'><toolitem name='newArmyButton' action='newArmyButton'/><toolitem name='openArmyButton' action='openArmyButton'/><toolitem name='saveArmyButton' action='saveArmyButton'/><separator/><toolitem name='undoActionButton' action='undoActionButton'/><toolitem name='redoActionButton' action='redoActionButton'/><separator/></toolbar></ui>");
+			this.UIManager.AddUiFromString("<ui><toolbar name='toolbar'><toolitem name='bttnNewArmy' action='bttnNewArmy'/><toolitem name='bttnOpenArmy' action='bttnOpenArmy'/><toolitem name='bttnSaveArmy' action='bttnSaveArmy'/><separator/><toolitem name='bttnUndo' action='bttnUndo'/><toolitem name='bttnRedo' action='bttnRedo'/><separator/></toolbar></ui>");
 			this.toolbar = ((global::Gtk.Toolbar)(this.UIManager.GetWidget("/toolbar")));
 			this.toolbar.HeightRequest = 36;
 			this.toolbar.Name = "toolbar";
@@ -188,14 +188,14 @@
 			this.miSaveArmy.Activated += new global::System.EventHandler(this.OnSaveArmyActivated);
 			this.miSaveArmyAs.Activated += new global::System.EventHandler(this.OnSaveArmyAsActivated);
 			this.miCloseArmy.Activated += new global::System.EventHandler(this.OnCloseArmyActivated);
-			this.refreshAction.Activated += new global::System.EventHandler(this.OnReloadFilesActivated);
+			this.miReloadFiles.Activated += new global::System.EventHandler(this.OnReloadFilesActivated);
 			this.miExit.Activated += new global::System.EventHandler(this.OnExitActivated);
 			this.miAbout.Activated += new global::System.EventHandler(this.HelpAboutActivated);
-			this.newArmyButton.Activated += new global::System.EventHandler(this.newTBButtonActivated);
-			this.openArmyButton.Activated += new global::System.EventHandler(this.openTBButtonActivated);
-			this.saveArmyButton.Activated += new global::System.EventHandler(this.saveTBButtonActivated);
-			this.undoActionButton.Activated += new global::System.EventHandler(this.undoTBButtonActivated);
-			this.redoActionButton.Activated += new global::System.EventHandler(this.redoTBButtonActivated);
+			this.bttnNewArmy.Activated += new global::System.EventHandler(this.newTBButtonActivated);
+			this.bttnOpenArmy.Activated += new global::System.EventHandler(this.openTBButtonActivated);
+			this.bttnSaveArmy.Activated += new global::System.EventHandler(this.saveTBButtonActivated);
+			this.bttnUndo.Activated += new global::System.EventHandler(this.undoTBButtonActivated);
+			this.bttnRedo.Activated += new global::System.EventHandler(this.redoTBButtonActivated);
 			this.miExportAsBasicHtml.Activated += new global::System.EventHandler(this.OnMiExportAsBasicHtmlActivated);
 			this.treeUnits.RowActivated += new global::Gtk.RowActivatedHandler(this.ArmyRowActivated);
 			this.treeUnits.PopupMenu += new global::Gtk.PopupMenuHandler(this.OnTreeUnitsPopupMenu);