Changeset 5282 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

Timestamp:

2012-06-17T16:53:49+02:00 (12 years ago)

Author:

akks

Message:

Fix #7751: allow to disable angle snapping toggle on repeating A

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified) (6 diffs)

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

@@ -97 +97 @@
 
     private JCheckBoxMenuItem snapCheckboxMenuItem;
+    private boolean useRepeatedShortcut;
 
     public DrawAction(MapFrame mapFrame) {
@@ -253 +254 @@
         if (event instanceof KeyEvent) {
             KeyEvent e = (KeyEvent) event;
-            if (snappingShortcut.isEvent(e) || getShortcut().isEvent(e)) {
+            if (snappingShortcut.isEvent(e) || (useRepeatedShortcut && getShortcut().isEvent(e))) {
                 Component focused = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
                 if (SwingUtilities.getWindowAncestor(focused) instanceof JFrame)
@@ -270 +271 @@
     private Timer timer;
     void processKeyEvent(KeyEvent e) {
-        if (!snappingShortcut.isEvent(e) && !getShortcut().isEvent(e)) 
+        if (!snappingShortcut.isEvent(e) && !(useRepeatedShortcut && getShortcut().isEvent(e))) 
             return;
         
@@ -1278 +1279 @@
 
             showAngle = Main.pref.getBoolean("draw.anglesnap.showAngle", true);
+            useRepeatedShortcut = Main.pref.getBoolean("draw.anglesnap.toggleOnRepeatedA", true);
 
             normalStroke = new BasicStroke(3, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND);
@@ -1588 +1590 @@
 
         MouseListener anglePopupListener = new PopupMenuLauncher( new JPopupMenu() {
+            JCheckBoxMenuItem repeatedCb = new JCheckBoxMenuItem(new AbstractAction(tr("Toggle snapping by {0}", getShortcut().getKeyText())){
+                public void actionPerformed(ActionEvent e) {
+                    boolean sel=((JCheckBoxMenuItem) e.getSource()).getState();
+                    Main.pref.put("draw.anglesnap.toggleOnRepeatedA", sel);
+                    init();
+                }
+            });
             JCheckBoxMenuItem helperCb = new JCheckBoxMenuItem(new AbstractAction(tr("Show helper geometry")){
                 public void actionPerformed(ActionEvent e) {
@@ -1609 +1618 @@
                 helperCb.setState(Main.pref.getBoolean("draw.anglesnap.drawConstructionGeometry",true));
                 projectionCb.setState(Main.pref.getBoolean("draw.anglesnap.projectionsnapgvff",true));
+                repeatedCb.setState(Main.pref.getBoolean("draw.anglesnap.toggleOnRepeatedA",true));
+                add(repeatedCb);
                 add(helperCb);
                 add(projectionCb);;