Index: trunk/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java (revision 4971) +++ trunk/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java (revision 4971) @@ -0,0 +1,382 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.preferences; + +import java.awt.Dimension; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.Toolkit; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.KeyEvent; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.HashMap; +import java.util.Map; + +import java.util.regex.PatternSyntaxException; +import javax.swing.AbstractAction; +import javax.swing.BorderFactory; +import javax.swing.BoxLayout; +import javax.swing.DefaultComboBoxModel; +import javax.swing.JCheckBox; +import javax.swing.JComboBox; +import javax.swing.JEditorPane; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTabbedPane; +import javax.swing.JTable; +import javax.swing.JTextField; +import javax.swing.KeyStroke; +import javax.swing.ListSelectionModel; +import javax.swing.RowFilter; +import javax.swing.SwingConstants; +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import javax.swing.table.AbstractTableModel; +import javax.swing.table.TableModel; + +import javax.swing.table.TableRowSorter; +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator; +import org.openstreetmap.josm.tools.Shortcut; + +/** + * This is the keyboard preferences content. + * If someone wants to merge it with ShortcutPreference.java, feel free. + */ +public class PrefJPanel extends JPanel { + + // table of shortcuts + private AbstractTableModel model; + // comboboxes of modifier groups, mapping selectedIndex to real data + private static int[] modifInts = new int[]{ + -1, + 0, + KeyEvent.SHIFT_DOWN_MASK, + KeyEvent.CTRL_DOWN_MASK, + KeyEvent.ALT_DOWN_MASK, + KeyEvent.META_DOWN_MASK, + KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK, + KeyEvent.ALT_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK, + KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK, + KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK, + KeyEvent.CTRL_DOWN_MASK | KeyEvent.META_DOWN_MASK, + KeyEvent.ALT_DOWN_MASK | KeyEvent.META_DOWN_MASK, + KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK | KeyEvent.ALT_DOWN_MASK, + KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK | KeyEvent.ALT_DOWN_MASK + }; + // and here are the texts fro the comboboxes + private static String[] modifList = new String[] { + tr("disabled"), + tr("no modifier"), + KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[2]).getModifiers()), + KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[3]).getModifiers()), + KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[4]).getModifiers()), + KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[5]).getModifiers()), + KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[6]).getModifiers()), + KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[7]).getModifiers()), + KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[8]).getModifiers()), + KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[9]).getModifiers()), + KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[10]).getModifiers()), + KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[11]).getModifiers()), + KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[12]).getModifiers()), + KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, modifInts[13]).getModifiers()) + }; + // this are the display(!) texts for the checkboxes. Let the JVM do the i18n for us . + // Ok, there's a real reason for this: The JVM should know best how the keys are labelled + // on the physical keyboard. What language pack is installed in JOSM is completely + // independent from the keyboard's labelling. But the operation system's locale + // usually matches the keyboard. This even works with my English Windows and my German + // keyboard. + private static String SHIFT = KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, KeyEvent.SHIFT_DOWN_MASK).getModifiers()); + private static String CTRL = KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, KeyEvent.CTRL_DOWN_MASK).getModifiers()); + private static String ALT = KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, KeyEvent.ALT_DOWN_MASK).getModifiers()); + private static String META = KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A, KeyEvent.META_DOWN_MASK).getModifiers()); + + // A list of keys to present the user. Sadly this really is a list of keys Java knows about, + // not a list of real physical keys. If someone knows how to get that list? + private static Map keyList = setKeyList(); + + private static Map setKeyList() { + Map list = new LinkedHashMap(); + String unknown = Toolkit.getProperty("AWT.unknown", "Unknown"); + // Assume all known keys are declared in KeyEvent as "public static int VK_*" + for (Field field : KeyEvent.class.getFields()) { + if (field.getName().startsWith("VK_")) { + try { + int i = field.getInt(null); + String s = KeyEvent.getKeyText(i); + if (s != null && s.length() > 0 && !s.contains(unknown)) { + list.put(Integer.valueOf(i), s); + //System.out.println(i+": "+s); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + } + list.put(Integer.valueOf(-1), ""); + return list; + } + + private JCheckBox cbAlt = new JCheckBox(); + private JCheckBox cbCtrl = new JCheckBox(); + private JCheckBox cbMeta = new JCheckBox(); + private JCheckBox cbShift = new JCheckBox(); + private JCheckBox cbDefault = new JCheckBox(); + private JCheckBox cbDisable = new JCheckBox(); + private JComboBox tfKey = new JComboBox(); + + JTable shortcutTable = new JTable(); + + private JTextField filterField = new JTextField(); + + /** Creates new form prefJPanel */ + // Ain't those auto-generated comments helpful or what? + public PrefJPanel(AbstractTableModel model) { + this.model = model; + initComponents(); + } + + private void initComponents() { + JPanel listPane = new JPanel(); + JScrollPane listScrollPane = new JScrollPane(); + JTabbedPane prefTabPane = new JTabbedPane(); + JPanel shortcutEditPane = new JPanel(); + JPanel shortcutTab = new JPanel(); + JPanel infoTab = new JPanel(); + + CbAction action = new CbAction(this); + + setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); + + // If someone wants to move this text into some resource, feel free. + infoTab.setLayout(new BoxLayout(shortcutTab, BoxLayout.Y_AXIS)); + JEditorPane editor = new JEditorPane(); + editor.setEditable(false); + editor.setContentType("text/html"); + editor.setText( + tr("

Keyboard Shortcuts

")+ + tr("
")+ + tr("

Please note that shortcut keys are assigned to the actions when JOSM is started. So you need to restart " + +"JOSM to see your changes.

")+ + tr("
")+ + tr("

Furthermore, the shortcuts are activated when the actions are assigned to a menu entry of a button for the first " + +"time. So some of your changes may become active even without restart --- but also without collision handling. " + +"This is another reason to restart JOSM after making any changes here.

")+ + tr("
")+ + tr("

You may notice that the key selection list on the next page lists all keys that exist on all kinds of keyboards " + +"Java knows about, not just those keys that exist on your keyboard. Please only use values that correspond to " + +"a real key on your keyboard. If your keyboard has no ''Copy'' key (PC keyboard do not have them, Sun keyboards do), " + +"then do not use it. Also there are ''keys'' listed that correspond to a shortcut on your keyboard (e.g. '':''/Colon). " + +"Please do not use them either, use the base key ('';''/Semicolon on US keyboards, ''.''/Period on German keyboards, etc.) " + +"instead. Not doing so may result in conflicts, as there is no way for JOSM to know that Ctrl+Shift+; and Ctrl+: " + +"actually is the same thing on an US keyboard.

") + ); + editor.setCaretPosition(0); // scroll up + prefTabPane.addTab(tr("Read First"), new JScrollPane(editor)); + + shortcutTab.setLayout(new BoxLayout(shortcutTab, BoxLayout.Y_AXIS)); + + shortcutTab.add(buildFilterPanel()); + listPane.setLayout(new java.awt.GridLayout()); + + // This is the list of shortcuts: + shortcutTable.setModel(model); + shortcutTable.getSelectionModel().addListSelectionListener(new CbAction(this)); + shortcutTable.setFillsViewportHeight(true); + shortcutTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + shortcutTable.setAutoCreateRowSorter(true); + listScrollPane.setViewportView(shortcutTable); + + listPane.add(listScrollPane); + + shortcutTab.add(listPane); + + // and here follows the edit area. I won't object to someone re-designing it, it looks, um, "minimalistic" ;) + shortcutEditPane.setLayout(new java.awt.GridLayout(5, 2)); + + cbDefault.setAction(action); + cbDefault.setText(tr("Use default")); + cbShift.setAction(action); + cbShift.setText(SHIFT); // see above for why no tr() + cbDisable.setAction(action); + cbDisable.setText(tr("Disable")); + cbCtrl.setAction(action); + cbCtrl.setText(CTRL); // see above for why no tr() + cbAlt.setAction(action); + cbAlt.setText(ALT); // see above for why no tr() + tfKey.setAction(action); + tfKey.setModel(new DefaultComboBoxModel(keyList.values().toArray())); + cbMeta.setAction(action); + cbMeta.setText(META); // see above for why no tr() + + shortcutEditPane.add(cbDefault); + shortcutEditPane.add(new JLabel()); + shortcutEditPane.add(cbShift); + shortcutEditPane.add(cbDisable); + shortcutEditPane.add(cbCtrl); + shortcutEditPane.add(new JLabel(tr("Key:"), SwingConstants.LEFT)); + shortcutEditPane.add(cbAlt); + shortcutEditPane.add(tfKey); + shortcutEditPane.add(cbMeta); + + shortcutEditPane.add(new JLabel(tr("Attention: Use real keyboard keys only!"))); + + action.actionPerformed(null); // init checkboxes + + shortcutTab.add(shortcutEditPane); + + prefTabPane.addTab(tr("Keyboard Shortcuts"), shortcutTab); + + add(prefTabPane); + } + + private JPanel buildFilterPanel() { + // copied from PluginPreference + JPanel pnl = new JPanel(new GridBagLayout()); + pnl.setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); + GridBagConstraints gc = new GridBagConstraints(); + + gc.anchor = GridBagConstraints.NORTHWEST; + gc.fill = GridBagConstraints.HORIZONTAL; + gc.weightx = 0.0; + gc.insets = new Insets(0,0,0,5); + pnl.add(new JLabel(tr("Search:")), gc); + + gc.gridx = 1; + gc.weightx = 1.0; + pnl.add(filterField, gc); + filterField.setToolTipText(tr("Enter a search expression")); + SelectAllOnFocusGainedDecorator.decorate(filterField); + filterField.getDocument().addDocumentListener(new FilterFieldAdapter()); + pnl.setMaximumSize(new Dimension(300,10)); + return pnl; + } + + private void disableAllModifierCheckboxes() { + cbDefault.setEnabled(false); + cbDisable.setEnabled(false); + cbShift.setEnabled(false); + cbCtrl.setEnabled(false); + cbAlt.setEnabled(false); + cbMeta.setEnabled(false); + } + + // this allows to edit shortcuts. it: + // * sets the edit controls to the selected shortcut + // * enabled/disables the controls as needed + // * writes the user's changes to the shortcut + // And after I finally had it working, I realized that those two methods + // are playing ping-pong (politically correct: table tennis, I know) and + // even have some duplicated code. Feel free to refactor, If you have + // more expirience with GUI coding than I have. + private class CbAction extends AbstractAction implements ListSelectionListener { + private PrefJPanel panel; + public CbAction (PrefJPanel panel) { + this.panel = panel; + } + public void valueChanged(ListSelectionEvent e) { + ListSelectionModel lsm = panel.shortcutTable.getSelectionModel(); // can't use e here + if (!lsm.isSelectionEmpty()) { + int row = panel.shortcutTable.convertRowIndexToModel(lsm.getMinSelectionIndex()); + Shortcut sc = (Shortcut)panel.model.getValueAt(row, -1); + panel.cbDefault.setSelected(!sc.getAssignedUser()); + panel.cbDisable.setSelected(sc.getKeyStroke() == null); + panel.cbShift.setSelected(sc.getAssignedModifier() != -1 && (sc.getAssignedModifier() & KeyEvent.SHIFT_DOWN_MASK) != 0); + panel.cbCtrl.setSelected(sc.getAssignedModifier() != -1 && (sc.getAssignedModifier() & KeyEvent.CTRL_DOWN_MASK) != 0); + panel.cbAlt.setSelected(sc.getAssignedModifier() != -1 && (sc.getAssignedModifier() & KeyEvent.ALT_DOWN_MASK) != 0); + panel.cbMeta.setSelected(sc.getAssignedModifier() != -1 && (sc.getAssignedModifier() & KeyEvent.META_DOWN_MASK) != 0); + if (sc.getKeyStroke() != null) { + tfKey.setSelectedItem(keyList.get(sc.getKeyStroke().getKeyCode())); + } else { + tfKey.setSelectedItem(keyList.get(-1)); + } + if (!sc.isChangeable()) { + disableAllModifierCheckboxes(); + panel.tfKey.setEnabled(false); + } else { + panel.cbDefault.setEnabled(true); + actionPerformed(null); + } + model.fireTableCellUpdated(row, 1); + } else { + panel.disableAllModifierCheckboxes(); + panel.tfKey.setEnabled(false); + } + } + public void actionPerformed(java.awt.event.ActionEvent e) { + ListSelectionModel lsm = panel.shortcutTable.getSelectionModel(); + if (lsm != null && !lsm.isSelectionEmpty()) { + if (e != null) { // only if we've been called by a user action + int row = panel.shortcutTable.convertRowIndexToModel(lsm.getMinSelectionIndex()); + Shortcut sc = (Shortcut)panel.model.getValueAt(row, -1); + if (panel.cbDisable.isSelected()) { + sc.setAssignedModifier(-1); + } else if (panel.tfKey.getSelectedItem().equals("")) { + sc.setAssignedModifier(KeyEvent.VK_CANCEL); + } else { + sc.setAssignedModifier( + (panel.cbShift.isSelected() ? KeyEvent.SHIFT_DOWN_MASK : 0) | + (panel.cbCtrl.isSelected() ? KeyEvent.CTRL_DOWN_MASK : 0) | + (panel.cbAlt.isSelected() ? KeyEvent.ALT_DOWN_MASK : 0) | + (panel.cbMeta.isSelected() ? KeyEvent.META_DOWN_MASK : 0) + ); + for (Map.Entry entry : keyList.entrySet()) { + if (entry.getValue().equals(panel.tfKey.getSelectedItem())) { + sc.setAssignedKey(entry.getKey()); + } + } + } + sc.setAssignedUser(!panel.cbDefault.isSelected()); + valueChanged(null); + } + boolean state = !panel.cbDefault.isSelected(); + panel.cbDisable.setEnabled(state); + state = state && !panel.cbDisable.isSelected(); + panel.cbShift.setEnabled(state); + panel.cbCtrl.setEnabled(state); + panel.cbAlt.setEnabled(state); + panel.cbMeta.setEnabled(state); + panel.tfKey.setEnabled(state); + } else { + panel.disableAllModifierCheckboxes(); + panel.tfKey.setEnabled(false); + } + } + } + + class FilterFieldAdapter implements DocumentListener { + public void filter() { + String expr = filterField.getText().trim(); + if (expr.length()==0) { expr=null; } + try { + final TableRowSorter sorter = + ((TableRowSorter )shortcutTable.getRowSorter()); + if (expr == null) { + sorter.setRowFilter(null); + } else { + // split search string on whitespace, do case-insensitive AND search + ArrayList> andFilters = new ArrayList>(); + for (String word : expr.split("\\s+")) { + andFilters.add(RowFilter.regexFilter("(?i)" + word)); + } + sorter.setRowFilter(RowFilter.andFilter(andFilters)); + } + } + catch (PatternSyntaxException ex) { } + catch (ClassCastException ex2) { /* eliminate warning */ } + } + + public void changedUpdate(DocumentEvent arg0) { filter(); } + public void insertUpdate(DocumentEvent arg0) { filter(); } + public void removeUpdate(DocumentEvent arg0) { filter(); } + } + +} Index: trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 4970) +++ trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 4971) @@ -126,16 +126,4 @@ } - private JComboBox bxPrim1 = new JComboBox(); - private JComboBox bxPrim2 = new JComboBox(); - private JComboBox bxPrim3 = new JComboBox(); - private JComboBox bxPrim4 = new JComboBox(); - private JComboBox bxSec1 = new JComboBox(); - private JComboBox bxSec2 = new JComboBox(); - private JComboBox bxSec3 = new JComboBox(); - private JComboBox bxSec4 = new JComboBox(); - private JComboBox bxTer1 = new JComboBox(); - private JComboBox bxTer2 = new JComboBox(); - private JComboBox bxTer3 = new JComboBox(); - private JComboBox bxTer4 = new JComboBox(); private JCheckBox cbAlt = new JCheckBox(); private JCheckBox cbCtrl = new JCheckBox(); @@ -158,19 +146,12 @@ private void initComponents() { - JPanel editGroupPane = new JPanel(); - JPanel hotkeyGroupPane = new JPanel(); - JPanel listPane = new JPanel(); JScrollPane listScrollPane = new JScrollPane(); - JPanel menuGroupPane = new JPanel(); - JPanel modifierTab = new JPanel(); JTabbedPane prefTabPane = new JTabbedPane(); JPanel shortcutEditPane = new JPanel(); JPanel shortcutTab = new JPanel(); - JPanel subwindowGroupPane = new JPanel(); JPanel infoTab = new JPanel(); CbAction action = new CbAction(this); - BxAction action2 = new BxAction(); setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); @@ -183,22 +164,19 @@ editor.setText( tr("

Keyboard Shortcuts

")+ + tr("
")+ tr("

Please note that shortcut keys are assigned to the actions when JOSM is started. So you need to restart " - +"JOSM to see your changes.

")+ - tr("

Furthermore, the shortcuts are activated when the actions are assigned to a menu entry of a button for the first " - +"time. So some of your changes may become active even without restart --- but also without collision handling. " - +"This is another reason to restart JOSM after making any changes here.

")+ - tr("

You may notice that the key selection list on the next page lists all keys that exist on all kinds of keyboards " - +"Java knows about, not just those keys that exist on your keyboard. Please only use values that correspond to " - +"a real key on your keyboard. If your keyboard has no ''Copy'' key (PC keyboard do not have them, Sun keyboards do), " - +"then do not use it. Also there are ''keys'' listed that correspond to a shortcut on your keyboard (e.g. '':''/Colon). " - +"Please do not use them either, use the base key ('';''/Semicolon on US keyboards, ''.''/Period on German keyboards, etc.) " - +"instead. Not doing so may result in conflicts, as there is no way for JOSM to know that Ctrl+Shift+; and Ctrl+: " - +"actually is the same thing on an US keyboard.

")+ - tr("

Modifier Groups

")+ - tr("

The last page lists the modifier keys JOSM will automatically assign to shortcuts. For every of the four kinds " - +"of shortcuts there are three alternatives. JOSM will try those alternatives in the listed order when managing a " - +"conflict. If all alternatives result in shortcuts that are already taken, it will assign a random shortcut " - +"instead.

")+ - tr("

The pseudo-modifier ''disabled'' will disable the shortcut when encountered.

") + +"JOSM to see your changes.

")+ + tr("
")+ + tr("

Furthermore, the shortcuts are activated when the actions are assigned to a menu entry of a button for the first " + +"time. So some of your changes may become active even without restart --- but also without collision handling. " + +"This is another reason to restart JOSM after making any changes here.

")+ + tr("
")+ + tr("

You may notice that the key selection list on the next page lists all keys that exist on all kinds of keyboards " + +"Java knows about, not just those keys that exist on your keyboard. Please only use values that correspond to " + +"a real key on your keyboard. If your keyboard has no ''Copy'' key (PC keyboard do not have them, Sun keyboards do), " + +"then do not use it. Also there are ''keys'' listed that correspond to a shortcut on your keyboard (e.g. '':''/Colon). " + +"Please do not use them either, use the base key ('';''/Semicolon on US keyboards, ''.''/Period on German keyboards, etc.) " + +"instead. Not doing so may result in conflicts, as there is no way for JOSM to know that Ctrl+Shift+; and Ctrl+: " + +"actually is the same thing on an US keyboard.

") ); editor.setCaretPosition(0); // scroll up @@ -240,5 +218,4 @@ cbMeta.setText(META); // see above for why no tr() - shortcutEditPane.add(cbDefault); shortcutEditPane.add(new JLabel()); @@ -258,61 +235,4 @@ prefTabPane.addTab(tr("Keyboard Shortcuts"), shortcutTab); - - // next is the modfier group tab. - // Would be a nice array if I had done it by hand. But then, it would be finished next year or so... - modifierTab.setLayout(new java.awt.GridLayout(0, 1)); - JScrollPane modifierScroller = new JScrollPane(modifierTab); - - editGroupPane.setBorder(BorderFactory.createTitledBorder(tr("Edit Shortcuts"))); - editGroupPane.setLayout(new java.awt.GridLayout(3, 5)); - - JComboBox[] bxArray = new JComboBox[] { - bxPrim1,bxSec1,bxTer1,bxPrim2,bxSec2,bxTer2, - bxPrim3,bxSec3,bxTer3,bxPrim4,bxSec4,bxTer4}; - for (JComboBox bxi: bxArray) bxi.setModel(new DefaultComboBoxModel(modifList)); - - editGroupPane.add(new JLabel(tr("Primary modifier:"))); - editGroupPane.add(bxPrim1); - editGroupPane.add(new JLabel(tr("Secondary modifier:"))); - editGroupPane.add(bxSec1); - editGroupPane.add(new JLabel(tr("Tertiary modifier:"))); - editGroupPane.add(bxTer1); - modifierTab.add(editGroupPane); - - menuGroupPane.setBorder(BorderFactory.createTitledBorder(tr("Menu Shortcuts"))); - menuGroupPane.setLayout(new java.awt.GridLayout(3, 5)); - menuGroupPane.add(new JLabel(tr("Primary modifier:"))); - menuGroupPane.add(bxPrim2); - menuGroupPane.add(new JLabel(tr("Secondary modifier:"))); - menuGroupPane.add(bxSec2); - menuGroupPane.add(new JLabel(tr("Tertiary modifier:"))); - menuGroupPane.add(bxTer2); - modifierTab.add(menuGroupPane); - - hotkeyGroupPane.setBorder(BorderFactory.createTitledBorder(tr("Hotkey Shortcuts"))); - hotkeyGroupPane.setLayout(new java.awt.GridLayout(3, 5)); - hotkeyGroupPane.add(new JLabel(tr("Primary modifier:"))); - hotkeyGroupPane.add(bxPrim3); - hotkeyGroupPane.add(new JLabel((tr("Secondary modifier:")))); - hotkeyGroupPane.add(bxSec3); - hotkeyGroupPane.add(new JLabel(tr("Tertiary modifier:"))); - hotkeyGroupPane.add(bxTer3); - modifierTab.add(hotkeyGroupPane); - - subwindowGroupPane.setBorder(BorderFactory.createTitledBorder(tr("Subwindow Shortcuts"))); - subwindowGroupPane.setLayout(new java.awt.GridLayout(3, 5)); - subwindowGroupPane.add(new JLabel(tr("Primary modifier:"))); - subwindowGroupPane.add(bxPrim4); - subwindowGroupPane.add(new JLabel(tr("Secondary modifier:"))); - subwindowGroupPane.add(bxSec4); - subwindowGroupPane.add(new JLabel(tr("Tertiary modifier:"))); - subwindowGroupPane.add(bxTer4); - - initbx(); - for (JComboBox bxi: bxArray) bxi.setAction(action2); - - modifierTab.add(subwindowGroupPane); - - prefTabPane.addTab(tr("Modifier Groups"), modifierScroller); add(prefTabPane); @@ -433,54 +353,5 @@ } - // this handles the modifier groups - private class BxAction extends AbstractAction { - public void actionPerformed(java.awt.event.ActionEvent e) { - Main.pref.putInteger("shortcut.groups."+(Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_EDIT), modifInts[bxPrim1.getSelectedIndex()]); - Main.pref.putInteger("shortcut.groups."+(Shortcut.GROUPS_ALT1 +Shortcut.GROUP_EDIT), modifInts[ bxSec1.getSelectedIndex()]); - Main.pref.putInteger("shortcut.groups."+(Shortcut.GROUPS_ALT2 +Shortcut.GROUP_EDIT), modifInts[ bxTer1.getSelectedIndex()]); - - Main.pref.putInteger("shortcut.groups."+(Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_MENU), modifInts[bxPrim2.getSelectedIndex()]); - Main.pref.putInteger("shortcut.groups."+(Shortcut.GROUPS_ALT1 +Shortcut.GROUP_MENU), modifInts[ bxSec2.getSelectedIndex()]); - Main.pref.putInteger("shortcut.groups."+(Shortcut.GROUPS_ALT2 +Shortcut.GROUP_MENU), modifInts[ bxTer2.getSelectedIndex()]); - - Main.pref.putInteger("shortcut.groups."+(Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_HOTKEY), modifInts[bxPrim3.getSelectedIndex()]); - Main.pref.putInteger("shortcut.groups."+(Shortcut.GROUPS_ALT1 +Shortcut.GROUP_HOTKEY), modifInts[ bxSec3.getSelectedIndex()]); - Main.pref.putInteger("shortcut.groups."+(Shortcut.GROUPS_ALT2 +Shortcut.GROUP_HOTKEY), modifInts[ bxTer3.getSelectedIndex()]); - - Main.pref.putInteger("shortcut.groups."+(Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_LAYER), modifInts[bxPrim4.getSelectedIndex()]); - Main.pref.putInteger("shortcut.groups."+(Shortcut.GROUPS_ALT1 +Shortcut.GROUP_LAYER), modifInts[ bxSec4.getSelectedIndex()]); - Main.pref.putInteger("shortcut.groups."+(Shortcut.GROUPS_ALT2 +Shortcut.GROUP_LAYER), modifInts[ bxTer4.getSelectedIndex()]); - } - } - - private void initbx() { - HashMap groups = Main.platform.initShortcutGroups(false); - setBx(bxPrim1, groups, Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_EDIT); - setBx(bxSec1, groups, Shortcut.GROUPS_ALT1 +Shortcut.GROUP_EDIT); - setBx(bxTer1, groups, Shortcut.GROUPS_ALT2 +Shortcut.GROUP_EDIT); - - setBx(bxPrim2, groups, Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_MENU); - setBx(bxSec2, groups, Shortcut.GROUPS_ALT1 +Shortcut.GROUP_MENU); - setBx(bxTer2, groups, Shortcut.GROUPS_ALT2 +Shortcut.GROUP_MENU); - - setBx(bxPrim3, groups, Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_HOTKEY); - setBx(bxSec3, groups, Shortcut.GROUPS_ALT1 +Shortcut.GROUP_HOTKEY); - setBx(bxTer3, groups, Shortcut.GROUPS_ALT2 +Shortcut.GROUP_HOTKEY); - - setBx(bxPrim4, groups, Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_LAYER); - setBx(bxSec4, groups, Shortcut.GROUPS_ALT1 +Shortcut.GROUP_LAYER); - setBx(bxTer4, groups, Shortcut.GROUPS_ALT2 +Shortcut.GROUP_LAYER); - } - private void setBx(JComboBox bx, HashMap groups, int key) { - int target = Main.pref.getInteger("shortcut.groups."+key, groups.get(key)); - for (int i = 0; i < modifInts.length; i++) { - if (modifInts[i] == target) { - bx.setSelectedIndex(i); - } - } - } - - - class FilterFieldAdapter implements DocumentListener { + class FilterFieldAdapter implements DocumentListener { public void filter() { String expr = filterField.getText().trim(); Index: trunk/src/org/openstreetmap/josm/tools/PlatformHook.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/PlatformHook.java (revision 4970) +++ trunk/src/org/openstreetmap/josm/tools/PlatformHook.java (revision 4971) @@ -54,19 +54,4 @@ /** - * The initShortcutGroups hook will be called by the - * Shortcut class if it detects that there are no - * groups in teh config file. So that will happen - * once on each JOSM installation only. - * - * Please note that ShorCut will load its config on demand, - * that is, at the moment the first shortcut is registered. - * - * In this hook, you have to fill the preferences with - * data, not the internal structures! Also, do not try - * to register any shortcuts from within. - */ - public HashMap initShortcutGroups(boolean load); - - /** * The initSystemShortcuts hook will be called by the * Shortcut class after the modifier groups have been read Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java (revision 4970) +++ trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java (revision 4971) @@ -70,41 +70,4 @@ // Ain't that KISS? Runtime.getRuntime().exec("open " + url); - } - @Override - public HashMap initShortcutGroups(boolean load) { - HashMap groups = new HashMap(); - - // Everything but Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_MENU is guesswork. - setupGroup(groups, load, Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_NONE, -1); - setupGroup(groups, load, Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_HOTKEY, KeyEvent.CTRL_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_MENU, KeyEvent.META_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_EDIT, 0); - setupGroup(groups, load, Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_LAYER, KeyEvent.ALT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_DIRECT, 0); - setupGroup(groups, load, Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_MNEMONIC,KeyEvent.ALT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_DIRECT2, KeyEvent.ALT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_DIRECT3, KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); - - setupGroup(groups, load, Shortcut.GROUPS_ALT1+Shortcut.GROUP_NONE, -1); - setupGroup(groups, load, Shortcut.GROUPS_ALT1+Shortcut.GROUP_HOTKEY, KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT1+Shortcut.GROUP_MENU, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT, KeyEvent.SHIFT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT1+Shortcut.GROUP_LAYER, KeyEvent.ALT_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT, KeyEvent.SHIFT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT1+Shortcut.GROUP_MNEMONIC, KeyEvent.ALT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT2, KeyEvent.ALT_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT3, KeyEvent.ALT_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); - - setupGroup(groups, load, Shortcut.GROUPS_ALT2+Shortcut.GROUP_NONE, -1); - setupGroup(groups, load, Shortcut.GROUPS_ALT2+Shortcut.GROUP_HOTKEY, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT2+Shortcut.GROUP_MENU, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT2+Shortcut.GROUP_EDIT, KeyEvent.ALT_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT2+Shortcut.GROUP_LAYER, KeyEvent.SHIFT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT2+Shortcut.GROUP_DIRECT, KeyEvent.CTRL_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT2+Shortcut.GROUP_MNEMONIC, KeyEvent.ALT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT2+Shortcut.GROUP_DIRECT2, KeyEvent.ALT_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT2+Shortcut.GROUP_DIRECT3, KeyEvent.META_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK); - - return groups; } Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (revision 4970) +++ trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (revision 4971) @@ -37,48 +37,4 @@ } } - } - - protected void setupGroup(HashMap groups, boolean load, int group, int value) { - if(load) - groups.put(group, Main.pref.getInteger("shortcut.groups."+group, value)); - else - groups.put(group, value); - } - - @Override - public HashMap initShortcutGroups(boolean load) { - HashMap groups = new HashMap(); - - setupGroup(groups, load, Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_NONE, -1); - setupGroup(groups, load, Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_HOTKEY, KeyEvent.CTRL_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_MENU, KeyEvent.CTRL_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_EDIT, 0); - setupGroup(groups, load, Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_LAYER, KeyEvent.ALT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_DIRECT, 0); - setupGroup(groups, load, Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_MNEMONIC,KeyEvent.ALT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_DIRECT2, KeyEvent.ALT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_DEFAULT+Shortcut.GROUP_DIRECT3, KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); - - setupGroup(groups, load, Shortcut.GROUPS_ALT1+Shortcut.GROUP_NONE, -1); - setupGroup(groups, load, Shortcut.GROUPS_ALT1+Shortcut.GROUP_HOTKEY, KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT1+Shortcut.GROUP_MENU, KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT, KeyEvent.SHIFT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT1+Shortcut.GROUP_LAYER, KeyEvent.ALT_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT, KeyEvent.SHIFT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT1+Shortcut.GROUP_MNEMONIC, KeyEvent.ALT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT2, KeyEvent.ALT_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT3, KeyEvent.ALT_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); - - setupGroup(groups, load, Shortcut.GROUPS_ALT2+Shortcut.GROUP_NONE, -1); - setupGroup(groups, load, Shortcut.GROUPS_ALT2+Shortcut.GROUP_HOTKEY, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT2+Shortcut.GROUP_MENU, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT2+Shortcut.GROUP_EDIT, KeyEvent.ALT_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT2+Shortcut.GROUP_LAYER, KeyEvent.SHIFT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT2+Shortcut.GROUP_DIRECT, KeyEvent.CTRL_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT2+Shortcut.GROUP_MNEMONIC, KeyEvent.ALT_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT2+Shortcut.GROUP_DIRECT2, KeyEvent.ALT_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK); - setupGroup(groups, load, Shortcut.GROUPS_ALT2+Shortcut.GROUP_DIRECT3, KeyEvent.META_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK); - - return groups; } Index: trunk/src/org/openstreetmap/josm/tools/Shortcut.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/Shortcut.java (revision 4970) +++ trunk/src/org/openstreetmap/josm/tools/Shortcut.java (revision 4971) @@ -37,6 +37,4 @@ */ public class Shortcut { - @Deprecated - public static final int SHIFT_DEFAULT = 1; private String shortText; // the unique ID of the shortcut private String longText; // a human readable description that will be shown in the preferences @@ -160,5 +158,5 @@ private boolean isSame(int isKey, int isModifier) { // -1 --- an unassigned shortcut is different from any other shortcut - return( isKey == assignedKey && isModifier == assignedModifier && assignedModifier != getGroupModifier(GROUP_NONE)); + return( isKey == assignedKey && isModifier == assignedModifier && assignedModifier != getGroupModifier(NONE)); } @@ -176,8 +174,8 @@ } - private void saveDefault(int modifier) { + private void saveDefault() { Main.pref.getCollection("shortcut.entry."+shortText, Arrays.asList(new String[]{longText, String.valueOf(requestedKey), String.valueOf(requestedGroup), String.valueOf(requestedKey), - String.valueOf(modifier), String.valueOf(true), String.valueOf(false)})); + String.valueOf(getGroupModifier(requestedGroup)), String.valueOf(true), String.valueOf(false)})); } @@ -246,5 +244,5 @@ // and here our modifier groups - private static Map groups; + private static Map groups= new HashMap(); // check if something collides with an existing shortcut @@ -273,57 +271,30 @@ } - // try to find an unused shortcut - private static Shortcut findRandomShortcut(String shortText, String longText, int requestedKey, int requestedGroup) { - int[] mods = {getGroupModifier(requestedGroup + GROUPS_DEFAULT), getGroupModifier(requestedGroup + GROUPS_ALT1), getGroupModifier(requestedGroup + GROUPS_ALT2)}; - for (int m : mods) { - for (int k = KeyEvent.VK_A; k < KeyEvent.VK_Z; k++) { // we'll limit ourself to 100% safe keys - if ( findShortcut(k, m) == null ) - return new Shortcut(shortText, longText, requestedKey, requestedGroup, k, m, false, false); - } - } - return new Shortcut(shortText, longText, requestedKey, requestedGroup, requestedKey, getGroupModifier(GROUP_NONE), false, false); - } - - // use these constants to request shortcuts - /** - * no shortcut. - */ - public static final int GROUP_NONE = 0; - /** - * a button action, will use another modifier than MENU on system with a meta key. - */ - public static final int GROUP_HOTKEY = 1; - /** - * a menu action, e.g. "ctrl-e" (export). - */ - public static final int GROUP_MENU = 2; - /** - * direct edit key, e.g. "a" (add). - */ - public static final int GROUP_EDIT = 3; - /** - * toggle one of the right-hand-side windows, e.g. "alt-l" (layers). - */ - public static final int GROUP_LAYER = 4; - /** - * for non-letter keys, preferable without modifier, e.g. F5. - */ - public static final int GROUP_DIRECT = 5; - /** - * for use with {@see #setMnemonic} only! - */ - public static final int GROUP_MNEMONIC = 6; - /** - * for direct access, with alt modifier. - */ - public static final int GROUP_DIRECT2 = 7; - /** - * for direct access, remaining modifiers. - */ - public static final int GROUP_DIRECT3 = 8; - public static final int GROUP_RESERVED = 1000; - public static final int GROUPS_DEFAULT = 0; - public static final int GROUPS_ALT1 = 100; - public static final int GROUPS_ALT2 = 200; + public static final int NONE = 5000; + public static final int MNEMONIC = 5001; + public static final int RESERVED = 5002; + public static final int DIRECT = 5003; + public static final int ALT = 5004; + public static final int SHIFT = 5005; + public static final int CTRL = 5006; + public static final int ALT_SHIFT = 5007; + public static final int ALT_CTRL = 5008; + public static final int CTRL_SHIFT = 5009; + public static final int ALT_CTRL_SHIFT = 5010; + + /* old */ + @Deprecated public static final int GROUP_NONE = 0; + @Deprecated public static final int GROUP_HOTKEY = 1; + @Deprecated public static final int GROUP_MENU = 2; + @Deprecated public static final int GROUP_EDIT = 3; + @Deprecated public static final int GROUP_LAYER = 4; + @Deprecated public static final int GROUP_DIRECT = 5; + @Deprecated public static final int GROUP_MNEMONIC = 6; + @Deprecated public static final int GROUP_DIRECT2 = 7; + @Deprecated public static final int GROUP_DIRECT3 = 8; + @Deprecated public static final int GROUPS_DEFAULT = 0; + @Deprecated public static final int GROUPS_ALT1 = 100; + @Deprecated public static final int GROUPS_ALT2 = 200; + @Deprecated public static final int SHIFT_DEFAULT = 1; // bootstrap @@ -332,5 +303,46 @@ if (initdone) return; initdone = true; - groups = Main.platform.initShortcutGroups(true); + groups.put(NONE, -1); + groups.put(MNEMONIC, KeyEvent.ALT_DOWN_MASK); + groups.put(DIRECT, 0); + groups.put(ALT, KeyEvent.ALT_DOWN_MASK); + groups.put(SHIFT, KeyEvent.SHIFT_DOWN_MASK); + groups.put(CTRL, KeyEvent.CTRL_DOWN_MASK); + groups.put(ALT_SHIFT, KeyEvent.ALT_DOWN_MASK|KeyEvent.SHIFT_DOWN_MASK); + groups.put(ALT_CTRL, KeyEvent.ALT_DOWN_MASK|KeyEvent.CTRL_DOWN_MASK); + groups.put(CTRL_SHIFT, KeyEvent.CTRL_DOWN_MASK|KeyEvent.SHIFT_DOWN_MASK); + groups.put(ALT_CTRL_SHIFT, KeyEvent.ALT_DOWN_MASK|KeyEvent.CTRL_DOWN_MASK|KeyEvent.SHIFT_DOWN_MASK); + + /* old */ + groups.put(GROUPS_DEFAULT+GROUP_NONE, -1); + groups.put(GROUPS_DEFAULT+GROUP_HOTKEY, KeyEvent.CTRL_DOWN_MASK); + groups.put(GROUPS_DEFAULT+GROUP_MENU, KeyEvent.CTRL_DOWN_MASK); + groups.put(GROUPS_DEFAULT+GROUP_EDIT, 0); + groups.put(GROUPS_DEFAULT+GROUP_LAYER, KeyEvent.ALT_DOWN_MASK); + groups.put(GROUPS_DEFAULT+GROUP_DIRECT, 0); + groups.put(GROUPS_DEFAULT+GROUP_MNEMONIC,KeyEvent.ALT_DOWN_MASK); + groups.put(GROUPS_DEFAULT+GROUP_DIRECT2, KeyEvent.ALT_DOWN_MASK); + groups.put(GROUPS_DEFAULT+GROUP_DIRECT3, KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); + + groups.put(GROUPS_ALT1+GROUP_NONE, -1); + groups.put(GROUPS_ALT1+GROUP_HOTKEY, KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); + groups.put(GROUPS_ALT1+GROUP_MENU, KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); + groups.put(GROUPS_ALT1+GROUP_EDIT, KeyEvent.SHIFT_DOWN_MASK); + groups.put(GROUPS_ALT1+GROUP_LAYER, KeyEvent.ALT_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); + groups.put(GROUPS_ALT1+GROUP_DIRECT, KeyEvent.SHIFT_DOWN_MASK); + groups.put(GROUPS_ALT1+GROUP_MNEMONIC, KeyEvent.ALT_DOWN_MASK); + groups.put(GROUPS_ALT1+GROUP_DIRECT2, KeyEvent.ALT_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); + groups.put(GROUPS_ALT1+GROUP_DIRECT3, KeyEvent.ALT_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); + + groups.put(GROUPS_ALT2+GROUP_NONE, -1); + groups.put(GROUPS_ALT2+GROUP_HOTKEY, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); + groups.put(GROUPS_ALT2+GROUP_MENU, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); + groups.put(GROUPS_ALT2+GROUP_EDIT, KeyEvent.ALT_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); + groups.put(GROUPS_ALT2+GROUP_LAYER, KeyEvent.SHIFT_DOWN_MASK); + groups.put(GROUPS_ALT2+GROUP_DIRECT, KeyEvent.CTRL_DOWN_MASK); + groups.put(GROUPS_ALT2+GROUP_MNEMONIC, KeyEvent.ALT_DOWN_MASK); + groups.put(GROUPS_ALT2+GROUP_DIRECT2, KeyEvent.ALT_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK); + groups.put(GROUPS_ALT2+GROUP_DIRECT3, KeyEvent.META_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK); + // (1) System reserved shortcuts Main.platform.initSystemShortcuts(); @@ -401,5 +413,5 @@ return null; } - potentialShortcut = new Shortcut(shortText, longText, key, GROUP_RESERVED, key, modifier, true, false); + potentialShortcut = new Shortcut(shortText, longText, key, RESERVED, key, modifier, true, false); shortcuts.put(shortText, potentialShortcut); return potentialShortcut; @@ -458,9 +470,13 @@ } else if (defaultModifier == null) { // garbage in, no shortcut out - defaultModifier = getGroupModifier(GROUP_NONE + GROUPS_DEFAULT); + defaultModifier = getGroupModifier(NONE); } return defaultModifier; } + private static int[] mods = {ALT_CTRL, ALT_SHIFT, CTRL_SHIFT, ALT_CTRL_SHIFT}; + private static int[] keys = {KeyEvent.VK_F1, KeyEvent.VK_F2, KeyEvent.VK_F3, KeyEvent.VK_F4, + KeyEvent.VK_F5, KeyEvent.VK_F6, KeyEvent.VK_F7, KeyEvent.VK_F8, + KeyEvent.VK_F9, KeyEvent.VK_F10, KeyEvent.VK_F11, KeyEvent.VK_F12}; // and now the workhorse. same parameters as above, just one more: if originalShortcut is not null and // is different from the shortcut that will be assigned, a popup warning will be displayed to the user. @@ -475,60 +491,30 @@ Shortcut sc = shortcuts.get(shortText); sc.setLongText(longText); // or set by the platformHook, in this case the original longText doesn't match the real action - sc.saveDefault(defaultModifier); + sc.saveDefault(); return sc; } - Shortcut conflictsWith = null; - Shortcut potentialShortcut = findShortcut(requestedKey, defaultModifier); - if (potentialShortcut != null) { // 3 stage conflict handling - conflictsWith = potentialShortcut; - defaultModifier = getGroupModifier(requestedGroup + GROUPS_ALT1); - if (defaultModifier == null) { // garbage in, no shortcut out - defaultModifier = getGroupModifier(GROUP_NONE + GROUPS_DEFAULT); - } - potentialShortcut = findShortcut(requestedKey, defaultModifier); - if (potentialShortcut != null) { - defaultModifier = getGroupModifier(requestedGroup + GROUPS_ALT2); - if (defaultModifier == null) { // garbage in, no shortcut out - defaultModifier = getGroupModifier(GROUP_NONE + GROUPS_DEFAULT); + Shortcut conflict = findShortcut(requestedKey, defaultModifier); + if (conflict != null) { + for (int m : mods) { + for (int k : keys) { + int newmodifier = getGroupModifier(m); + if ( findShortcut(k, m) == null ) { + Shortcut newsc = new Shortcut(shortText, longText, requestedKey, m, k, newmodifier, false, false); + System.out.println(tr("Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''.", + shortText, conflict.getShortText(), newsc.getKeyText())); + newsc.saveDefault(); + shortcuts.put(shortText, newsc); + return newsc; + } } - potentialShortcut = findShortcut(requestedKey, defaultModifier); - if (potentialShortcut != null) { // if all 3 modifiers for a group are used, we give up - potentialShortcut = findRandomShortcut(shortText, longText, requestedKey, requestedGroup); - } else { - potentialShortcut = new Shortcut(shortText, longText, requestedKey, requestedGroup, requestedKey, defaultModifier, false, false); - } - } else { - potentialShortcut = new Shortcut(shortText, longText, requestedKey, requestedGroup, requestedKey, defaultModifier, false, false); - } - if (originalShortcut != null && !originalShortcut.isSame(potentialShortcut)) { - displayWarning(conflictsWith, potentialShortcut, shortText, longText); - } else if (originalShortcut == null) { - System.out.println("Silent shortcut conflict: '"+shortText+"' moved by '"+conflictsWith.getShortText()+"' to '"+potentialShortcut.getKeyText()+"'."); } } else { - potentialShortcut = new Shortcut(shortText, longText, requestedKey, requestedGroup, requestedKey, defaultModifier, true, false); - } - - potentialShortcut.saveDefault(defaultModifier); - shortcuts.put(shortText, potentialShortcut); - return potentialShortcut; - } - - // a lengthy warning message - private static void displayWarning(Shortcut conflictsWith, Shortcut potentialShortcut, String shortText, String longText) { - JOptionPane.showMessageDialog(Main.parent, - tr("Setting the keyboard shortcut ''{0}'' for the action ''{1}'' ({2}) failed\n"+ - "because the shortcut is already taken by the action ''{3}'' ({4}).\n\n", - conflictsWith.getKeyText(), longText, shortText, - conflictsWith.getLongText(), conflictsWith.getShortText())+ - (potentialShortcut.getKeyText().equals("") ? - tr("This action will have no shortcut.\n\n") - : - tr("Using the shortcut ''{0}'' instead.\n\n", potentialShortcut.getKeyText()) - )+ - tr("(Hint: You can edit the shortcuts in the preferences.)"), - tr("Error"), - JOptionPane.ERROR_MESSAGE - ); + Shortcut newsc = new Shortcut(shortText, longText, requestedKey, requestedGroup, requestedKey, defaultModifier, true, false); + newsc.saveDefault(); + shortcuts.put(shortText, newsc); + return newsc; + } + + return null; }