Skip to content

Commit

Permalink
Removed accelerator keys from resource bundles; fixed deprecations
Browse files Browse the repository at this point in the history 
- Having language specific accelerator keys is too error-prone and
common accelerators like Ctrl-C/Ctrl-V/Ctrl-X are never translated
- Fixed duplicate accelerator (D)
- Replaced deprecated getMenuShortcutKeyMask() with getMenuShortcutKeyMaskEx
- Replaced deprecated InputEvent key masks
  • Loading branch information
@kaikramer
kaikramer committed Jan 6, 2024
1 parent 93e9f43 commit 8e67d6e
Show file tree
Hide file tree
Showing 35 changed files with 62 additions and 164 deletions.
3 changes: 1 addition & 2 deletions kse/src/main/java/org/kse/gui/actions/CloseAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ public class CloseAction extends SaveAction {
public CloseAction(KseFrame kseFrame) {
super(kseFrame);

putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(res.getString("CloseAction.accelerator").charAt(0),
Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('W', Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
putValue(LONG_DESCRIPTION, res.getString("CloseAction.statusbar"));
putValue(NAME, res.getString("CloseAction.text"));
putValue(SHORT_DESCRIPTION, res.getString("CloseAction.tooltip"));
Expand Down
5 changes: 2 additions & 3 deletions kse/src/main/java/org/kse/gui/actions/CloseAllAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,8 @@ public class CloseAllAction extends CloseAction {
public CloseAllAction(KseFrame kseFrame) {
super(kseFrame);

putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(res.getString("CloseAllAction.accelerator").charAt(0),
Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() +
InputEvent.SHIFT_MASK));
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('W', Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx() +
InputEvent.SHIFT_DOWN_MASK));
putValue(LONG_DESCRIPTION, res.getString("CloseAllAction.statusbar"));
putValue(NAME, res.getString("CloseAllAction.text"));
putValue(SHORT_DESCRIPTION, res.getString("CloseAllAction.tooltip"));
Expand Down
5 changes: 2 additions & 3 deletions kse/src/main/java/org/kse/gui/actions/CompareCertificateAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@ public class CompareCertificateAction extends KeyStoreExplorerAction {
*/
public CompareCertificateAction(KseFrame kseFrame) {
super(kseFrame);
putValue(ACCELERATOR_KEY,
KeyStroke.getKeyStroke(res.getString("CompareCertificateAction.accelerator").charAt(0),
Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() + InputEvent.ALT_MASK));
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('C', Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx() +
InputEvent.ALT_DOWN_MASK));
putValue(LONG_DESCRIPTION, res.getString("CompareCertificateAction.statusbar"));
putValue(NAME, res.getString("CompareCertificateAction.text"));
putValue(SHORT_DESCRIPTION, res.getString("CompareCertificateAction.tooltip"));
Expand Down
3 changes: 1 addition & 2 deletions kse/src/main/java/org/kse/gui/actions/CopyAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ public class CopyAction extends KeyStoreExplorerAction {
public CopyAction(KseFrame kseFrame) {
super(kseFrame);

putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(res.getString("CopyAction.accelerator").charAt(0),
Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('C', Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
putValue(LONG_DESCRIPTION, res.getString("CopyAction.statusbar"));
putValue(NAME, res.getString("CopyAction.text"));
putValue(SHORT_DESCRIPTION, res.getString("CopyAction.tooltip"));
Expand Down
3 changes: 1 addition & 2 deletions kse/src/main/java/org/kse/gui/actions/CutAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ public class CutAction extends KeyStoreExplorerAction implements HistoryAction {
public CutAction(KseFrame kseFrame) {
super(kseFrame);

putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(res.getString("CutAction.accelerator").charAt(0),
Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('X', Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
putValue(LONG_DESCRIPTION, res.getString("CutAction.statusbar"));
putValue(NAME, res.getString("CutAction.text"));
putValue(SHORT_DESCRIPTION, res.getString("CutAction.tooltip"));
Expand Down
3 changes: 1 addition & 2 deletions kse/src/main/java/org/kse/gui/actions/DetectFileTypeAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ public class DetectFileTypeAction extends KeyStoreExplorerAction {
public DetectFileTypeAction(KseFrame kseFrame) {
super(kseFrame);

putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(res.getString("DetectFileTypeAction.accelerator").charAt(0),
Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('D', Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
putValue(LONG_DESCRIPTION, res.getString("DetectFileTypeAction.statusbar"));
putValue(NAME, res.getString("DetectFileTypeAction.text"));
putValue(SHORT_DESCRIPTION, res.getString("DetectFileTypeAction.tooltip"));
Expand Down
3 changes: 1 addition & 2 deletions kse/src/main/java/org/kse/gui/actions/ExamineClipboardAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,7 @@ public class ExamineClipboardAction extends KeyStoreExplorerAction {
public ExamineClipboardAction(KseFrame kseFrame) {
super(kseFrame);

putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(res.getString("ExamineClipboardAction.accelerator").charAt(0),
Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('L', Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
putValue(LONG_DESCRIPTION, res.getString("ExamineClipboardAction.statusbar"));
putValue(NAME, res.getString("ExamineClipboardAction.text"));
putValue(SHORT_DESCRIPTION, res.getString("ExamineClipboardAction.tooltip"));
Expand Down
3 changes: 1 addition & 2 deletions kse/src/main/java/org/kse/gui/actions/ExamineFileAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ public class ExamineFileAction extends KeyStoreExplorerAction {
public ExamineFileAction(KseFrame kseFrame) {
super(kseFrame);

putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(res.getString("ExamineFileAction.accelerator").charAt(0),
Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('E', Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
putValue(LONG_DESCRIPTION, res.getString("ExamineFileAction.statusbar"));
putValue(NAME, res.getString("ExamineFileAction.text"));
putValue(SHORT_DESCRIPTION, res.getString("ExamineFileAction.tooltip"));
Expand Down
6 changes: 3 additions & 3 deletions kse/src/main/java/org/kse/gui/actions/ExamineSslAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ public class ExamineSslAction extends KeyStoreExplorerAction {
public ExamineSslAction(KseFrame kseFrame) {
super(kseFrame);

putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(res.getString("ExamineSslAction.accelerator").charAt(0),
Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() +
InputEvent.ALT_MASK));
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('S',
Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx() +
InputEvent.ALT_DOWN_MASK));
putValue(LONG_DESCRIPTION, res.getString("ExamineSslAction.statusbar"));
putValue(NAME, res.getString("ExamineSslAction.text"));
putValue(SHORT_DESCRIPTION, res.getString("ExamineSslAction.tooltip"));
Expand Down
2 changes: 1 addition & 1 deletion kse/src/main/java/org/kse/gui/actions/ExitAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public class ExitAction extends CloseAllAction {
public ExitAction(KseFrame kseFrame) {
super(kseFrame);

putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_F4, InputEvent.ALT_MASK));
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_F4, InputEvent.ALT_DOWN_MASK));
putValue(LONG_DESCRIPTION, res.getString("ExitAction.statusbar"));
putValue(NAME, res.getString("ExitAction.text"));
putValue(SHORT_DESCRIPTION, res.getString("ExitAction.tooltip"));
Expand Down
3 changes: 1 addition & 2 deletions kse/src/main/java/org/kse/gui/actions/FindAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ public class FindAction extends KeyStoreExplorerAction {
*/
public FindAction(KseFrame kseFrame) {
super(kseFrame);
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(res.getString("FindAction.accelerator").charAt(0),
Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('F', Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
putValue(LONG_DESCRIPTION, res.getString("FindAction.statusbar"));
putValue(NAME, res.getString("FindAction.text"));
putValue(SHORT_DESCRIPTION, res.getString("FindAction.tooltip"));
Expand Down
6 changes: 3 additions & 3 deletions kse/src/main/java/org/kse/gui/actions/GenerateDHParametersAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
package org.kse.gui.actions;

import java.awt.Toolkit;
import java.awt.event.InputEvent;
import java.util.ResourceBundle;

import javax.swing.ImageIcon;
Expand Down Expand Up @@ -55,9 +56,8 @@ public class GenerateDHParametersAction extends KeyStoreExplorerAction implement
public GenerateDHParametersAction(KseFrame kseFrame) {
super(kseFrame);

putValue(ACCELERATOR_KEY,
KeyStroke.getKeyStroke(res.getString("GenerateDHParametersAction.accelerator").charAt(0),
Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('D', Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx() +
InputEvent.ALT_DOWN_MASK));
putValue(LONG_DESCRIPTION, res.getString("GenerateDHParametersAction.statusbar"));
putValue(NAME, res.getString("GenerateDHParametersAction.text"));
putValue(SHORT_DESCRIPTION, res.getString("GenerateDHParametersAction.tooltip"));
Expand Down
4 changes: 2 additions & 2 deletions kse/src/main/java/org/kse/gui/actions/GenerateKeyPairAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ public class GenerateKeyPairAction extends KeyStoreExplorerAction implements His
public GenerateKeyPairAction(KseFrame kseFrame) {
super(kseFrame);
this.kseFrame = kseFrame;
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(res.getString("GenerateKeyPairAction.accelerator").charAt(0),
Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('G',
Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
putValue(LONG_DESCRIPTION, res.getString("GenerateKeyPairAction.statusbar"));
putValue(NAME, res.getString("GenerateKeyPairAction.text"));
putValue(SHORT_DESCRIPTION, res.getString("GenerateKeyPairAction.tooltip"));
Expand Down
6 changes: 3 additions & 3 deletions kse/src/main/java/org/kse/gui/actions/GenerateSecretKeyAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ public class GenerateSecretKeyAction extends KeyStoreExplorerAction implements H
public GenerateSecretKeyAction(KseFrame kseFrame) {
super(kseFrame);

putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(res.getString("GenerateSecretKeyAction.accelerator").charAt(0),
Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() +
InputEvent.ALT_MASK));
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('G',
Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx() +
InputEvent.ALT_DOWN_MASK));
putValue(LONG_DESCRIPTION, res.getString("GenerateSecretKeyAction.statusbar"));
putValue(NAME, res.getString("GenerateSecretKeyAction.text"));
putValue(SHORT_DESCRIPTION, res.getString("GenerateSecretKeyAction.tooltip"));
Expand Down
4 changes: 2 additions & 2 deletions kse/src/main/java/org/kse/gui/actions/ImportKeyPairAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ public class ImportKeyPairAction extends KeyStoreExplorerAction implements Histo
public ImportKeyPairAction(KseFrame kseFrame) {
super(kseFrame);

putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(res.getString("ImportKeyPairAction.accelerator").charAt(0),
Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('K',
Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
putValue(LONG_DESCRIPTION, res.getString("ImportKeyPairAction.statusbar"));
putValue(NAME, res.getString("ImportKeyPairAction.text"));
putValue(SHORT_DESCRIPTION, res.getString("ImportKeyPairAction.tooltip"));
Expand Down
4 changes: 2 additions & 2 deletions kse/src/main/java/org/kse/gui/actions/ImportTrustedCertificateAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ public ImportTrustedCertificateAction(KseFrame kseFrame, X509Certificate trustCe
this.trustCertFromConstructor = trustCert;

putValue(ACCELERATOR_KEY,
KeyStroke.getKeyStroke(res.getString("ImportTrustedCertificateAction.accelerator").charAt(0),
Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
KeyStroke.getKeyStroke('T',
Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
putValue(LONG_DESCRIPTION, res.getString("ImportTrustedCertificateAction.statusbar"));
putValue(NAME, res.getString("ImportTrustedCertificateAction.text"));
putValue(SHORT_DESCRIPTION, res.getString("ImportTrustedCertificateAction.tooltip"));
Expand Down
4 changes: 2 additions & 2 deletions kse/src/main/java/org/kse/gui/actions/NewAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ public class NewAction extends KeyStoreExplorerAction {
public NewAction(KseFrame kseFrame) {
super(kseFrame);

putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(res.getString("NewAction.accelerator").charAt(0),
Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('N',
Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
putValue(LONG_DESCRIPTION, res.getString("NewAction.statusbar"));
putValue(NAME, res.getString("NewAction.text"));
putValue(SHORT_DESCRIPTION, res.getString("NewAction.tooltip"));
Expand Down
4 changes: 2 additions & 2 deletions kse/src/main/java/org/kse/gui/actions/OpenAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ public class OpenAction extends KeyStoreExplorerAction {
public OpenAction(KseFrame kseFrame) {
super(kseFrame);

putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(res.getString("OpenAction.accelerator").charAt(0),
Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('O',
Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
putValue(LONG_DESCRIPTION, res.getString("OpenAction.statusbar"));
putValue(NAME, res.getString("OpenAction.text"));
putValue(SHORT_DESCRIPTION, res.getString("OpenAction.tooltip"));
Expand Down
5 changes: 2 additions & 3 deletions kse/src/main/java/org/kse/gui/actions/OpenCaCertificatesAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,8 @@ public class OpenCaCertificatesAction extends OpenAction {
public OpenCaCertificatesAction(KseFrame kseFrame) {
super(kseFrame);

putValue(ACCELERATOR_KEY,
KeyStroke.getKeyStroke(res.getString("OpenCaCertificatesAction.accelerator").charAt(0),
Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() + InputEvent.SHIFT_MASK));
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('C', Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx() +
InputEvent.SHIFT_DOWN_MASK));
putValue(LONG_DESCRIPTION, res.getString("OpenCaCertificatesAction.statusbar"));
putValue(NAME, res.getString("OpenCaCertificatesAction.text"));
putValue(SHORT_DESCRIPTION, res.getString("OpenCaCertificatesAction.tooltip"));
Expand Down
6 changes: 3 additions & 3 deletions kse/src/main/java/org/kse/gui/actions/OpenDefaultAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ public class OpenDefaultAction extends OpenAction {
public OpenDefaultAction(KseFrame kseFrame) {
super(kseFrame);

putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(res.getString("OpenDefaultAction.accelerator").charAt(0),
Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() +
InputEvent.SHIFT_MASK));
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('D',
Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx() +
InputEvent.SHIFT_DOWN_MASK));
putValue(LONG_DESCRIPTION, res.getString("OpenDefaultAction.statusbar"));
putValue(NAME, res.getString("OpenDefaultAction.text"));
putValue(SHORT_DESCRIPTION, res.getString("OpenDefaultAction.tooltip"));
Expand Down
6 changes: 3 additions & 3 deletions kse/src/main/java/org/kse/gui/actions/OpenMsCapiAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ public class OpenMsCapiAction extends OpenAction {
public OpenMsCapiAction(KseFrame kseFrame) {
super(kseFrame);

putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(res.getString("OpenMsCapiAction.accelerator").charAt(0),
Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() +
InputEvent.SHIFT_MASK));
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('M',
Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx() +
InputEvent.SHIFT_DOWN_MASK));
putValue(LONG_DESCRIPTION, res.getString("OpenMsCapiAction.statusbar"));
putValue(NAME, res.getString("OpenMsCapiAction.text"));
putValue(SHORT_DESCRIPTION, res.getString("OpenMsCapiAction.tooltip"));
Expand Down
6 changes: 3 additions & 3 deletions kse/src/main/java/org/kse/gui/actions/OpenPkcs11Action.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ public class OpenPkcs11Action extends OpenAction {
public OpenPkcs11Action(KseFrame kseFrame) {
super(kseFrame);

putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(res.getString("OpenPkcs11Action.accelerator").charAt(0),
Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() +
InputEvent.SHIFT_MASK));
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('1',
Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx() +
InputEvent.SHIFT_DOWN_MASK));
putValue(LONG_DESCRIPTION, res.getString("OpenPkcs11Action.statusbar"));
putValue(NAME, res.getString("OpenPkcs11Action.text"));
putValue(SHORT_DESCRIPTION, res.getString("OpenPkcs11Action.tooltip"));
Expand Down
4 changes: 2 additions & 2 deletions kse/src/main/java/org/kse/gui/actions/PasteAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ public class PasteAction extends KeyStoreExplorerAction implements HistoryAction
public PasteAction(KseFrame kseFrame) {
super(kseFrame);

putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(res.getString("PasteAction.accelerator").charAt(0),
Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke('V',
Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
putValue(LONG_DESCRIPTION, res.getString("PasteAction.statusbar"));
putValue(NAME, res.getString("PasteAction.text"));
putValue(SHORT_DESCRIPTION, res.getString("PasteAction.tooltip"));
Expand Down
4 changes: 2 additions & 2 deletions kse/src/main/java/org/kse/gui/actions/PreferencesAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ public class PreferencesAction extends ExitAction {
public PreferencesAction(KseFrame kseFrame) {
super(kseFrame);
this.kseFrame = kseFrame;
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(res.getString("PreferencesAction.accelerator").charAt(0),
Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(',',
Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx()));
putValue(LONG_DESCRIPTION, res.getString("PreferencesAction.statusbar"));
putValue(NAME, res.getString("PreferencesAction.text"));
putValue(SHORT_DESCRIPTION, res.getString("PreferencesAction.tooltip"));
Expand Down
2 changes: 1 addition & 1 deletion kse/src/main/java/org/kse/gui/actions/PropertiesAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public class PropertiesAction extends KeyStoreExplorerAction {
public PropertiesAction(KseFrame kseFrame) {
super(kseFrame);

putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.ALT_MASK));
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.ALT_DOWN_MASK));
putValue(LONG_DESCRIPTION, res.getString("PropertiesAction.statusbar"));
putValue(NAME, res.getString("PropertiesAction.text"));
putValue(SHORT_DESCRIPTION, res.getString("PropertiesAction.tooltip"));
Expand Down
Loading

0 comments on commit 8e67d6e

Please sign in to comment.