From b67d16970aaf76f20e02e31defda11274df21e8c Mon Sep 17 00:00:00 2001 From: Yana Stamcheva Date: Thu, 8 Jun 2006 08:41:39 +0000 Subject: [PATCH] Alt+X on Warning window exits the application - Fixed. --- .../communicator/impl/gui/main/WelcomeWindow.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/net/java/sip/communicator/impl/gui/main/WelcomeWindow.java b/src/net/java/sip/communicator/impl/gui/main/WelcomeWindow.java index f49465dce..1705b037f 100644 --- a/src/net/java/sip/communicator/impl/gui/main/WelcomeWindow.java +++ b/src/net/java/sip/communicator/impl/gui/main/WelcomeWindow.java @@ -107,11 +107,14 @@ public void windowClosing(WindowEvent e) { }); getRootPane().getActionMap().put("close", new CloseAction()); + getRootPane().getActionMap().put("exit", new ExitAction()); InputMap imap = this.getRootPane().getInputMap( JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); imap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "close"); + imap.put(KeyStroke.getKeyStroke(KeyEvent.VK_X, + KeyEvent.ALT_DOWN_MASK), "exit"); } private void setTransparent(boolean transparent) { @@ -191,4 +194,15 @@ public void actionPerformed(ActionEvent e) { SwingUtilities.invokeLater(new RunLogin()); } }; + + private class ExitAction extends AbstractAction { + public void actionPerformed(ActionEvent e) { + try { + bc.getBundle(0).stop(); + } catch (BundleException ex) { + logger.error("Failed to gently shutdown Oscar", ex); + } + System.exit(0); + } + }; }