Re: [Jajuk-dev] [Jajuk-commits] SF.net SVN: jajuk:[6077] trunk/jajuk/src/main/java/org/jajuk/util/UtilGUI. java

[Dominik S. <dom...@gm...>]

Hi,

one side-effect I saw with this change is that multiple dialogs do not
support ESC correctly now, e.g. open Prepare Party -> Go to third wizard
page -> press the directory selection button -> press ESC -> not only the
file selection but the overall prepare party dialog is closed... The same
for properties, if you open nested properties inside a property dialog...

Dominik.

On Wed, Sep 15, 2010 at 9:48 PM, <bf...@us...> wrote:

> Revision: 6077
>          http://jajuk.svn.sourceforge.net/jajuk/?rev=6077&view=rev
> Author:   bflorat
> Date:     2010-09-15 19:48:09 +0000 (Wed, 15 Sep 2010)
>
> Log Message:
> -----------
> Fix for dialogs closing on ESCAPE keystroke
>
> Modified Paths:
> --------------
>    trunk/jajuk/src/main/java/org/jajuk/util/UtilGUI.java
>
> Modified: trunk/jajuk/src/main/java/org/jajuk/util/UtilGUI.java
> ===================================================================
> --- trunk/jajuk/src/main/java/org/jajuk/util/UtilGUI.java       2010-09-12
> 19:58:10 UTC (rev 6076)
> +++ trunk/jajuk/src/main/java/org/jajuk/util/UtilGUI.java       2010-09-15
> 19:48:09 UTC (rev 6077)
> @@ -35,13 +35,13 @@
>  import java.awt.GraphicsDevice;
>  import java.awt.GraphicsEnvironment;
>  import java.awt.Image;
> +import java.awt.KeyEventDispatcher;
> +import java.awt.KeyboardFocusManager;
>  import java.awt.MouseInfo;
>  import java.awt.Point;
>  import java.awt.RenderingHints;
>  import java.awt.Toolkit;
>  import java.awt.Window;
> -import java.awt.event.ActionEvent;
> -import java.awt.event.ActionListener;
>  import java.awt.event.KeyEvent;
>  import java.awt.image.BufferedImage;
>  import java.awt.image.ColorModel;
> @@ -68,7 +68,6 @@
>  import javax.swing.JScrollPane;
>  import javax.swing.JTextArea;
>  import javax.swing.JToolBar;
> -import javax.swing.KeyStroke;
>  import javax.swing.SwingUtilities;
>  import javax.swing.SwingWorker;
>  import javax.swing.UIManager;
> @@ -903,13 +902,16 @@
>    *          DOCUMENT_ME
>    */
>   public static void setEscapeKeyboardAction(final Window window,
> JComponent pane) {
> -    KeyStroke stroke = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0);
> -    pane.registerKeyboardAction(new ActionListener() {
> -      public void actionPerformed(ActionEvent actionEvent) {
> -        // setVisible(false);
> -        window.dispose();
> -      }
> -    }, stroke, JComponent.WHEN_IN_FOCUSED_WINDOW);
> +    // Add keystroke to close window when pressing escape
> +
>  KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(
> +        new KeyEventDispatcher() {
> +          public boolean dispatchKeyEvent(KeyEvent e) {
> +            if (e.getKeyCode() == KeyEvent.VK_ESCAPE) {
> +              window.dispose();
> +            }
> +            return false;
> +          }
> +        });
>   }
>
>   /**
>
>
> This was sent by the SourceForge.net collaborative development platform,
> the world's largest Open Source development site.
>
>
> ------------------------------------------------------------------------------
> Start uncovering the many advantages of virtual appliances
> and start using them to simplify application deployment and
> accelerate your shift to cloud computing.
> http://p.sf.net/sfu/novell-sfdev2dev
> _______________________________________________
> Jajuk-commits mailing list
> Jaj...@li...
> https://lists.sourceforge.net/lists/listinfo/jajuk-commits
>