Changeset 4139 in josm

Timestamp:

18.06.2011 15:26:52 (11 months ago)

Author:

stoecker

Message:

fix #6474 - fix toolbar action entries for some actions and fix fullscreen mode start

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/FullscreenToggleAction.java (modified) (2 diffs)
• actions/HelpAction.java (modified) (1 diff)
• actions/HistoryInfoAction.java (modified) (2 diffs)
• actions/InfoAction.java (modified) (2 diffs)
• actions/JosmAction.java (modified) (1 diff)
• actions/JumpToAction.java (modified) (1 diff)
• actions/MergeLayerAction.java (modified) (1 diff)
• actions/MoveAction.java (modified) (1 diff)
• actions/OrthogonalizeAction.java (modified) (1 diff)
• actions/ShowStatusReportAction.java (modified) (1 diff)
• actions/WireframeToggleAction.java (modified) (1 diff)
• gui/MainApplication.java (modified) (1 diff)
• gui/MainMenu.java (modified) (2 diffs)
• gui/preferences/ToolbarPreferences.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java

@@ -37 +37 @@
                 tr("Toggle fullscreen view"),
                 Shortcut.registerShortcut("menu:view:fullscreen", tr("Toggle fullscreen view"),KeyEvent.VK_F11, Shortcut.GROUP_DIRECT),
-                true /* register shortcut */
+                false /* register */
         );
         putValue("help", ht("/Action/FullscreenView"));
+        putValue("toolbar", "fullscreen");
+        Main.toolbar.register(this);
         gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
         selected = Main.pref.getBoolean("draw.fullscreen", false);
@@ -77 +79 @@
         Main.pref.put("draw.fullscreen", selected);
         notifySelectedState();
+        setMode();
+    }
 
+    public void initial() {
+        if(selected)
+            setMode();
+    }
+
+    protected void setMode() {
         Frame frame = (Frame) Main.parent;
 

trunk/src/org/openstreetmap/josm/actions/HelpAction.java

@@ -24 +24 @@
     public HelpAction() {
         super(tr("Help"), ImageProvider.get("help"));
+        putValue("toolbar", "help");
     }
 

trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java

@@ -6 +6 @@
 import java.awt.event.KeyEvent;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -17 +18 @@
                 tr("Display history information about OSM ways, nodes, or relations."),
                 Shortcut.registerShortcut("core:history",
-                        tr("Object history"), KeyEvent.VK_H, Shortcut.GROUP_HOTKEY), true);
+                        tr("Object history"), KeyEvent.VK_H, Shortcut.GROUP_HOTKEY), false);
         putValue("help", ht("/Action/ObjectHistory"));
+        putValue("toolbar", "action/historyinfo");
+        Main.toolbar.register(this);
     }
 

trunk/src/org/openstreetmap/josm/actions/InfoAction.java

@@ -7 +7 @@
 import java.awt.event.KeyEvent;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -17 +18 @@
                 tr("Display object information about OSM nodes, ways, or relations."),
                 Shortcut.registerShortcut("core:information",
-                        tr("Info about Element"), KeyEvent.VK_I, Shortcut.GROUP_HOTKEY), true);
+                        tr("Info about Element"), KeyEvent.VK_I, Shortcut.GROUP_HOTKEY), false);
         putValue("help", ht("/Action/InfoAboutElements"));
+        putValue("toolbar", "action/info");
+        Main.toolbar.register(this);
     }
 

trunk/src/org/openstreetmap/josm/actions/JosmAction.java

@@ -86 +86 @@
         }
         putValue(SHORT_DESCRIPTION, Main.platform.makeTooltip(tooltip, sc));
-        putValue("toolbar", iconName);
+        if (getValue("toolbar") == null) {
+            putValue("toolbar", iconName);
+        }
         if (register) {
             Main.toolbar.register(this);

trunk/src/org/openstreetmap/josm/actions/JumpToAction.java

@@ -30 +30 @@
     public JumpToAction() {
         super(tr("Jump To Position"), null, tr("Opens a dialog that allows to jump to a specific location"), Shortcut.registerShortcut("tools:jumpto", tr("Tool: {0}", tr("Jump To Position")),
-        KeyEvent.VK_G, Shortcut.GROUP_HOTKEY), true);
+        KeyEvent.VK_G, Shortcut.GROUP_HOTKEY), false);
+        putValue("toolbar", "action/jumpto");
+        Main.toolbar.register(this);
     }
 

trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java

@@ -19 +19 @@
         super(tr("Merge layer"), "dialogs/mergedown", tr("Merge the current layer into another layer"), Shortcut
                 .registerShortcut("system:merge", tr("Edit: {0}", tr("Merge")), KeyEvent.VK_M, Shortcut.GROUP_MENU),
-                true /* register */
+                false /* register */
         );
         putValue("help", ht("/Action/MergeLayer"));
+        putValue("toolbar", "action/mergelayer");
+        Main.toolbar.register(this);
     }
 

trunk/src/org/openstreetmap/josm/actions/MoveAction.java

@@ -32 +32 @@
 
     // any better idea?
-    private static Object calltosupermustbefirststatementinconstructor(Direction dir, boolean text) {
-        Shortcut sc;
+    private static String calltosupermustbefirststatementinconstructor_text(Direction dir) {
         String directiontext;
         if        (dir == Direction.UP)   {
             directiontext = tr("up");
-            sc = Shortcut.registerShortcut("core:moveup",    tr("Move objects {0}", directiontext), KeyEvent.VK_UP,    Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT);
         } else if (dir == Direction.DOWN)  {
             directiontext = tr("down");
-            sc = Shortcut.registerShortcut("core:movedown",  tr("Move objects {0}", directiontext), KeyEvent.VK_DOWN,  Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT);
         } else if (dir == Direction.LEFT)  {
             directiontext = tr("left");
-            sc = Shortcut.registerShortcut("core:moveleft",  tr("Move objects {0}", directiontext), KeyEvent.VK_LEFT,  Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT);
         } else { //dir == Direction.RIGHT) {
             directiontext = tr("right");
-            sc = Shortcut.registerShortcut("core:moveright", tr("Move objects {0}", directiontext), KeyEvent.VK_RIGHT, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT);
         }
-        if (text)
-            return directiontext;
-        else
-            return sc;
+        return directiontext;
+    }
+
+    // any better idea?
+    private static Shortcut calltosupermustbefirststatementinconstructor(Direction dir) {
+        Shortcut sc;
+        if        (dir == Direction.UP)   {
+            sc = Shortcut.registerShortcut("core:moveup",    tr("Move objects {0}", tr("up")), KeyEvent.VK_UP,    Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT);
+        } else if (dir == Direction.DOWN)  {
+            sc = Shortcut.registerShortcut("core:movedown",  tr("Move objects {0}", tr("down")), KeyEvent.VK_DOWN,  Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT);
+        } else if (dir == Direction.LEFT)  {
+            sc = Shortcut.registerShortcut("core:moveleft",  tr("Move objects {0}", tr("left")), KeyEvent.VK_LEFT,  Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT);
+        } else { //dir == Direction.RIGHT) {
+            sc = Shortcut.registerShortcut("core:moveright", tr("Move objects {0}", tr("right")), KeyEvent.VK_RIGHT, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT);
+        }
+        return sc;
     }
 
     public MoveAction(Direction dir) {
-        super(tr("Move {0}", calltosupermustbefirststatementinconstructor(dir, true)), null,
-                tr("Moves Objects {0}", calltosupermustbefirststatementinconstructor(dir, true)),
-                (Shortcut)calltosupermustbefirststatementinconstructor(dir, false), true);
+        super(tr("Move {0}", calltosupermustbefirststatementinconstructor_text(dir)), null,
+                tr("Moves Objects {0}", calltosupermustbefirststatementinconstructor_text(dir)),
+                calltosupermustbefirststatementinconstructor(dir), false);
         myDirection = dir;
         putValue("help", ht("/Action/Move"));
+        if        (dir == Direction.UP)   {
+            putValue("toolbar", "action/move/up");
+        } else if (dir == Direction.DOWN)  {
+            putValue("toolbar", "action/move/down");
+        } else if (dir == Direction.LEFT)  {
+            putValue("toolbar", "action/move/left");
+        } else { //dir == Direction.RIGHT) {
+            putValue("toolbar", "action/move/right");
+        }
+        Main.toolbar.register(this);
     }
 

trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java

@@ -81 +81 @@
                     Shortcut.registerShortcut("tools:orthogonalizeUndo", tr("Tool: {0}", tr("Orthogonalize Shape / Undo")),
                             KeyEvent.VK_Q,
-                            Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
+                            Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), false);
+            putValue("toolbar", "action/orthogonalize/undo");
+            Main.toolbar.register(this);
         }
         public void actionPerformed(ActionEvent e) {

trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java

@@ -44 +44 @@
 
         putValue("help", ht("/Action/ShowStatusReport"));
+        putValue("toolbar", "help/showstatusreport");
     }
 

trunk/src/org/openstreetmap/josm/actions/WireframeToggleAction.java

@@ -20 +20 @@
                 tr("Enable/disable rendering the map as wireframe only"),
                 Shortcut.registerShortcut("menu:view:wireframe", tr("Toggle Wireframe view"),KeyEvent.VK_W, Shortcut.GROUP_MENU),
-                true /* register shortcut */
+                false /* register toolbar */
         );
+        putValue("toolbar", "wireframe");
+        Main.toolbar.register(this);
         putValue(SELECTED_KEY, MapRendererFactory.getInstance().isWireframeMapRendererActive());
     }

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -252 +252 @@
             // Main.debug("Main window not maximized");
         }
+        if(main.menu.fullscreenToggleAction != null)
+            main.menu.fullscreenToggleAction.initial();
 
         SwingUtilities.invokeLater(new Runnable() {

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -196 +196 @@
 
     public final TaggingPresetSearchAction presetSearchAction = new TaggingPresetSearchAction();
-
+    public FullscreenToggleAction fullscreenToggleAction = null;
     /**
      * Add a JosmAction to a menu.
@@ -304 +304 @@
         if(!Main.applet) {
             // -- fullscreen toggle action
-            FullscreenToggleAction fullscreenToggleAction = new FullscreenToggleAction();
+            fullscreenToggleAction = new FullscreenToggleAction();
             if (fullscreenToggleAction.canFullscreen()) {
                 final JCheckBoxMenuItem fullscreen = new JCheckBoxMenuItem(fullscreenToggleAction);

trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -243 +243 @@
             result.setLength(0);
 
-            escape((String) action.getAction().getValue("toolbar"));
+            String val = (String) action.getAction().getValue("toolbar");
+            if(val == null)
+                return null;
+            escape(val);
             if (action.getAction() instanceof ParameterizedAction) {
                 result.append('(');
@@ -753 +756 @@
                     t.add("|");
                 } else {
-                    t.add(parser.saveAction(action));
+                    String res = parser.saveAction(action);
+                    if(res != null)
+                        t.add(res);
                 }
             }
@@ -783 +788 @@
                     Action action = menuItem.getAction();
                     userObject = action;
-                    actions.put((String) action.getValue("toolbar"), action);
+                    String toolbar = (String) action.getValue("toolbar");
+                    if(toolbar == null) {
+                        System.out.println(tr("Toolbar action without name: {0}",
+                        action.getClass().getName()));
+                    } else {
+                        Action r = actions.get(toolbar);
+                        if(r != null &&  r != action) {
+                            System.out.println(tr("Toolbar action {0} overwritten: {1} gets {2}",
+                            toolbar, r.getClass().getName(), action.getClass().getName()));
+                        }
+                    }
+                    actions.put(toolbar, action);
                 } else {
                     userObject = menuItem.getText();
@@ -862 +878 @@
      */
     public Action register(Action action) {
-        regactions.put((String) action.getValue("toolbar"), action);
+        String toolbar = (String) action.getValue("toolbar");
+        if(toolbar == null) {
+            System.out.println(tr("Registered toolbar action without name: {0}",
+            action.getClass().getName()));
+        } else {
+            Action r = regactions.get(toolbar);
+            if(r != null) {
+                System.out.println(tr("Registered toolbar action {0} overwritten: {1} gets {2}",
+                toolbar, r.getClass().getName(), action.getClass().getName()));
+            }
+        }
+        regactions.put(toolbar, action);
         return action;
     }