diff options
author | Vincent Lucas <chenzo@jitsi.org> | 2012-05-15 18:14:48 +0000 |
---|---|---|
committer | Vincent Lucas <chenzo@jitsi.org> | 2012-05-15 18:14:48 +0000 |
commit | eae129a72c7f72279112e6098f563b7d90ceaf93 (patch) | |
tree | 6d5e75f6b27849100aa6c99cb747d6543f9904d2 /src/net/java/sip/communicator/impl/keybindings | |
parent | 9e2ff448e7898ab81105b213b8dbc74ca7da8600 (diff) | |
download | jitsi-eae129a72c7f72279112e6098f563b7d90ceaf93.zip jitsi-eae129a72c7f72279112e6098f563b7d90ceaf93.tar.gz jitsi-eae129a72c7f72279112e6098f563b7d90ceaf93.tar.bz2 |
Adds an "answer/hangup" call global key shortcut. Modifies the "hangup" global
key shortcut behavior.
The answer/hangup shortcut:
--------------------------
This shortcut may be helpful for headsets with a single button for answering or
hanging up a call.
By default this shortcut is set to "Ctrl + Shift + p". When pressed:
1) If there is at least an incoming call, then Jitsi answers the first incoming
call.
2) If there is no incoming call, then Jitsi closes all active calls (An active
call is a call with at least one peer which is not on hold).
3) If there is no incoming call and no active call, then Jitsi closes all
remaining calls (which are all on hold).
New hangup shortcut behavior:
-----------------------------
The hangup global key shortcut behavior is modified as follow:
1) If there is at least an incoming call, then Jitsi closes the first incoming
call.
2) If there is no incoming call, then Jitsi closes all active calls (An active
call is a call with at least one peer which is not on hold).
3) If there is no incoming call and no active call, then Jitsi closes all
remaining calls (which are all on hold).
Diffstat (limited to 'src/net/java/sip/communicator/impl/keybindings')
-rw-r--r-- | src/net/java/sip/communicator/impl/keybindings/KeybindingsServiceImpl.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/impl/keybindings/KeybindingsServiceImpl.java b/src/net/java/sip/communicator/impl/keybindings/KeybindingsServiceImpl.java index 1089051..35efb39 100644 --- a/src/net/java/sip/communicator/impl/keybindings/KeybindingsServiceImpl.java +++ b/src/net/java/sip/communicator/impl/keybindings/KeybindingsServiceImpl.java @@ -336,8 +336,8 @@ class KeybindingsServiceImpl String shortcut2 = null; String propName = null; String propName2 = null; - String names[] = new String[]{"answer", "hangup", "contactlist", - "mute"}; + String names[] = new String[]{"answer", "hangup", "answer_hangup", + "contactlist", "mute"}; Object configured = configService.getProperty( "net.java.sip.communicator.impl.keybinding.global.configured"); |