Changeset 2347 in josm for trunk/src/org/openstreetmap/josm/gui/download

Timestamp:

2009-10-29T07:30:49+01:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3802: Buttons dont't react to enter in download dialog

File:

• trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java

@@ -135 +135 @@
         JPanel pnl = new JPanel();
         pnl.setLayout(new FlowLayout());
-         
+        
+        // -- download button
         pnl.add(btnDownload = new SideButton(actDownload = new DownloadAction()));
         btnDownload.setFocusable(true);
         btnDownload.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER,0), "download");
         btnDownload.getActionMap().put("download",actDownload);
-        pnl.add(new SideButton(new CancelAction()));
-        pnl.add(new SideButton(new ContextSensitiveHelpAction(ht("/Dialog/DownloadDialog"))));
+
+        // -- cancel button         
+        SideButton btnCancel;
+        CancelAction actCancel = new CancelAction();
+        pnl.add(btnCancel = new SideButton(actCancel));
+        btnCancel.setFocusable(true);
+        btnCancel.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER,0), "enter");
+        btnCancel.getActionMap().put("enter",actCancel);
+
+        // -- cancel on ESC 
+        getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE,0), "cancel");
+        getRootPane().getActionMap().put("cancel", actCancel);
+
+        // -- help button 
+        SideButton btnHelp;
+        pnl.add(btnHelp = new SideButton(new ContextSensitiveHelpAction(ht("/Dialog/DownloadDialog"))));
+        btnHelp.setFocusable(true);
+        btnHelp.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER,0), "enter");
+        btnHelp.getActionMap().put("enter",btnHelp.getAction());
+        
         return pnl;        
     }