From 1f4461da6498a2a84445f61bdde6d67ba3275636 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Fri, 18 Nov 2011 23:45:54 +0000 Subject: [PATCH] Ctrl -> Cmd in GUI on Macs. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4176 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/userinterface/GUIClipboard.java | 14 ++++++------ prism/src/userinterface/GUIFileMenu.java | 4 +++- prism/src/userinterface/GUIPrism.java | 6 ++--- .../graph/SeriesEditorDialog.java | 12 +++++----- .../userinterface/model/GUIMultiModel.java | 8 +++---- .../model/GUITextModelEditor.java | 22 +++++++++---------- .../properties/GUIMultiProperties.java | 6 ++--- .../properties/GUIPropertiesList.java | 2 +- .../networking/GUINetworkEditor.java | 10 ++++----- 9 files changed, 43 insertions(+), 41 deletions(-) diff --git a/prism/src/userinterface/GUIClipboard.java b/prism/src/userinterface/GUIClipboard.java index b34c9431..bc64c120 100644 --- a/prism/src/userinterface/GUIClipboard.java +++ b/prism/src/userinterface/GUIClipboard.java @@ -263,7 +263,7 @@ public class GUIClipboard extends GUIPlugin }; actionUndo.putValue(Action.LONG_DESCRIPTION, "Undo the last edit."); actionUndo.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_U)); - actionUndo.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_Z, java.awt.event.InputEvent.CTRL_MASK)); + actionUndo.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_Z, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); actionUndo.putValue(Action.NAME, "Undo"); actionUndo.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("smallUndo.png")); @@ -276,7 +276,7 @@ public class GUIClipboard extends GUIPlugin }; actionRedo.putValue(Action.LONG_DESCRIPTION, "Redo the last edit."); actionRedo.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_R)); - actionRedo.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_Y, java.awt.event.InputEvent.CTRL_MASK)); + actionRedo.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_Y, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); actionRedo.putValue(Action.NAME, "Redo"); actionRedo.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("smallRedo.png")); @@ -290,7 +290,7 @@ public class GUIClipboard extends GUIPlugin }; actionCut.putValue(Action.LONG_DESCRIPTION, "Copys the currently selected item/text to the clipboard and then removes it."); actionCut.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_C)); - actionCut.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_X, java.awt.event.InputEvent.CTRL_MASK)); + actionCut.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_X, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); actionCut.putValue(Action.NAME, "Cut"); actionCut.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("smallCut.png")); @@ -303,7 +303,7 @@ public class GUIClipboard extends GUIPlugin }; actionCopy.putValue(Action.LONG_DESCRIPTION, "Copys the currently selected item/text to the clipboard."); actionCopy.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_O)); - actionCopy.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_C, java.awt.event.InputEvent.CTRL_MASK)); + actionCopy.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_C, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); actionCopy.putValue(Action.NAME, "Copy"); actionCopy.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("smallCopy.png")); @@ -316,7 +316,7 @@ public class GUIClipboard extends GUIPlugin }; actionPaste.putValue(Action.LONG_DESCRIPTION, "Pastes the contents of the clipboard."); actionPaste.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_P)); - actionPaste.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_V, java.awt.event.InputEvent.CTRL_MASK)); + actionPaste.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_V, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); actionPaste.putValue(Action.NAME, "Paste"); actionPaste.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("smallPaste.png")); @@ -330,7 +330,7 @@ public class GUIClipboard extends GUIPlugin }; actionDelete.putValue(Action.LONG_DESCRIPTION, "Removes the currently selected item"); actionDelete.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_D)); - actionDelete.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_D, java.awt.event.InputEvent.CTRL_MASK)); + actionDelete.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_D, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); actionDelete.putValue(Action.NAME, "Delete"); actionDelete.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("smallDelete.png")); @@ -343,7 +343,7 @@ public class GUIClipboard extends GUIPlugin }; actionSelectAll.putValue(Action.LONG_DESCRIPTION, "Selects all items of the focussed component."); actionSelectAll.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_S)); - actionSelectAll.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_A, java.awt.event.InputEvent.CTRL_MASK)); + actionSelectAll.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_A, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); actionSelectAll.putValue(Action.NAME, "Select all"); actionSelectAll.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("smallSelectAll.png")); } diff --git a/prism/src/userinterface/GUIFileMenu.java b/prism/src/userinterface/GUIFileMenu.java index 56736586..c9726a91 100644 --- a/prism/src/userinterface/GUIFileMenu.java +++ b/prism/src/userinterface/GUIFileMenu.java @@ -30,6 +30,8 @@ package userinterface; import javax.swing.JMenu; import javax.swing.Action; import javax.swing.AbstractAction; + +import java.awt.Toolkit; import java.awt.event.*; import javax.swing.*; @@ -110,7 +112,7 @@ public class GUIFileMenu extends GUIPlugin exitAction.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_X)); exitAction.putValue(Action.NAME, "Exit"); exitAction.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("smallExit.png")); - exitAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_Q, InputEvent.CTRL_MASK)); + exitAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_Q, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); menu.add(exitAction); } diff --git a/prism/src/userinterface/GUIPrism.java b/prism/src/userinterface/GUIPrism.java index 3efae0e5..0e374ed8 100644 --- a/prism/src/userinterface/GUIPrism.java +++ b/prism/src/userinterface/GUIPrism.java @@ -290,7 +290,7 @@ public class GUIPrism extends JFrame nextTab(); } }; - tabSwapper.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_TAB, InputEvent.CTRL_MASK)); + tabSwapper.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_TAB, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); prismOptions = new AbstractAction() { @@ -318,7 +318,7 @@ public class GUIPrism extends JFrame fontIncrease.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_I)); fontIncrease.putValue(Action.NAME, "Increase font size"); fontIncrease.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("smallFontIncrease.png")); - fontIncrease.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_EQUALS, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK)); + fontIncrease.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_EQUALS, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK)); optionsMenu.add(fontIncrease); optionsMenu.setMnemonic('I'); @@ -334,7 +334,7 @@ public class GUIPrism extends JFrame fontDecrease.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_D)); fontDecrease.putValue(Action.NAME, "Decrease font size"); fontDecrease.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("smallFontDecrease.png")); - fontDecrease.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, InputEvent.CTRL_MASK)); + fontDecrease.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); optionsMenu.add(fontDecrease); optionsMenu.setMnemonic('D'); diff --git a/prism/src/userinterface/graph/SeriesEditorDialog.java b/prism/src/userinterface/graph/SeriesEditorDialog.java index 013568f6..1ea6bd8b 100644 --- a/prism/src/userinterface/graph/SeriesEditorDialog.java +++ b/prism/src/userinterface/graph/SeriesEditorDialog.java @@ -109,7 +109,7 @@ public class SeriesEditorDialog extends JDialog //exitAction.putValue(Action.SHORT_DESCRIPTION, "Exit"); cut.putValue(Action.NAME, "Cut"); cut.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("smallCut.png")); - //cut.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_X, InputEvent.CTRL_MASK)); + //cut.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_X, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); AbstractAction copy = new AbstractAction() { @@ -122,7 +122,7 @@ public class SeriesEditorDialog extends JDialog //exitAction.putValue(Action.SHORT_DESCRIPTION, "Exit"); copy.putValue(Action.NAME, "Copy"); copy.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("smallCopy.png")); - //copy.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK)); + //copy.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_C, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); AbstractAction paste = new AbstractAction() { @@ -135,7 +135,7 @@ public class SeriesEditorDialog extends JDialog //exitAction.putValue(Action.SHORT_DESCRIPTION, "Exit"); paste.putValue(Action.NAME, "Paste"); paste.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("smallPaste.png")); - //paste.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_MASK)); + //paste.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_V, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); AbstractAction delete = new AbstractAction() { @@ -443,9 +443,9 @@ public class SeriesEditorDialog extends JDialog InputMap im = this.table.getInputMap(); ActionMap am = this.table.getActionMap(); - im.put(KeyStroke.getKeyStroke(KeyEvent.VK_X, InputEvent.CTRL_MASK), "cut"); - im.put(KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK), "copy"); - im.put(KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_MASK), "paste"); + im.put(KeyStroke.getKeyStroke(KeyEvent.VK_X, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), "cut"); + im.put(KeyStroke.getKeyStroke(KeyEvent.VK_C, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), "copy"); + im.put(KeyStroke.getKeyStroke(KeyEvent.VK_V, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), "paste"); im.put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), "delete"); am.put("cut", cut); diff --git a/prism/src/userinterface/model/GUIMultiModel.java b/prism/src/userinterface/model/GUIMultiModel.java index 25becdcb..629b2078 100644 --- a/prism/src/userinterface/model/GUIMultiModel.java +++ b/prism/src/userinterface/model/GUIMultiModel.java @@ -412,7 +412,7 @@ public class GUIMultiModel extends GUIPlugin implements PrismSettingsListener newPRISMModel.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_P)); newPRISMModel.putValue(Action.NAME, "PRISM model"); newPRISMModel.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("smallFilePrism.png")); - newPRISMModel.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_N, InputEvent.CTRL_MASK)); + newPRISMModel.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_N, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); newGraphicModel = new AbstractAction() { @@ -459,7 +459,7 @@ public class GUIMultiModel extends GUIPlugin implements PrismSettingsListener loadModel.putValue(Action.NAME, "Open model..."); //loadModel.putValue(Action.ACTION_COMMAND_KEY, loadModel.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("smallOpen.png")); - loadModel.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_O, InputEvent.CTRL_MASK)); + loadModel.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_O, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); reloadModel = new AbstractAction() { @@ -474,7 +474,7 @@ public class GUIMultiModel extends GUIPlugin implements PrismSettingsListener reloadModel.putValue(Action.NAME, "Reload model"); //loadModel.putValue(Action.ACTION_COMMAND_KEY, reloadModel.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("smallReload.png")); - reloadModel.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_R, InputEvent.CTRL_MASK)); + reloadModel.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_R, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); saveModel = new AbstractAction() { @@ -487,7 +487,7 @@ public class GUIMultiModel extends GUIPlugin implements PrismSettingsListener //saveModel.putValue(Action.SHORT_DESCRIPTION, "Save Model"); saveModel.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_S)); saveModel.putValue(Action.NAME, "Save model"); - saveModel.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_MASK)); + saveModel.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_S, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); //saveModel.putValue(Action.ACTION_COMMAND_KEY, saveModel.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("smallSave.png")); diff --git a/prism/src/userinterface/model/GUITextModelEditor.java b/prism/src/userinterface/model/GUITextModelEditor.java index df41fe4f..e7377868 100644 --- a/prism/src/userinterface/model/GUITextModelEditor.java +++ b/prism/src/userinterface/model/GUITextModelEditor.java @@ -219,15 +219,15 @@ public class GUITextModelEditor extends GUIModelEditor implements DocumentListen InputMap inputMap = editor.getInputMap(); inputMap.clear(); - inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_Z, java.awt.event.InputEvent.CTRL_MASK), "prism_undo"); - inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_Z, java.awt.event.InputEvent.CTRL_MASK), "prism_undo"); - inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_Y, java.awt.event.InputEvent.CTRL_MASK), "prism_redo"); - inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_A, java.awt.event.InputEvent.CTRL_MASK), "prism_selectall"); - inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_D, java.awt.event.InputEvent.CTRL_MASK), "prism_delete"); - inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_X, java.awt.event.InputEvent.CTRL_MASK), "prism_cut"); - inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_Z, java.awt.event.InputEvent.CTRL_MASK | java.awt.event.InputEvent.SHIFT_MASK), "prism_redo"); - inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_V, java.awt.event.InputEvent.CTRL_MASK), "prism_paste"); - inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_E, java.awt.event.InputEvent.CTRL_MASK), "prism_jumperr"); + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_Z, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), "prism_undo"); + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_Z, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), "prism_undo"); + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_Y, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), "prism_redo"); + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_A, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), "prism_selectall"); + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_D, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), "prism_delete"); + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_X, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), "prism_cut"); + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_Z, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | java.awt.event.InputEvent.SHIFT_MASK), "prism_redo"); + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_V, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), "prism_paste"); + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_E, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), "prism_jumperr"); ActionMap actionMap = editor.getActionMap(); actionMap.put("prism_undo", GUIPrism.getClipboardPlugin().getUndoAction()); @@ -347,7 +347,7 @@ public class GUITextModelEditor extends GUIModelEditor implements DocumentListen actionJumpToError.putValue(Action.NAME, "Jump to error"); actionJumpToError.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("tinyError.png")); - actionJumpToError.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_MASK)); + actionJumpToError.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_E, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); // search and replace action @@ -372,7 +372,7 @@ public class GUITextModelEditor extends GUIModelEditor implements DocumentListen actionSearch.putValue(Action.LONG_DESCRIPTION, "Opens a find and replace dialog."); //actionSearch.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("find.png")); actionSearch.putValue(Action.NAME, "Find/Replace"); - //actionSearch.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_R, InputEvent.CTRL_MASK)); + //actionSearch.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_R, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); insertDTMC = new AbstractAction() { public void actionPerformed(ActionEvent ae) { diff --git a/prism/src/userinterface/properties/GUIMultiProperties.java b/prism/src/userinterface/properties/GUIMultiProperties.java index 7fc95aef..601766d7 100644 --- a/prism/src/userinterface/properties/GUIMultiProperties.java +++ b/prism/src/userinterface/properties/GUIMultiProperties.java @@ -1632,7 +1632,7 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List newProps.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_N)); newProps.putValue(Action.NAME, "New properties list"); newProps.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("smallNew.png")); - newProps.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_N, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK)); + newProps.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_N, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK)); openProps = new AbstractAction() { @@ -1646,7 +1646,7 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List openProps.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_O)); openProps.putValue(Action.NAME, "Open properties list..."); openProps.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("smallOpen.png")); - openProps.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_O, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK)); + openProps.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_O, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK)); saveProps = new AbstractAction() { @@ -1661,7 +1661,7 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List saveProps.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_S)); saveProps.putValue(Action.NAME, "Save properties list"); saveProps.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("smallSave.png")); - saveProps.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK)); + saveProps.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_S, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK)); savePropsAs = new AbstractAction() { diff --git a/prism/src/userinterface/properties/GUIPropertiesList.java b/prism/src/userinterface/properties/GUIPropertiesList.java index 22f2482d..7fa0e39c 100644 --- a/prism/src/userinterface/properties/GUIPropertiesList.java +++ b/prism/src/userinterface/properties/GUIPropertiesList.java @@ -70,7 +70,7 @@ public class GUIPropertiesList extends JList implements KeyListener addKeyListener(this); setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); - getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK), "none"); + getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_C, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), "none"); } /** Override set font to update row heights at same time */ diff --git a/prism/src/userinterface/simulator/networking/GUINetworkEditor.java b/prism/src/userinterface/simulator/networking/GUINetworkEditor.java index 6d704ff6..5c99bb5e 100644 --- a/prism/src/userinterface/simulator/networking/GUINetworkEditor.java +++ b/prism/src/userinterface/simulator/networking/GUINetworkEditor.java @@ -577,7 +577,7 @@ public class GUINetworkEditor extends JDialog implements TreeSelectionListener, cut.putValue(Action.NAME, "Cut"); cut.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_T)); cut.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("smallCut.png")); - cut.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_X, InputEvent.CTRL_MASK)); + cut.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_X, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); copy = new AbstractAction() { @@ -591,7 +591,7 @@ public class GUINetworkEditor extends JDialog implements TreeSelectionListener, copy.putValue(Action.NAME, "Copy"); copy.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_C)); copy.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("smallCopy.png")); - copy.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK)); + copy.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_C, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); paste = new AbstractAction() { @@ -605,7 +605,7 @@ public class GUINetworkEditor extends JDialog implements TreeSelectionListener, paste.putValue(Action.NAME, "Paste"); paste.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_P)); paste.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("smallPaste.png")); - paste.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_MASK)); + paste.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_V, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); delete = new AbstractAction() { @@ -711,7 +711,7 @@ public class GUINetworkEditor extends JDialog implements TreeSelectionListener, save.putValue(Action.NAME, "Save Profile"); save.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_S)); save.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("smallSave.png")); - save.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_MASK)); + save.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_S, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); saveAs = new AbstractAction() { @@ -725,7 +725,7 @@ public class GUINetworkEditor extends JDialog implements TreeSelectionListener, saveAs.putValue(Action.NAME, "Save Profile As..."); saveAs.putValue(Action.MNEMONIC_KEY, new Integer(KeyEvent.VK_S)); saveAs.putValue(Action.SMALL_ICON, GUIPrism.getIconFromImage("smallSaveAs.png")); - saveAs.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_A, InputEvent.CTRL_MASK)); + saveAs.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_A, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); close = new AbstractAction() {