diff options
| author | Damian Minkov <damencho@jitsi.org> | 2010-07-23 09:11:52 +0000 |
|---|---|---|
| committer | Damian Minkov <damencho@jitsi.org> | 2010-07-23 09:11:52 +0000 |
| commit | 135ede588038b677f68d63868f814d15d676e9f4 (patch) | |
| tree | 0f1def067ec93923882168425141b03bc129d1ec /src/net/java/sip/communicator/plugin | |
| parent | 4f6aaa3ee7f718dbdb18ba0b5fa5ff6af89ee588 (diff) | |
| download | jitsi-135ede588038b677f68d63868f814d15d676e9f4.zip jitsi-135ede588038b677f68d63868f814d15d676e9f4.tar.gz jitsi-135ede588038b677f68d63868f814d15d676e9f4.tar.bz2 | |
Rest of the work on issue#528, add default macosx bindings(Ctrl+w and Cmd+w).
Fix a font issue for proxy config reported by Lubomir Marinov.
Diffstat (limited to 'src/net/java/sip/communicator/plugin')
| -rw-r--r-- | src/net/java/sip/communicator/plugin/branding/AboutWindow.java | 29 | ||||
| -rw-r--r-- | src/net/java/sip/communicator/plugin/globalproxyconfig/GlobalProxyConfigForm.java | 6 |
2 files changed, 34 insertions, 1 deletions
diff --git a/src/net/java/sip/communicator/plugin/branding/AboutWindow.java b/src/net/java/sip/communicator/plugin/branding/AboutWindow.java index 4554222..31031d0 100644 --- a/src/net/java/sip/communicator/plugin/branding/AboutWindow.java +++ b/src/net/java/sip/communicator/plugin/branding/AboutWindow.java @@ -199,6 +199,23 @@ public class AboutWindow this.setResizable(false);
setLocationRelativeTo(getParent());
+
+ this.getRootPane().getActionMap().put("close", new CloseAction());
+
+ InputMap imap = this.getRootPane().getInputMap(
+ JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+
+ imap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "close");
+
+ if(OSUtils.IS_MAC)
+ {
+ imap.put(
+ KeyStroke.getKeyStroke(KeyEvent.VK_W, InputEvent.META_DOWN_MASK),
+ "close");
+ imap.put(
+ KeyStroke.getKeyStroke(KeyEvent.VK_W, InputEvent.CTRL_DOWN_MASK),
+ "close");
+ }
}
/**
@@ -326,4 +343,16 @@ public class AboutWindow * Implementation of {@link ExportedWindow#setParams(Object[])}.
*/
public void setParams(Object[] windowParams) {}
+
+ /**
+ * The action invoked when user presses Escape key.
+ */
+ private class CloseAction extends UIAction
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ setVisible(false);
+ dispose();
+ }
+ }
}
diff --git a/src/net/java/sip/communicator/plugin/globalproxyconfig/GlobalProxyConfigForm.java b/src/net/java/sip/communicator/plugin/globalproxyconfig/GlobalProxyConfigForm.java index 4473913..c14a223 100644 --- a/src/net/java/sip/communicator/plugin/globalproxyconfig/GlobalProxyConfigForm.java +++ b/src/net/java/sip/communicator/plugin/globalproxyconfig/GlobalProxyConfigForm.java @@ -151,6 +151,10 @@ public class GlobalProxyConfigForm table.setContentType("text/html"); table.setEditable(false); table.setOpaque(false); + + table.putClientProperty( + JEditorPane.HONOR_DISPLAY_PROPERTIES, Boolean.TRUE); + table.setText(Resources.getString( "plugin.globalproxy.PROTOCOL_SUPPORT")); centerPanel.add( @@ -159,7 +163,7 @@ public class GlobalProxyConfigForm add(centerPanel, BorderLayout.NORTH); } - + /** * Loading the values stored onto configuration form */ |