svn commit: r15180 - trunk/src/argouml-app/src/org/argouml: i18n ui/cmd

Author: mvw
Date: 2008-07-06 10:24:10-0700
New Revision: 15180

Modified:
   trunk/src/argouml-app/src/org/argouml/i18n/menu.properties
   trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionAdjustGrid.java
   trunk/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java

Log:
Fix for issue 5195: Menu item with no label in "View" menu (Page Breaks), and Grid settings menu-items not i18n'ed correctly.

Modified: trunk/src/argouml-app/src/org/argouml/i18n/menu.properties
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/i18n/menu.properties?view=diff&rev=15180&p1=trunk/src/argouml-app/src/org/argouml/i18n/menu.properties&p2=trunk/src/argouml-app/src/org/argouml/i18n/menu.properties&r1=15179&r2=15180
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/i18n/menu.properties	(original)
+++ trunk/src/argouml-app/src/org/argouml/i18n/menu.properties	2008-07-06 10:24:10-0700
@@ -129,6 +129,9 @@
 menu.item.snap-32 = Snap 32
 menu.item.snap-32.mnemonic = 3
 
+menu.adjust-pagebreaks = Adjust PageBreaks
+menu.adjust-pagebreaks.mnemonic = P
+
 menu.toolbars = Toolbars
 menu.toolbars.mnemonic = T
 

Modified: trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionAdjustGrid.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionAdjustGrid.java?view=diff&rev=15180&p1=trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionAdjustGrid.java&p2=trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionAdjustGrid.java&r1=15179&r2=15180
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionAdjustGrid.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/ui/cmd/ActionAdjustGrid.java	2008-07-06 10:24:10-0700
@@ -146,18 +146,27 @@
                 : "menu.item.lines-16", 16, true, true, "01", KeyEvent.VK_1));
         result.add(buildGridAction(longStrings ? "action.adjust-grid.lines-8"
                 : "menu.item.lines-8", 8, true, true, "02", KeyEvent.VK_2));
-        result.add(buildGridAction(longStrings ? "action.adjust-grid.lines-16"
-                : "menu.item.lines-16", 16, false, true, "03", KeyEvent.VK_3));
-        result.add(buildGridAction(longStrings ? "action.adjust-grid.lines-32"
-                : "menu.item.lines-32", 32, false, true, "04", KeyEvent.VK_4));
+        result.add(buildGridAction(longStrings ? "action.adjust-grid.dots-16"
+                : "menu.item.dots-16", 16, false, true, "03", KeyEvent.VK_3));
+        result.add(buildGridAction(longStrings ? "action.adjust-grid.dots-32"
+                : "menu.item.dots-32", 32, false, true, "04", KeyEvent.VK_4));
         result.add(buildGridAction(
-                longStrings ? "action.adjust-grid.lines-none"
-                        : "menu.item.lines-none", 16, false, false, "05",
+                longStrings ? "action.adjust-grid.none"
+                        : "menu.item.none", 16, false, false, "05",
                 KeyEvent.VK_5));
      
         return result;
     }
 
+    /**
+     * @param property the name (not yet localised)
+     * @param spacing the spacing distance
+     * @param paintLines show lines
+     * @param paintDots show dots
+     * @param id identifier
+     * @param key keyCode
+     * @return the Action
+     */
     public static Action buildGridAction(final String property,
             final int spacing, final boolean paintLines,
             final boolean paintDots, final String id, final int key) {

Modified: trunk/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java?view=diff&rev=15180&p1=trunk/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java&p2=trunk/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java&r1=15179&r2=15180
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java	2008-07-06 10:24:10-0700
@@ -28,7 +28,6 @@
 import java.awt.event.KeyEvent;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 
 import javax.swing.Action;
@@ -509,12 +508,11 @@
         
         JMenu grid = (JMenu) view.add(new JMenu(menuLocalize("Adjust Grid")));
         setMnemonic(grid, "Grid");
-        List gridActions = ActionAdjustGrid.createAdjustGridActions(false);
+        List<Action> gridActions = 
+            ActionAdjustGrid.createAdjustGridActions(false);
         ButtonGroup groupGrid = new ButtonGroup();
         ActionAdjustGrid.setGroup(groupGrid);
-        Iterator i = gridActions.iterator();
-        while (i.hasNext()) {
-            Action cmdAG = (Action) i.next();
+        for ( Action cmdAG : gridActions) {
             JRadioButtonMenuItem mi = new JRadioButtonMenuItem(cmdAG);
             groupGrid.add(mi);
             JMenuItem adjustGrid = grid.add(mi);
@@ -525,12 +523,10 @@
 
         JMenu snap = (JMenu) view.add(new JMenu(menuLocalize("Adjust Snap")));
         setMnemonic(snap, "Snap");
-        List snapActions = ActionAdjustSnap.createAdjustSnapActions();
+        List<Action> snapActions = ActionAdjustSnap.createAdjustSnapActions();
         ButtonGroup groupSnap = new ButtonGroup();
         ActionAdjustSnap.setGroup(groupSnap);
-        i = snapActions.iterator();
-        while (i.hasNext()) {
-            Action cmdAS = (Action) i.next();
+        for ( Action cmdAS : snapActions) {
             JRadioButtonMenuItem mi = new JRadioButtonMenuItem(cmdAS);
             groupSnap.add(mi);
             JMenuItem adjustSnap = snap.add(mi);
@@ -539,7 +535,10 @@
                     ShortcutMgr.ACTION_ADJUST_GUIDE + cmdAS.getValue("ID"));
         }
 
-        JMenuItem adjustPageBreaks = view.add(new AdjustPageBreaksAction());
+        Action pba  = new AdjustPageBreaksAction();
+        JMenuItem adjustPageBreaks = view.add(pba);
+        pba.putValue(Action.NAME, 
+                Translator.localize("menu.adjust-pagebreaks"));
         setMnemonic(adjustPageBreaks, "Adjust Pagebreaks");
         ShortcutMgr.assignAccelerator(adjustPageBreaks,
                 ShortcutMgr.ACTION_ADJUST_PAGE_BREAKS);