Timestamp:

03/09/10 16:05:06 (6 months ago)

Author:

ibboard

Message:

Fixes #258: New toolbar and menu bar need translations

• Update FrmMain to use new toolstrip buttons
• Update English translations to include a default "undo" and "redo" translation

Location:

IBBoard.WarFoundry.GUI.WinForms/trunk

Files:

• FrmMain.cs (modified) (10 diffs)
• translations/en.translation (modified) (1 diff)

@@ -83 +83 @@
         private IBBToolStripMenuItem menuHelp;
         private ToolStrip mainToolStrip;
-        private ToolStripButton bttnNewArmy;
-        private ToolStripButton bttnOpenArmy;
-        private ToolStripButton bttnSaveArmy;
+        private IBBToolStripButton bttnNewArmy;
+        private IBBToolStripButton bttnOpenArmy;
+        private IBBToolStripButton bttnSaveArmy;
         private ToolStripSeparator toolStripSeparator3;
-        private ToolStripSplitButton bttnUndo;
-        private ToolStripSplitButton bttnRedo;
+        private IBBToolStripSplitButton bttnUndo;
+        private IBBToolStripSplitButton bttnRedo;
         private ToolStrip catToolStrip;
         private ToolStripPanel toolStripPanel;
@@ -240 +240 @@
             this.miAbout = new IBBoard.Windows.Forms.IBBToolStripMenuItem();
             this.mainToolStrip = new System.Windows.Forms.ToolStrip();
-            this.bttnNewArmy = new System.Windows.Forms.ToolStripButton();
-            this.bttnOpenArmy = new System.Windows.Forms.ToolStripButton();
-            this.bttnSaveArmy = new System.Windows.Forms.ToolStripButton();
+            this.bttnNewArmy = new IBBoard.Windows.Forms.IBBToolStripButton();
+            this.bttnOpenArmy = new IBBoard.Windows.Forms.IBBToolStripButton();
+            this.bttnSaveArmy = new IBBoard.Windows.Forms.IBBToolStripButton();
             this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
-            this.bttnUndo = new System.Windows.Forms.ToolStripSplitButton();
-            this.bttnRedo = new System.Windows.Forms.ToolStripSplitButton();
+            this.bttnUndo = new IBBoard.Windows.Forms.IBBToolStripSplitButton();
+            this.bttnRedo = new IBBoard.Windows.Forms.IBBToolStripSplitButton();
             this.catToolStrip = new System.Windows.Forms.ToolStrip();
             this.statusBar = new IBBoard.Windows.Forms.ColorableStatusBar();
@@ -254 +254 @@
             this.menuStrip.SuspendLayout();
             this.mainToolStrip.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.sbMainPanel)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.sbErrorPanel)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.sbPointsPanel)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize) (this.sbMainPanel)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize) (this.sbErrorPanel)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize) (this.sbPointsPanel)).BeginInit();
             this.SuspendLayout();
             // 
@@ -552 +552 @@
             this.Controls.Add(this.catToolStrip);
             this.Controls.Add(this.menuStrip);
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Icon = ((System.Drawing.Icon) (resources.GetObject("$this.Icon")));
             this.IsMdiContainer = true;
             this.MainMenuStrip = this.menuStrip;
@@ -563 +563 @@
             this.mainToolStrip.ResumeLayout(false);
             this.mainToolStrip.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.sbMainPanel)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.sbErrorPanel)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.sbPointsPanel)).EndInit();
+            ((System.ComponentModel.ISupportInitialize) (this.sbMainPanel)).EndInit();
+            ((System.ComponentModel.ISupportInitialize) (this.sbErrorPanel)).EndInit();
+            ((System.ComponentModel.ISupportInitialize) (this.sbPointsPanel)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
@@ -948 +948 @@
             int catCount = cats.Length;
             Category cat;
-            ToolStripButton[] categoryButtons = new ToolStripButton[catCount];
+            IBBToolStripButton[] categoryButtons = new IBBToolStripButton[catCount];
 
             for (int i = 0; i < catCount; i++)
             {
                 cat = cats[i];
-                ToolStripButton button = new ToolStripButton();
+                IBBToolStripButton button = new IBBToolStripButton();
                 button.Text = cat.Name;
                 button.Tag = cat;
@@ -962 +962 @@
             }
 
-            this.Invoke(new ArrayMethodInvoker<ToolStripButton>(catToolStrip.Items.AddRange), new object[]{ categoryButtons });
+            this.Invoke(new ArrayMethodInvoker<IBBToolStripButton>(catToolStrip.Items.AddRange), new object[]{ categoryButtons });
         }
 
         private void CreateUnitForCategoryButtonClick(object sender, EventArgs e)
         {
-            if (sender is ToolStripButton)
-            {
-                ToolStripButton button = (ToolStripButton)sender;
+            if (sender is IBBToolStripButton)
+            {
+                IBBToolStripButton button = (IBBToolStripButton)sender;
                 object tag = button.Tag;
 
@@ -993 +993 @@
         private void SetCategoryButtonState(bool state)
         {
-            foreach (ToolStripButton button in catToolStrip.Items)
+            foreach (IBBToolStripButton button in catToolStrip.Items)
             {
                 button.Enabled = state;
@@ -1036 +1036 @@
                 dropDownItems.Add(cmd.Description, null, redoMenu_Click);
             }
+
+            if (redoLength > 0)
+            {
+                bttnRedo.Text = commandStack.PeekRedoCommand(1).Description;
+            }
+            else
+            {
+                bttnRedo.Text = Translation.GetTranslation("bttnRedo");
+            }
         }
 
@@ -1055 +1064 @@
 
                 dropDownItems.Add(cmd.UndoDescription, null, undoMenu_Click);
+            }
+
+            if (undoLength > 0)
+            {
+                bttnUndo.Text = commandStack.PeekUndoCommand(1).UndoDescription;
+            }
+            else
+            {
+                bttnUndo.Text = Translation.GetTranslation("bttnUndo");
             }
         }

@@ -21 +21 @@
     <translation id="bttnOpenArmy">Open army</translation>
     <translation id="bttnSaveArmy">Save army</translation>
+    <translation id="bttnUndo">Undo</translation>
+    <translation id="bttnRedo">Redo</translation>
     <translation id="ArmyTree">Army Tree</translation>
     <translation id="miDeleteUnit">&amp;Delete unit</translation>