Changeset 5979 in josm for trunk

Timestamp:

2013-06-01T12:08:15+02:00 (11 years ago)

Author:

akks

Message:

fix #8652 [based on patch by cmuelle8] enable dialog and panels hiding by TAB
disable TAB for angle snapping by default (please use A-A or assign different key)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DialogsToggleAction.java (modified) (1 diff)
• actions/mapmode/DrawAction.java (modified) (1 diff)
• gui/MapView.java (modified) (3 diffs)
• gui/preferences/ToolbarPreferences.java (modified) (1 diff)
• tools/Shortcut.java (modified) (1 diff)

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

@@ -30 +30 @@
                 (Icon) null, /* no icon */
                 tr("Toggle dialogs panel, maximize mapview"),
-                Shortcut.registerShortcut("menu:view:dialogspanel", tr("Toggle dialogs panel"),KeyEvent.CHAR_UNDEFINED, Shortcut.NONE),
+                Shortcut.registerShortcut("menu:view:dialogspanel", tr("Toggle dialogs panel"),KeyEvent.VK_TAB, Shortcut.DIRECT),
                 true, "dialogspanel", /* register in toolbar */
                 false

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -128 +128 @@
 
         snappingShortcut = Shortcut.registerShortcut("mapmode:drawanglesnapping",
-                tr("Mode: Draw Angle snapping"), KeyEvent.VK_TAB, Shortcut.DIRECT);
+                tr("Mode: Draw Angle snapping"), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE);
         snapChangeAction = new SnapChangeAction();
         snapCheckboxMenuItem = addMenuItem();

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

@@ -12 +12 @@
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
+import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseMotionListener;
@@ -55 +56 @@
 import org.openstreetmap.josm.tools.AudioPlayer;
 import org.openstreetmap.josm.tools.BugReportExceptionHandler;
+import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -267 +269 @@
             }
         });
+
+        if (Shortcut.findShortcut(KeyEvent.VK_TAB, 0)!=null)
+        {
+            setFocusTraversalKeysEnabled(false);
+        }
     }
 

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

@@ -434 +434 @@
             });
 
-        JCheckBoxMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("Hide toolbar and menu")) {
+        JCheckBoxMenuItem doNotHide = new JCheckBoxMenuItem(new AbstractAction(tr("Do not hide toolbar and menu")) {
             @Override
             public void actionPerformed(ActionEvent e) {

trunk/src/org/openstreetmap/josm/tools/Shortcut.java

@@ -246 +246 @@
 
     // check if something collides with an existing shortcut
-    private static Shortcut findShortcut(int requestedKey, int modifier) {
+    public static Shortcut findShortcut(int requestedKey, int modifier) {
         if (modifier == getGroupModifier(NONE))
             return null;