+ public prefJPanel(TableModel model) {
+ this.model = model;
+ initComponents();
+ }
+
+ private void initComponents() {
+ java.awt.GridBagConstraints gridBagConstraints;
+
+ // Did I mention auto-generated? That's the reason we
+ // have lots of properties here and not some arrays...
+ prefTabPane = new javax.swing.JTabbedPane();
+ shortcutTab = new javax.swing.JPanel();
+ listPane = new javax.swing.JPanel();
+ listScrollPane = new javax.swing.JScrollPane();
+ shortcutTable = new javax.swing.JTable();
+ shortcutEditPane = new javax.swing.JPanel();
+ cbDefault = new javax.swing.JCheckBox();
+ jLabel4 = new javax.swing.JLabel();
+ cbShift = new javax.swing.JCheckBox();
+ cbDisable = new javax.swing.JCheckBox();
+ cbCtrl = new javax.swing.JCheckBox();
+ tfKeyLabel = new javax.swing.JLabel();
+ cbAlt = new javax.swing.JCheckBox();
+ tfKey = new javax.swing.JComboBox();
+ cbMeta = new javax.swing.JCheckBox();
+ jLabel6 = new javax.swing.JLabel();
+ modifierTab = new javax.swing.JPanel();
+ editGroupPane = new javax.swing.JPanel();
+ jLabel1 = new javax.swing.JLabel();
+ bxPrim1 = new javax.swing.JComboBox();
+ jLabel2 = new javax.swing.JLabel();
+ bxSec1 = new javax.swing.JComboBox();
+ jLabel3 = new javax.swing.JLabel();
+ bxTer1 = new javax.swing.JComboBox();
+ menuGroupPane = new javax.swing.JPanel();
+ jLabel7 = new javax.swing.JLabel();
+ bxPrim2 = new javax.swing.JComboBox();
+ jLabel8 = new javax.swing.JLabel();
+ bxSec2 = new javax.swing.JComboBox();
+ jLabel9 = new javax.swing.JLabel();
+ bxTer2 = new javax.swing.JComboBox();
+ hotkeyGroupPane = new javax.swing.JPanel();
+ jLabel10 = new javax.swing.JLabel();
+ bxPrim3 = new javax.swing.JComboBox();
+ jLabel11 = new javax.swing.JLabel();
+ bxSec3 = new javax.swing.JComboBox();
+ jLabel12 = new javax.swing.JLabel();
+ bxTer3 = new javax.swing.JComboBox();
+ subwindowGroupPane = new javax.swing.JPanel();
+ jLabel13 = new javax.swing.JLabel();
+ bxPrim4 = new javax.swing.JComboBox();
+ jLabel14 = new javax.swing.JLabel();
+ bxSec4 = new javax.swing.JComboBox();
+ jLabel15 = new javax.swing.JLabel();
+ bxTer4 = new javax.swing.JComboBox();
+ infoTab = new javax.swing.JPanel();
+ cbAction action = new cbAction(this);
+ bxAction action2 = new bxAction();
+
+ setLayout(new javax.swing.BoxLayout(this, javax.swing.BoxLayout.Y_AXIS));
+
+ // If someone wants to move this text into some resource, feel free.
+ infoTab.setLayout(new javax.swing.BoxLayout(shortcutTab, javax.swing.BoxLayout.Y_AXIS));
+ JEditorPane editor = new JEditorPane();
+ editor.setEditable(false);
+ editor.setContentType("text/html");
+ editor.setText(
+ tr("")+
+ tr("Please note that shortcuts 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 button for the first "
+ +"time. So some of your changes may become active even without restart --- but also without collistion 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 use only those values that correspond to "
+ +"a real key on your keyboard. So if your keyboard has no 'Copy' key (PC keyboard don't have them, Sun keyboards do), "
+ +"the do not use it. Also there will be 'keys' listed that correspond to a shortcut on your keyboard (e.g. ':'/Colon). "
+ +"Please also do not use them, use the base key (';'/Semicolon on US keyboards, '.'/Period on German keyboards, ...) "
+ +"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("Thank you for your understanding
")+
+ 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 alternative in the listed order when managing a "
+ +"conflict. If all alternatives would 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.
")
+ );
+ editor.setCaretPosition(0); // scroll up
+ prefTabPane.addTab(tr("Read First"), new JScrollPane(editor));
+
+ shortcutTab.setLayout(new javax.swing.BoxLayout(shortcutTab, javax.swing.BoxLayout.Y_AXIS));
+
+ listPane.setLayout(new java.awt.GridLayout());
+
+ // This is the list of shortcuts:
+ shortcutTable.setModel(model);
+ shortcutTable.getSelectionModel().addListSelectionListener(new cbAction(this));
+ //shortcutTable.setFillsViewportHeight(true); Java 1.6
+ shortcutTable.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
+ 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"));
+ shortcutEditPane.add(cbDefault);
+
+ shortcutEditPane.add(jLabel4);
+
+ cbShift.setAction(action);
+ cbShift.setText(SHIFT); // see above for why no tr()
+ shortcutEditPane.add(cbShift);
+
+ cbDisable.setAction(action);
+ cbDisable.setText(tr("Disable"));
+ shortcutEditPane.add(cbDisable);
+
+ cbCtrl.setAction(action);
+ cbCtrl.setText(CTRL); // see above for why no tr()
+ shortcutEditPane.add(cbCtrl);
+
+ tfKeyLabel.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
+ tfKeyLabel.setText(tr("Key:"));
+ shortcutEditPane.add(tfKeyLabel);
+
+ cbAlt.setAction(action);
+ cbAlt.setText(ALT); // see above for why no tr()
+ shortcutEditPane.add(cbAlt);
+
+ tfKey.setAction(action);
+ tfKey.setModel(new javax.swing.DefaultComboBoxModel(keyList.values().toArray()));
+ shortcutEditPane.add(tfKey);
+
+ cbMeta.setAction(action);
+ cbMeta.setText(META); // see above for why no tr()
+ shortcutEditPane.add(cbMeta);
+
+ jLabel6.setText(tr("Attention: Use real keyboard keys only!"));
+ shortcutEditPane.add(jLabel6);
+
+ action.actionPerformed(null); // init checkboxes
+
+ shortcutTab.add(shortcutEditPane);
+
+ 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));
+
+ editGroupPane.setBorder(javax.swing.BorderFactory.createTitledBorder(tr("Edit Shortcuts")));
+ editGroupPane.setLayout(new java.awt.GridLayout(3, 5));
+
+ jLabel1.setText(tr("Primary"));
+ editGroupPane.add(jLabel1);
+
+ bxPrim1.setModel(new javax.swing.DefaultComboBoxModel(modifList));
+ editGroupPane.add(bxPrim1);
+
+ jLabel2.setText(tr("Secondary:"));
+ editGroupPane.add(jLabel2);
+
+ bxSec1.setModel(new javax.swing.DefaultComboBoxModel(modifList));
+ editGroupPane.add(bxSec1);
+
+ jLabel3.setText(tr("Tertiary:"));
+ editGroupPane.add(jLabel3);
+
+ bxTer1.setModel(new javax.swing.DefaultComboBoxModel(modifList));
+ editGroupPane.add(bxTer1);
+
+ modifierTab.add(editGroupPane);
+
+ menuGroupPane.setBorder(javax.swing.BorderFactory.createTitledBorder(tr("Menu Shortcuts")));
+ menuGroupPane.setLayout(new java.awt.GridLayout(3, 5));
+
+ jLabel7.setText(tr("Primary"));
+ menuGroupPane.add(jLabel7);
+
+ bxPrim2.setModel(new javax.swing.DefaultComboBoxModel(modifList));
+ menuGroupPane.add(bxPrim2);
+
+ jLabel8.setText(tr("Secondary:"));
+ menuGroupPane.add(jLabel8);
+
+ bxSec2.setModel(new javax.swing.DefaultComboBoxModel(modifList));
+ menuGroupPane.add(bxSec2);
+
+ jLabel9.setText(tr("Tertiary:"));
+ menuGroupPane.add(jLabel9);
+
+ bxTer2.setModel(new javax.swing.DefaultComboBoxModel(modifList));
+ menuGroupPane.add(bxTer2);
+
+ modifierTab.add(menuGroupPane);
+
+ hotkeyGroupPane.setBorder(javax.swing.BorderFactory.createTitledBorder(tr("Hotkey Shortcuts")));
+ hotkeyGroupPane.setLayout(new java.awt.GridLayout(3, 5));
+
+ jLabel10.setText(tr("Primary"));
+ hotkeyGroupPane.add(jLabel10);
+
+ bxPrim3.setModel(new javax.swing.DefaultComboBoxModel(modifList));
+ hotkeyGroupPane.add(bxPrim3);
+
+ jLabel11.setText(tr("Secondary:"));
+ hotkeyGroupPane.add(jLabel11);
+
+ bxSec3.setModel(new javax.swing.DefaultComboBoxModel(modifList));
+ hotkeyGroupPane.add(bxSec3);
+
+ jLabel12.setText(tr("Tertiary:"));
+ hotkeyGroupPane.add(jLabel12);
+
+ bxTer3.setModel(new javax.swing.DefaultComboBoxModel(modifList));
+ hotkeyGroupPane.add(bxTer3);
+
+ modifierTab.add(hotkeyGroupPane);
+
+ subwindowGroupPane.setBorder(javax.swing.BorderFactory.createTitledBorder(tr("Subwindow Shortcuts")));
+ subwindowGroupPane.setLayout(new java.awt.GridLayout(3, 5));
+
+ jLabel13.setText(tr("Primary"));
+ subwindowGroupPane.add(jLabel13);
+
+ bxPrim4.setModel(new javax.swing.DefaultComboBoxModel(modifList));
+ subwindowGroupPane.add(bxPrim4);
+
+ jLabel14.setText(tr("Secondary:"));
+ subwindowGroupPane.add(jLabel14);
+
+ bxSec4.setModel(new javax.swing.DefaultComboBoxModel(modifList));
+ subwindowGroupPane.add(bxSec4);
+
+ jLabel15.setText(tr("Tertiary:"));
+ subwindowGroupPane.add(jLabel15);
+
+ bxTer4.setModel(new javax.swing.DefaultComboBoxModel(modifList));
+ subwindowGroupPane.add(bxTer4);
+
+ initbx();
+ bxPrim1.setAction(action2);
+ bxSec1.setAction(action2);
+ bxTer1.setAction(action2);
+ bxPrim2.setAction(action2);
+ bxSec2.setAction(action2);
+ bxTer2.setAction(action2);
+ bxPrim3.setAction(action2);
+ bxSec3.setAction(action2);
+ bxTer3.setAction(action2);
+ bxPrim4.setAction(action2);
+ bxSec4.setAction(action2);
+ bxTer4.setAction(action2);
+
+ modifierTab.add(subwindowGroupPane);
+
+ prefTabPane.addTab(tr("Modifier Groups"), modifierTab);
+
+ add(prefTabPane);
+ }
+
+ // 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 javax.swing.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 = 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.getAutomatic()) {
+ panel.cbDefault.setEnabled(false);
+ panel.cbDisable.setEnabled(false);
+ panel.cbShift.setEnabled(false);
+ panel.cbCtrl.setEnabled(false);
+ panel.cbAlt.setEnabled(false);
+ panel.cbMeta.setEnabled(false);
+ panel.tfKey.setEnabled(false);
+ } else {
+ panel.cbDefault.setEnabled(true);
+ actionPerformed(null);
+ }
+ } else {
+ panel.cbDefault.setEnabled(false);
+ panel.cbDisable.setEnabled(false);
+ panel.cbShift.setEnabled(false);
+ panel.cbCtrl.setEnabled(false);
+ panel.cbAlt.setEnabled(false);
+ panel.cbMeta.setEnabled(false);
+ 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 = lsm.getMinSelectionIndex();
+ ShortCut sc = (ShortCut)panel.model.getValueAt(row, -1);
+ sc.setAssignedUser(!panel.cbDefault.isSelected());
+ 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());
+ }
+ }
+ }
+ 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.cbDefault.setEnabled(false);
+ panel.cbDisable.setEnabled(false);
+ panel.cbShift.setEnabled(false);
+ panel.cbCtrl.setEnabled(false);
+ panel.cbAlt.setEnabled(false);
+ panel.cbMeta.setEnabled(false);
+ panel.tfKey.setEnabled(false);
+ }
+ }
+ }
+
+ // this handles the modifier groups
+ private class bxAction extends javax.swing.AbstractAction {
+ public void actionPerformed(java.awt.event.ActionEvent e) {
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_EDIT), Integer.toString( modifInts[bxPrim1.getSelectedIndex()] ));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT1 +ShortCut.GROUP_EDIT), Integer.toString( modifInts[ bxSec1.getSelectedIndex()] ));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT2 +ShortCut.GROUP_EDIT), Integer.toString( modifInts[ bxTer1.getSelectedIndex()] ));
+
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_MENU), Integer.toString( modifInts[bxPrim2.getSelectedIndex()] ));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT1 +ShortCut.GROUP_MENU), Integer.toString( modifInts[ bxSec2.getSelectedIndex()] ));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT2 +ShortCut.GROUP_MENU), Integer.toString( modifInts[ bxTer2.getSelectedIndex()] ));
+
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_HOTKEY), Integer.toString( modifInts[bxPrim3.getSelectedIndex()] ));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT1 +ShortCut.GROUP_HOTKEY), Integer.toString( modifInts[ bxSec3.getSelectedIndex()] ));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT2 +ShortCut.GROUP_HOTKEY), Integer.toString( modifInts[ bxTer3.getSelectedIndex()] ));
+
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_LAYER), Integer.toString( modifInts[bxPrim4.getSelectedIndex()] ));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT1 +ShortCut.GROUP_LAYER), Integer.toString( modifInts[ bxSec4.getSelectedIndex()] ));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT2 +ShortCut.GROUP_LAYER), Integer.toString( modifInts[ bxTer4.getSelectedIndex()] ));
+ }
+ }
+
+ private void initbx() {
+ setBx(bxPrim1, "shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_EDIT));
+ setBx(bxSec1, "shortcut.groups."+(ShortCut.GROUPS_ALT1 +ShortCut.GROUP_EDIT));
+ setBx(bxTer1, "shortcut.groups."+(ShortCut.GROUPS_ALT2 +ShortCut.GROUP_EDIT));
+
+ setBx(bxPrim2, "shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_MENU));
+ setBx(bxSec2, "shortcut.groups."+(ShortCut.GROUPS_ALT1 +ShortCut.GROUP_MENU));
+ setBx(bxTer2, "shortcut.groups."+(ShortCut.GROUPS_ALT2 +ShortCut.GROUP_MENU));
+
+ setBx(bxPrim3, "shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_HOTKEY));
+ setBx(bxSec3, "shortcut.groups."+(ShortCut.GROUPS_ALT1 +ShortCut.GROUP_HOTKEY));
+ setBx(bxTer3, "shortcut.groups."+(ShortCut.GROUPS_ALT2 +ShortCut.GROUP_HOTKEY));
+
+ setBx(bxPrim4, "shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_LAYER));
+ setBx(bxSec4, "shortcut.groups."+(ShortCut.GROUPS_ALT1 +ShortCut.GROUP_LAYER));
+ setBx(bxTer4, "shortcut.groups."+(ShortCut.GROUPS_ALT2 +ShortCut.GROUP_LAYER));
+ }
+ private void setBx(javax.swing.JComboBox bx, String key) {
+ int target = Main.pref.getInteger(key, -1);
+ for (int i = 0; i < modifInts.length; i++) {
+ if (modifInts[i] == target) {
+ bx.setSelectedIndex(i);
+ }
+ }
+ }
+
+ private javax.swing.JComboBox bxPrim1;
+ private javax.swing.JComboBox bxPrim2;
+ private javax.swing.JComboBox bxPrim3;
+ private javax.swing.JComboBox bxPrim4;
+ private javax.swing.JComboBox bxSec1;
+ private javax.swing.JComboBox bxSec2;
+ private javax.swing.JComboBox bxSec3;
+ private javax.swing.JComboBox bxSec4;
+ private javax.swing.JComboBox bxTer1;
+ private javax.swing.JComboBox bxTer2;
+ private javax.swing.JComboBox bxTer3;
+ private javax.swing.JComboBox bxTer4;
+ private javax.swing.JCheckBox cbAlt;
+ private javax.swing.JCheckBox cbCtrl;
+ private javax.swing.JCheckBox cbDefault;
+ private javax.swing.JCheckBox cbDisable;
+ private javax.swing.JCheckBox cbMeta;
+ private javax.swing.JCheckBox cbShift;
+ private javax.swing.JPanel editGroupPane;
+ private javax.swing.JPanel hotkeyGroupPane;
+ private javax.swing.JLabel jLabel1;
+ private javax.swing.JLabel jLabel10;
+ private javax.swing.JLabel jLabel11;
+ private javax.swing.JLabel jLabel12;
+ private javax.swing.JLabel jLabel13;
+ private javax.swing.JLabel jLabel14;
+ private javax.swing.JLabel jLabel15;
+ private javax.swing.JLabel jLabel2;
+ private javax.swing.JLabel jLabel3;
+ private javax.swing.JLabel jLabel4;
+ private javax.swing.JLabel jLabel6;
+ private javax.swing.JLabel jLabel7;
+ private javax.swing.JLabel jLabel8;
+ private javax.swing.JLabel jLabel9;
+ private javax.swing.JPanel listPane;
+ private javax.swing.JScrollPane listScrollPane;
+ private javax.swing.JPanel menuGroupPane;
+ private javax.swing.JPanel modifierTab;
+ private javax.swing.JTabbedPane prefTabPane;
+ private javax.swing.JPanel shortcutEditPane;
+ private javax.swing.JPanel shortcutTab;
+ private javax.swing.JTable shortcutTable;
+ private javax.swing.JPanel subwindowGroupPane;
+ private javax.swing.JComboBox tfKey;
+ private javax.swing.JLabel tfKeyLabel;
+ private javax.swing.JPanel infoTab;
+}
Index: /trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java (revision 1022)
+++ /trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java (revision 1023)
@@ -12,4 +12,7 @@
/**
* Helper to open platform web browser on different platforms
+ *
+ * This now delegates the real work to a platform specific class.
+ *
* @author Imi
*/
@@ -30,16 +33,6 @@
}
- String os = System.getProperty("os.name");
- if (os == null)
- return "unknown operating system";
try {
- if (os != null && os.startsWith("Windows"))
- windows(url);
- else if (os.equals("Linux") || os.equals("Solaris") || os.equals("SunOS") || os.equals("AIX") || os.equals("FreeBSD"))
- linux(url);
- else if (os.equals("Mac OS") || os.equals("Mac OS X"))
- mac(url);
- else
- return "unknown operating system";
+ Main.platform.openUrl(url);
} catch (IOException e) {
return e.getMessage();
@@ -48,21 +41,3 @@
}
- private static void windows(String url) throws IOException {
- Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + url);
- }
-
- private static void linux(String url) {
- String[] programs = {"gnome-open", "kfmclient openURL", "firefox"};
- for (String program : programs) {
- try {
- Runtime.getRuntime().exec(program+" "+url);
- return;
- } catch (IOException e) {
- }
- }
- }
-
- private static void mac(String url) throws IOException {
- Runtime.getRuntime().exec("open " + url);
- }
}
Index: /trunk/src/org/openstreetmap/josm/tools/PlatformHook.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/PlatformHook.java (revision 1023)
+++ /trunk/src/org/openstreetmap/josm/tools/PlatformHook.java (revision 1023)
@@ -0,0 +1,108 @@
+// License: GPL. Copyright 2007 by Immanuel Scholz and others
+package org.openstreetmap.josm.tools;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+import org.openstreetmap.josm.tools.ShortCut;
+
+import java.awt.event.KeyEvent;
+import java.util.HashMap;
+import java.util.Map;
+import java.io.IOException;
+
+/**
+ * This interface allows platfrom (operating system) dependent code
+ * to be bundled into self-contained classes.
+ *
+ * For plugin authors:
+ * To implement your own PlatformHook class, implement this interface,
+ * then create the class when your plugin is loaded and store it in
+ * Main.platform. Please not that the two "startup" hooks will be
+ * called _before_ your plugin is loaded. If you need to hook there,
+ * split your class into two (one containing only the startup hooks,
+ * and one with the remainder) and send the startup class, together
+ * with propper OS detection code (see Main) for inclusion with
+ * JOSM to the JOSM team.
+ *
+ * Also, it might be a good idea to extend PlatformHookUnixoid.
+ * That class has a more or less neutral behaviour, that should
+ * work on all platforms supported by J2SE.
+ *
+ * Attention: At this time this interface is not to be considered
+ * complete.
+ */
+public interface PlatformHook {
+ /**
+ * The preStartupHook will be called extremly early. It is
+ * guaranteed to be called before the GUI setup has started.
+ *
+ * Reason: On OSX we need to inform the Swing libraries
+ * that we want to be integrated with the OS before we setup
+ * our GUI.
+ */
+ public void preStartupHook();
+
+ /**
+ * The startupHook will be called early, but after the GUI
+ * setup has started.
+ *
+ * Reason: On OSX we need to register some callbacks with the
+ * OS, so we'll receive events from the system menu.
+ */
+ public void startupHook();
+
+ /**
+ * The openURL hook will be used to open an URL in the
+ * default webbrowser.
+ */
+ public void openUrl(String url) throws IOException;
+
+ /**
+ * 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 void initShortCutGroups();
+
+ /**
+ * The initSystemShortCuts hook will be called by the
+ * ShortCut class after the modifier groups have been read
+ * from the config, but before any shortcuts are read from
+ * it or registered from within the application.
+ *
+ * Plese note that you are not allowed to register any
+ * shortuts from this hook, but only "systemCuts"!
+ *
+ * BTW: SystemCuts should be named "system:",
+ * and it'd be best if sou'd recycle the names already used
+ * by the Windows and OSX hooks. Especially the later has
+ * really many of them.
+ *
+ * You should also register any and all shortcuts that the
+ * operation system handles itself to block JOSM from trying
+ * to use them---as that would just not work. Call setAutomatic
+ * on them to prevent the keyboard preferences from allowing the
+ * user to change them.
+ */
+ public void initSystemShortCuts();
+
+ /**
+ * The makeTooltip hook will be called whenever a tooltip for
+ * a menu or button is created.
+ *
+ * Tooltips are usually not system dependent, unless the
+ * JVM is to dumb to provide correct names for all the keys.
+ *
+ * Another reason not to use the implementation in the *nix
+ * hook are LAFs that don't understand HTML, such as the OSX
+ * LAFs.
+ */
+ public String makeTooltip(String name, ShortCut sc);
+}
Index: /trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java (revision 1023)
+++ /trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java (revision 1023)
@@ -0,0 +1,250 @@
+// License: GPL. Copyright 2007 by Immanuel Scholz and others
+package org.openstreetmap.josm.tools;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+import org.openstreetmap.josm.tools.ShortCut;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.PlatformHookUnixoid;
+
+import java.awt.event.KeyEvent;
+import java.util.HashMap;
+import java.util.Map;
+import java.lang.reflect.*;
+import java.io.IOException;
+import javax.swing.UIManager;
+
+/**
+ * see PlatformHook.java
+ */
+public class PlatformHookOsx extends PlatformHookUnixoid implements PlatformHook, InvocationHandler {
+ private static PlatformHookOsx ivhandler = new PlatformHookOsx();
+ public void preStartupHook(){
+ // This will merge our MenuBar into the system menu.
+ // MUST be set before Swing is initialized!
+ // And will not work when one of the system independet LAFs is used.
+ // They just insist on painting themselves...
+ System.setProperty("apple.laf.useScreenMenuBar", "true");
+ }
+ public void startupHook() {
+ // Here we register callbacks for the menu entries in the system menu
+ try {
+ Class Ccom_apple_eawt_Application = Class.forName("com.apple.eawt.Application");
+ Object Ocom_apple_eawt_Application = Ccom_apple_eawt_Application.getConstructor((Class[])null).newInstance((Object[])null);
+ Class Ccom_apple_eawt_ApplicationListener = Class.forName("com.apple.eawt.ApplicationListener");
+ Method MaddApplicationListener = Ccom_apple_eawt_Application.getDeclaredMethod("addApplicationListener", new Class[] { Ccom_apple_eawt_ApplicationListener });
+ Object Oproxy = Proxy.newProxyInstance(PlatformHookOsx.class.getClassLoader(), new Class[] { Ccom_apple_eawt_ApplicationListener }, ivhandler);
+ MaddApplicationListener.invoke(Ocom_apple_eawt_Application, new Object[] { Oproxy });
+ Method MsetEnabledPreferencesMenu = Ccom_apple_eawt_Application.getDeclaredMethod("setEnabledPreferencesMenu", new Class[] { boolean.class });
+ MsetEnabledPreferencesMenu.invoke(Ocom_apple_eawt_Application, new Object[] { Boolean.TRUE });
+ } catch (Exception ex) {
+ // Oops, what now?
+ // We'll just ignore this for now. The user will still be able to close JOSM
+ // by closing all its windows.
+ System.out.println("Failed to register with OSX: " + ex);
+ }
+ }
+ public Object invoke (Object proxy, Method method, Object[] args) throws Throwable {
+ Boolean handled = Boolean.TRUE;
+ //System.out.println("Going to handle method "+method+" (short: "+method.getName()+") with event "+args[0]);
+ if (method.getName().equals("handleQuit")) {
+ handled = !Main.main.breakBecauseUnsavedChanges();
+ } else if (method.getName().equals("handleAbout")) {
+ Main.main.menu.about.actionPerformed(null);
+ } else if (method.getName().equals("handlePreferences")) {
+ Main.main.menu.preferences.actionPerformed(null);
+ } else {
+ return null;
+ }
+ if (args[0] != null) {
+ try {
+ args[0].getClass().getDeclaredMethod("setHandled", new Class[] { boolean.class }).invoke(args[0], new Object[] { handled });
+ } catch (Exception ex) {
+ System.out.println("Failed to report handled event: " + ex);
+ }
+ }
+ return null;
+ }
+ public void openUrl(String url) throws IOException {
+ // Ain't that KISS?
+ Runtime.getRuntime().exec("open " + url);
+ }
+ public void initShortCutGroups() {
+ // Everything but ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_MENU is guesswork.
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_NONE), Integer.toString(-1));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_HOTKEY), Integer.toString(KeyEvent.CTRL_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_MENU), Integer.toString(KeyEvent.META_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_EDIT), Integer.toString(0));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_LAYER), Integer.toString(KeyEvent.ALT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_DIRECT), Integer.toString(0));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_MNEMONIC),Integer.toString(KeyEvent.ALT_DOWN_MASK));
+
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT1+ShortCut.GROUP_NONE), Integer.toString(-1));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT1+ShortCut.GROUP_HOTKEY), Integer.toString(KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT1+ShortCut.GROUP_MENU), Integer.toString(KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT1+ShortCut.GROUP_EDIT), Integer.toString(KeyEvent.SHIFT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT1+ShortCut.GROUP_LAYER), Integer.toString(KeyEvent.ALT_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT1+ShortCut.GROUP_DIRECT), Integer.toString(KeyEvent.SHIFT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT1+ShortCut.GROUP_MNEMONIC), Integer.toString(KeyEvent.ALT_DOWN_MASK));
+
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT2+ShortCut.GROUP_NONE), Integer.toString(-1));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT2+ShortCut.GROUP_HOTKEY), Integer.toString(KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT2+ShortCut.GROUP_MENU), Integer.toString(KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT2+ShortCut.GROUP_EDIT), Integer.toString(KeyEvent.ALT_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT2+ShortCut.GROUP_LAYER), Integer.toString(KeyEvent.ALT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT2+ShortCut.GROUP_DIRECT), Integer.toString(KeyEvent.SHIFT_DOWN_MASK | KeyEvent.ALT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT2+ShortCut.GROUP_MNEMONIC), Integer.toString(KeyEvent.ALT_DOWN_MASK));
+ }
+ public void initSystemShortCuts() {
+ // Yeah, it's a long, long list. And people always complain that OSX has no shortcuts.
+ ShortCut.registerSystemCut("apple-reserved-01", "reserved", KeyEvent.VK_SPACE, KeyEvent.META_DOWN_MASK).setAutomatic(); // Show or hide the Spotlight search field (when multiple languages are installed, may rotate through enabled script systems).
+ ShortCut.registerSystemCut("apple-reserved-02", "reserved", KeyEvent.VK_SPACE, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK).setAutomatic(); // Apple reserved.
+ ShortCut.registerSystemCut("apple-reserved-03", "reserved", KeyEvent.VK_SPACE, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK).setAutomatic(); // Show the Spotlight search results window (when multiple languages are installed, may rotate through keyboard layouts and input methods within a script).
+ ShortCut.registerSystemCut("apple-reserved-04", "reserved", KeyEvent.VK_SPACE, KeyEvent.META_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK).setAutomatic(); // | Apple reserved.
+ ShortCut.registerSystemCut("apple-reserved-05", "reserved", KeyEvent.VK_TAB, KeyEvent.SHIFT_DOWN_MASK).setAutomatic(); // Navigate through controls in a reverse direction. See "Keyboard Focus and Navigation."
+ ShortCut.registerSystemCut("apple-reserved-06", "reserved", KeyEvent.VK_TAB, KeyEvent.META_DOWN_MASK).setAutomatic(); // Move forward to the next most recently used application in a list of open applications.
+ ShortCut.registerSystemCut("apple-reserved-07", "reserved", KeyEvent.VK_TAB, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK).setAutomatic(); // Move backward through a list of open applications (sorted by recent use).
+ ShortCut.registerSystemCut("apple-reserved-08", "reserved", KeyEvent.VK_TAB, KeyEvent.CTRL_DOWN_MASK).setAutomatic(); // Move focus to the next grouping of controls in a dialog or the next table (when Tab moves to the next cell). See Accessibility Overview.
+ ShortCut.registerSystemCut("apple-reserved-09", "reserved", KeyEvent.VK_TAB, KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK).setAutomatic(); // Move focus to the previous grouping of controls. See Accessibility Overview.
+ ShortCut.registerSystemCut("apple-reserved-10", "reserved", KeyEvent.VK_ESCAPE, KeyEvent.META_DOWN_MASK).setAutomatic(); // Open Front Row.
+ ShortCut.registerSystemCut("apple-reserved-11", "reserved", KeyEvent.VK_ESCAPE, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK).setAutomatic(); // Open the Force Quit dialog.
+ ShortCut.registerSystemCut("apple-reserved-12", "reserved", KeyEvent.VK_F1, KeyEvent.CTRL_DOWN_MASK).setAutomatic(); // Toggle full keyboard access on or off. See Accessibility Overview.
+ ShortCut.registerSystemCut("apple-reserved-13", "reserved", KeyEvent.VK_F2, KeyEvent.CTRL_DOWN_MASK).setAutomatic(); // Move focus to the menu bar. See Accessibility Overview.
+ ShortCut.registerSystemCut("apple-reserved-14", "reserved", KeyEvent.VK_F3, KeyEvent.CTRL_DOWN_MASK).setAutomatic(); // Move focus to the Dock. See Accessibility Overview.
+ ShortCut.registerSystemCut("apple-reserved-15", "reserved", KeyEvent.VK_F4, KeyEvent.CTRL_DOWN_MASK).setAutomatic(); // Move focus to the active (or next) window. See Accessibility Overview.
+ ShortCut.registerSystemCut("apple-reserved-16", "reserved", KeyEvent.VK_F4, KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK).setAutomatic(); // Move focus to the previously active window. See Accessibility Overview.
+ ShortCut.registerSystemCut("apple-reserved-17", "reserved", KeyEvent.VK_F5, KeyEvent.CTRL_DOWN_MASK).setAutomatic(); // Move focus to the toolbar. See Accessibility Overview.
+ ShortCut.registerSystemCut("apple-reserved-18", "reserved", KeyEvent.VK_F5, KeyEvent.META_DOWN_MASK).setAutomatic(); // Turn VoiceOver on or off. See Accessibility Overview.
+ ShortCut.registerSystemCut("apple-reserved-19", "reserved", KeyEvent.VK_F6, KeyEvent.CTRL_DOWN_MASK).setAutomatic(); // Move focus to the first (or next) panel. See Accessibility Overview.
+ ShortCut.registerSystemCut("apple-reserved-20", "reserved", KeyEvent.VK_F6, KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK).setAutomatic(); // Move focus to the previous panel. See Accessibility Overview.
+ ShortCut.registerSystemCut("apple-reserved-21", "reserved", KeyEvent.VK_F7, KeyEvent.CTRL_DOWN_MASK).setAutomatic(); // Temporarily override the current keyboard access mode in windows and dialogs. See Accessibility Overview.
+ ShortCut.registerSystemCut("apple-reserved-22", "reserved", KeyEvent.VK_F9, 0).setAutomatic(); // Tile or untile all open windows.
+ ShortCut.registerSystemCut("apple-reserved-23", "reserved", KeyEvent.VK_F10, 0).setAutomatic(); // Tile or untile all open windows in the currently active application.
+ ShortCut.registerSystemCut("apple-reserved-24", "reserved", KeyEvent.VK_F11, 0).setAutomatic(); // Hide or show all open windows.
+ ShortCut.registerSystemCut("apple-reserved-25", "reserved", KeyEvent.VK_F12, 0).setAutomatic(); // Hide or display Dashboard.
+ ShortCut.registerSystemCut("apple-reserved-26", "reserved", KeyEvent.VK_DEAD_GRAVE, KeyEvent.META_DOWN_MASK).setAutomatic(); // Activate the next open window in the frontmost application. See "Window Layering."
+ ShortCut.registerSystemCut("apple-reserved-27", "reserved", KeyEvent.VK_DEAD_GRAVE, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK).setAutomatic(); // Activate the previous open window in the frontmost application. See "Window Layering."
+ ShortCut.registerSystemCut("apple-reserved-28", "reserved", KeyEvent.VK_DEAD_GRAVE, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK).setAutomatic(); // Move focus to the window drawer.
+ ShortCut.registerSystemCut("apple-reserved-29", "reserved", KeyEvent.VK_MINUS, KeyEvent.META_DOWN_MASK).setAutomatic(); // Decrease the size of the selected item (equivalent to the Smaller command). See "The Format Menu."
+ ShortCut.registerSystemCut("apple-reserved-30", "reserved", KeyEvent.VK_MINUS, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK).setAutomatic(); // Zoom out when screen zooming is on. See Accessibility Overview.
+
+ ShortCut.registerSystemCut("system:align-left", "reserved", KeyEvent.VK_OPEN_BRACKET, KeyEvent.META_DOWN_MASK); // Left-align a selection (equivalent to the Align Left command). See "The Format Menu."
+ ShortCut.registerSystemCut("system:align-right","reserved", KeyEvent.VK_CLOSE_BRACKET, KeyEvent.META_DOWN_MASK); // Right-align a selection (equivalent to the Align Right command). See "The Format Menu."
+ // I found no KeyEvent for |
+ //ShortCut.registerSystemCut("system:align-center", "reserved", '|', KeyEvent.META_DOWN_MASK); // Center-align a selection (equivalent to the Align Center command). See "The Format Menu."
+ ShortCut.registerSystemCut("system:spelling", "reserved", KeyEvent.VK_COLON, KeyEvent.META_DOWN_MASK); // Display the Spelling window (equivalent to the Spelling command). See "The Edit Menu."
+ ShortCut.registerSystemCut("system:spellcheck", "reserved", KeyEvent.VK_SEMICOLON, KeyEvent.META_DOWN_MASK); // Find misspelled words in the document (equivalent to the Check Spelling command). See "The Edit Menu."
+ ShortCut.registerSystemCut("system:preferences", "reserved", KeyEvent.VK_COMMA, KeyEvent.META_DOWN_MASK).setAutomatic(); // Open the application's preferences window (equivalent to the Preferences command). See "The Application Menu."
+
+ ShortCut.registerSystemCut("apple-reserved-31", "reserved", KeyEvent.VK_COMMA, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK | KeyEvent.ALT_DOWN_MASK).setAutomatic(); // Decrease screen contrast. See Accessibility Overview.
+ ShortCut.registerSystemCut("apple-reserved-32", "reserved", KeyEvent.VK_PERIOD, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK | KeyEvent.ALT_DOWN_MASK).setAutomatic(); // Increase screen contrast. See Accessibility Overview.
+
+ // I found no KeyEvent for ?
+ //ShortCut.registerSystemCut("system:help", "reserved", '?', KeyEvent.META_DOWN_MASK).setAutomatic(); // Open the application's help in Help Viewer. See "The Help Menu."
+
+ ShortCut.registerSystemCut("apple-reserved-33", "reserved", KeyEvent.VK_SLASH, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK).setAutomatic(); // Turn font smoothing on or off.
+ ShortCut.registerSystemCut("apple-reserved-34", "reserved", KeyEvent.VK_EQUALS, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK).setAutomatic(); // Increase the size of the selected item (equivalent to the Bigger command). See "The Format Menu."
+ ShortCut.registerSystemCut("apple-reserved-35", "reserved", KeyEvent.VK_EQUALS, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK).setAutomatic(); // Zoom in when screen zooming is on. See Accessibility Overview.
+ ShortCut.registerSystemCut("apple-reserved-36", "reserved", KeyEvent.VK_3, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK).setAutomatic(); // Capture the screen to a file.
+ ShortCut.registerSystemCut("apple-reserved-37", "reserved", KeyEvent.VK_3, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK).setAutomatic(); // Capture the screen to the Clipboard.
+ ShortCut.registerSystemCut("apple-reserved-38", "reserved", KeyEvent.VK_4, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK).setAutomatic(); // Capture a selection to a file.
+ ShortCut.registerSystemCut("apple-reserved-39", "reserved", KeyEvent.VK_4, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK).setAutomatic(); // Capture a selection to the Clipboard.
+ ShortCut.registerSystemCut("apple-reserved-40", "reserved", KeyEvent.VK_8, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK).setAutomatic(); // Turn screen zooming on or off. See Accessibility Overview.
+ ShortCut.registerSystemCut("apple-reserved-41", "reserved", KeyEvent.VK_8, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK).setAutomatic(); // Invert the screen colors. See Accessibility Overview.
+
+ ShortCut.registerSystemCut("system:selectall", "reserved", KeyEvent.VK_A, KeyEvent.META_DOWN_MASK); // Highlight every item in a document or window, or all characters in a text field (equivalent to the Select All command). See "The Edit Menu."
+ ShortCut.registerSystemCut("system:bold", "reserved", KeyEvent.VK_B, KeyEvent.META_DOWN_MASK); // Boldface the selected text or toggle boldfaced text on and off (equivalent to the Bold command). See "The Edit Menu."
+ ShortCut.registerSystemCut("system:copy", "reserved", KeyEvent.VK_C, KeyEvent.META_DOWN_MASK); // Duplicate the selected data and store on the Clipboard (equivalent to the Copy command). See "The Edit Menu."
+ ShortCut.registerSystemCut("system:colors", "reserved", KeyEvent.VK_C, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); // Display the Colors window (equivalent to the Show Colors command). See "The Format Menu."
+ ShortCut.registerSystemCut("system:copystyle", "reserved", KeyEvent.VK_C, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); // Copy the style of the selected text (equivalent to the Copy Style command). See "The Format Menu."
+ ShortCut.registerSystemCut("system:copyformat", "reserved", KeyEvent.VK_C, KeyEvent.META_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK).setAutomatic(); // Copy the formatting settings of the selected item and store on the Clipboard (equivalent to the Copy Ruler command). See "The Format Menu."
+
+ ShortCut.registerSystemCut("apple-reserved-42", "reserved", KeyEvent.VK_D, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK).setAutomatic(); // Show or hide the Dock. See "The Dock."
+
+ ShortCut.registerSystemCut("system:dictionarylookup", "reserved", KeyEvent.VK_D, KeyEvent.META_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK); // Display the definition of the selected word in the Dictionary application.
+ ShortCut.registerSystemCut("system:findselected", "reserved", KeyEvent.VK_E, KeyEvent.META_DOWN_MASK); // Use the selection for a find operation. See "Find Windows."
+ ShortCut.registerSystemCut("system:find", "reserved", KeyEvent.VK_F, KeyEvent.META_DOWN_MASK); // Open a Find window (equivalent to the Find command). See "The Edit Menu."
+ ShortCut.registerSystemCut("system:search", "reserved", KeyEvent.VK_F, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); // Jump to the search field control. See "Search Fields."
+ ShortCut.registerSystemCut("system:findnext", "reserved", KeyEvent.VK_G, KeyEvent.META_DOWN_MASK); // Find the next occurrence of the selection (equivalent to the Find Next command). See "The Edit Menu."
+ ShortCut.registerSystemCut("system:findprev", "reserved", KeyEvent.VK_G, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); // Find the previous occurrence of the selection (equivalent to the Find Previous command). See "The Edit Menu."
+ ShortCut.registerSystemCut("system:hide", "reserved", KeyEvent.VK_H, KeyEvent.META_DOWN_MASK).setAutomatic(); // Hide the windows of the currently running application (equivalent to the Hide ApplicationName command). See "The Application Menu."
+ ShortCut.registerSystemCut("system:hideothers", "reserved", KeyEvent.VK_H, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK).setAutomatic(); // Hide the windows of all other running applications (equivalent to the Hide Others command). See "The Application Menu."
+ // What about applications that have italic text AND info windows?
+ //ShortCut.registerSystemCut("system:italic", "reserved", KeyEvent.VK_I, KeyEvent.META_DOWN_MASK); // Italicize the selected text or toggle italic text on or off (equivalent to the Italic command). See "The Format Menu."
+ ShortCut.registerSystemCut("system:info", "reserved", KeyEvent.VK_I, KeyEvent.META_DOWN_MASK); // Display an Info window. See "Inspector Windows."
+ ShortCut.registerSystemCut("system:inspector", "reserved", KeyEvent.VK_I, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); // Display an inspector window. See "Inspector Windows."
+ ShortCut.registerSystemCut("system:toselection", "reserved", KeyEvent.VK_J, KeyEvent.META_DOWN_MASK); // Scroll to a selection.
+ ShortCut.registerSystemCut("system:minimize", "reserved", KeyEvent.VK_M, KeyEvent.META_DOWN_MASK); // Minimize the active window to the Dock (equivalent to the Minimize command). See "The Window Menu."
+ ShortCut.registerSystemCut("system:minimizeall", "reserved", KeyEvent.VK_M, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); // Minimize all windows of the active application to the Dock (equivalent to the Minimize All command). See "The Window Menu."
+ ShortCut.registerSystemCut("system:new", "reserved", KeyEvent.VK_N, KeyEvent.META_DOWN_MASK); // Open a new document (equivalent to the New command). See "The File Menu."
+ ShortCut.registerSystemCut("system:open", "reserved", KeyEvent.VK_O, KeyEvent.META_DOWN_MASK); // Display a dialog for choosing a document to open (equivalent to the Open command). See "The File Menu."
+ ShortCut.registerSystemCut("system:print", "reserved", KeyEvent.VK_P, KeyEvent.META_DOWN_MASK); // Display the Print dialog (equivalent to the Print command). See "The File Menu."
+ ShortCut.registerSystemCut("system:printsetup", "reserved", KeyEvent.VK_P, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); // Display a dialog for specifying printing parameters (equivalent to the Page Setup command). See "The File Menu."
+ ShortCut.registerSystemCut("system:menuexit", "reserved", KeyEvent.VK_Q, KeyEvent.META_DOWN_MASK).setAutomatic(); // Quit the application (equivalent to the Quit command). See "The Application Menu."
+
+ ShortCut.registerSystemCut("apple-reserved-43", "reserved", KeyEvent.VK_Q, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK).setAutomatic(); // Log out the current user (equivalent to the Log Out command).
+ ShortCut.registerSystemCut("apple-reserved-44", "reserved", KeyEvent.VK_Q, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK | KeyEvent.ALT_DOWN_MASK).setAutomatic(); // Log out the current user without confirmation.
+
+ ShortCut.registerSystemCut("system:save", "reserved", KeyEvent.VK_S, KeyEvent.META_DOWN_MASK); // Save the active document (equivalent to the Save command). See "The File Menu."
+ ShortCut.registerSystemCut("system:saveas", "reserved", KeyEvent.VK_S, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); // Display the Save dialog (equivalent to the Save As command). See "The File Menu."
+ ShortCut.registerSystemCut("system:fonts", "reserved", KeyEvent.VK_T, KeyEvent.META_DOWN_MASK); // Display the Fonts window (equivalent to the Show Fonts command). See "The Format Menu."
+ ShortCut.registerSystemCut("system:toggletoolbar", "reserved", KeyEvent.VK_T, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); // Show or hide a toolbar (equivalent to the Show/Hide Toolbar command). See "The View Menu" and "Toolbars."
+ ShortCut.registerSystemCut("system:underline", "reserved", KeyEvent.VK_U, KeyEvent.META_DOWN_MASK); // Underline the selected text or turn underlining on or off (equivalent to the Underline command). See "The Format Menu."
+ ShortCut.registerSystemCut("system:paste", "reserved", KeyEvent.VK_V, KeyEvent.META_DOWN_MASK); // Insert the Clipboard contents at the insertion point (equivalent to the Paste command). See "The File Menu."
+ ShortCut.registerSystemCut("system:pastestyle", "reserved", KeyEvent.VK_V, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); // Apply the style of one object to the selected object (equivalent to the Paste Style command). See "The Format Menu."
+ ShortCut.registerSystemCut("system:pastemwithoutstyle", "reserved", KeyEvent.VK_V, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); // Apply the style of the surrounding text to the inserted object (equivalent to the Paste and Match Style command). See "The Edit Menu."
+ ShortCut.registerSystemCut("system:pasteformatting", "reserved", KeyEvent.VK_V, KeyEvent.META_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK); // Apply formatting settings to the selected object (equivalent to the Paste Ruler command). See "The Format Menu."
+ ShortCut.registerSystemCut("system:closewindow", "reserved", KeyEvent.VK_W, KeyEvent.META_DOWN_MASK); // Close the active window (equivalent to the Close command). See "The File Menu."
+ ShortCut.registerSystemCut("system:closefile", "reserved", KeyEvent.VK_W, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); // Close a file and its associated windows (equivalent to the Close File command). See "The File Menu."
+ ShortCut.registerSystemCut("system:closeallwindows", "reserved", KeyEvent.VK_W, KeyEvent.META_DOWN_MASK | KeyEvent.ALT_DOWN_MASK); // Close all windows in the application (equivalent to the Close All command). See "The File Menu."
+ ShortCut.registerSystemCut("system:cut", "reserved", KeyEvent.VK_X, KeyEvent.META_DOWN_MASK); // Remove the selection and store on the Clipboard (equivalent to the Cut command). See "The Edit Menu."
+ ShortCut.registerSystemCut("system:undo", "reserved", KeyEvent.VK_Z, KeyEvent.META_DOWN_MASK); // Reverse the effect of the user's previous operation (equivalent to the Undo command). See "The Edit Menu."
+ ShortCut.registerSystemCut("system:redo", "reserved", KeyEvent.VK_Z, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK); // Reverse the effect of the last Undo command (equivalent to the Redo command). See "The Edit Menu."
+
+ ShortCut.registerSystemCut("apple-reserved-45", "reserved", KeyEvent.VK_RIGHT, KeyEvent.META_DOWN_MASK).setAutomatic(); // Change the keyboard layout to current layout of Roman script.
+ //ShortCut.registerSystemCut("apple-reserved-46", "reserved", KeyEvent.VK_RIGHT, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK).setAutomatic(); // Extend selection to the next semantic unit, typically the end of the current line.
+ //ShortCut.registerSystemCut("apple-reserved-47", "reserved", KeyEvent.VK_RIGHT, KeyEvent.SHIFT_DOWN_MASK).setAutomatic(); // Extend selection one character to the right.
+ //ShortCut.registerSystemCut("apple-reserved-48", "reserved", KeyEvent.VK_RIGHT, KeyEvent.ALT_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK).setAutomatic(); // Extend selection to the end of the current word, then to the end of the next word.
+
+ ShortCut.registerSystemCut("system:movefocusright", "reserved", KeyEvent.VK_RIGHT, KeyEvent.CTRL_DOWN_MASK); // Move focus to another value or cell within a view, such as a table. See Accessibility Overview.
+
+ ShortCut.registerSystemCut("apple-reserved-49", "reserved", KeyEvent.VK_LEFT, KeyEvent.META_DOWN_MASK).setAutomatic(); // Change the keyboard layout to current layout of system script.
+ //ShortCut.registerSystemCut("apple-reserved-50", "reserved", KeyEvent.VK_LEFT, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK).setAutomatic(); // Extend selection to the previous semantic unit, typically the beginning of the current line.
+ //ShortCut.registerSystemCut("apple-reserved-51", "reserved", KeyEvent.VK_LEFT, KeyEvent.SHIFT_DOWN_MASK).setAutomatic(); // Extend selection one character to the left.
+ //ShortCut.registerSystemCut("apple-reserved-52", "reserved", KeyEvent.VK_LEFT, KeyEvent.ALT_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK).setAutomatic(); // Extend selection to the beginning of the current word, then to the beginning of the previous word.
+
+ ShortCut.registerSystemCut("system:movefocusleft", "reserved", KeyEvent.VK_LEFT, KeyEvent.CTRL_DOWN_MASK); // Move focus to another value or cell within a view, such as a table. See Accessibility Overview.
+
+ //ShortCut.registerSystemCut("apple-reserved-53", "reserved", KeyEvent.VK_UP, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK).setAutomatic(); // Extend selection upward in the next semantic unit, typically the beginning of the document.
+ //ShortCut.registerSystemCut("apple-reserved-54", "reserved", KeyEvent.VK_UP, KeyEvent.SHIFT_DOWN_MASK).setAutomatic(); // Extend selection to the line above, to the nearest character boundary at the same horizontal location.
+ //ShortCut.registerSystemCut("apple-reserved-55", "reserved", KeyEvent.VK_UP, KeyEvent.ALT_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK).setAutomatic(); // Extend selection to the beginning of the current paragraph, then to the beginning of the next paragraph.
+
+ ShortCut.registerSystemCut("system:movefocusup", "reserved", KeyEvent.VK_UP, KeyEvent.CTRL_DOWN_MASK); // Move focus to another value or cell within a view, such as a table. See Accessibility Overview.
+
+ //ShortCut.registerSystemCut("apple-reserved-56", "reserved", KeyEvent.VK_DOWN, KeyEvent.META_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK).setAutomatic(); // Extend selection downward in the next semantic unit, typically the end of the document.
+ //ShortCut.registerSystemCut("apple-reserved-57", "reserved", KeyEvent.VK_DOWN, KeyEvent.SHIFT_DOWN_MASK).setAutomatic(); // Extend selection to the line below, to the nearest character boundary at the same horizontal location.
+ //ShortCut.registerSystemCut("apple-reserved-58", "reserved", KeyEvent.VK_DOWN, KeyEvent.ALT_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK).setAutomatic(); // Extend selection to the end of the current paragraph, then to the end of the next paragraph (include the blank line between paragraphs in cut, copy, and paste operations).
+
+ ShortCut.registerSystemCut("system:movefocusdown", "reserved", KeyEvent.VK_DOWN, KeyEvent.CTRL_DOWN_MASK); // Move focus to another value or cell within a view, such as a table. See Accessibility Overview.
+
+ ShortCut.registerSystemCut("system:about", "reserved", 0, -1).setAutomatic(); // About
+ }
+ public String makeTooltip(String name, ShortCut sc) {
+ String lafid = UIManager.getLookAndFeel().getID();
+ boolean canHtml = true;
+ // "Mac" is the native LAF, "Aqua" is Quaqua. Both use native menus with native tooltips.
+ if (lafid.contains("Mac") || lafid.contains("Aqua")) {
+ canHtml = false;
+ }
+ String result = "";
+ if (canHtml) result += "";
+ result += name;
+ if (sc != null && sc.getKeyText().length() != 0) {
+ result += " ";
+ if (canHtml) result += "";
+ result += "("+sc.getKeyText()+")";
+ if (canHtml) result += "";
+ }
+ if (canHtml) result += " ";
+ return result;
+ }
+}
Index: /trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (revision 1023)
+++ /trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (revision 1023)
@@ -0,0 +1,81 @@
+// License: GPL. Copyright 2007 by Immanuel Scholz and others
+package org.openstreetmap.josm.tools;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+import org.openstreetmap.josm.tools.ShortCut;
+import org.openstreetmap.josm.Main;
+
+import java.awt.event.KeyEvent;
+import java.util.HashMap;
+import java.util.Map;
+import java.io.IOException;
+import javax.swing.KeyStroke;
+
+/**
+ * see PlatformHook.java
+ *
+ * BTW: THIS IS A STUB. See comments below for details.
+ */
+public class PlatformHookUnixoid implements PlatformHook {
+ public void preStartupHook(){
+ }
+ public void startupHook() {
+ }
+ public void openUrl(String url) throws IOException {
+ String[] programs = {"gnome-open", "kfmclient openURL", "firefox"};
+ for (String program : programs) {
+ try {
+ Runtime.getRuntime().exec(program+" "+url);
+ return;
+ } catch (IOException e) {
+ }
+ }
+ }
+ public void initShortCutGroups() {
+ // This is the Windows list. Someone should look over it and make it more "*nix"...
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_NONE), Integer.toString(-1));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_HOTKEY), Integer.toString(KeyEvent.CTRL_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_MENU), Integer.toString(KeyEvent.CTRL_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_EDIT), Integer.toString(0));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_LAYER), Integer.toString(KeyEvent.ALT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_DIRECT), Integer.toString(0));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_MNEMONIC),Integer.toString(KeyEvent.ALT_DOWN_MASK));
+
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT1+ShortCut.GROUP_NONE), Integer.toString(-1));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT1+ShortCut.GROUP_HOTKEY), Integer.toString(KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT1+ShortCut.GROUP_MENU), Integer.toString(KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT1+ShortCut.GROUP_EDIT), Integer.toString(KeyEvent.SHIFT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT1+ShortCut.GROUP_LAYER), Integer.toString(KeyEvent.ALT_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT1+ShortCut.GROUP_DIRECT), Integer.toString(KeyEvent.SHIFT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT1+ShortCut.GROUP_MNEMONIC), Integer.toString(KeyEvent.ALT_DOWN_MASK));
+
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT2+ShortCut.GROUP_NONE), Integer.toString(-1));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT2+ShortCut.GROUP_HOTKEY), Integer.toString(KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT2+ShortCut.GROUP_MENU), Integer.toString(KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT2+ShortCut.GROUP_EDIT), Integer.toString(KeyEvent.ALT_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT2+ShortCut.GROUP_LAYER), Integer.toString(KeyEvent.ALT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT2+ShortCut.GROUP_DIRECT), Integer.toString(KeyEvent.CTRL_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT2+ShortCut.GROUP_MNEMONIC), Integer.toString(KeyEvent.ALT_DOWN_MASK));
+ }
+ public void initSystemShortCuts() {
+ // TODO: Insert system shortcuts here. See Windows and espacially OSX to see how to.
+ }
+ /**
+ * This should work for all platforms. Yeah, should.
+ * See PlatformHook.java for a list of reasons why
+ * this is implemented here...
+ */
+ public String makeTooltip(String name, ShortCut sc) {
+ String result = "";
+ result += "";
+ result += name;
+ if (sc != null && sc.getKeyText().length() != 0) {
+ result += " ";
+ result += "";
+ result += "("+sc.getKeyText()+")";
+ result += "";
+ }
+ result += " ";
+ return result;
+ }
+}
Index: /trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java (revision 1023)
+++ /trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java (revision 1023)
@@ -0,0 +1,64 @@
+// License: GPL. Copyright 2007 by Immanuel Scholz and others
+package org.openstreetmap.josm.tools;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+import org.openstreetmap.josm.tools.ShortCut;
+import org.openstreetmap.josm.tools.PlatformHookUnixoid;
+import org.openstreetmap.josm.Main;
+
+import java.awt.event.KeyEvent;
+import java.util.HashMap;
+import java.util.Map;
+import java.io.IOException;
+
+/**
+ * see PlatformHook.java
+ */
+public class PlatformHookWindows extends PlatformHookUnixoid implements PlatformHook {
+ public void preStartupHook(){
+ }
+ public void startupHook() {
+ }
+ public void openUrl(String url) throws IOException {
+ Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + url);
+ }
+ public void initShortCutGroups() {
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_NONE), Integer.toString(-1));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_HOTKEY), Integer.toString(KeyEvent.CTRL_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_MENU), Integer.toString(KeyEvent.CTRL_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_EDIT), Integer.toString(0));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_LAYER), Integer.toString(KeyEvent.ALT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_DIRECT), Integer.toString(0));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_DEFAULT+ShortCut.GROUP_MNEMONIC),Integer.toString(KeyEvent.ALT_DOWN_MASK));
+
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT1+ShortCut.GROUP_NONE), Integer.toString(-1));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT1+ShortCut.GROUP_HOTKEY), Integer.toString(KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT1+ShortCut.GROUP_MENU), Integer.toString(KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT1+ShortCut.GROUP_EDIT), Integer.toString(KeyEvent.SHIFT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT1+ShortCut.GROUP_LAYER), Integer.toString(KeyEvent.ALT_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT1+ShortCut.GROUP_DIRECT), Integer.toString(KeyEvent.SHIFT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT1+ShortCut.GROUP_MNEMONIC), Integer.toString(KeyEvent.ALT_DOWN_MASK));
+
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT2+ShortCut.GROUP_NONE), Integer.toString(-1));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT2+ShortCut.GROUP_HOTKEY), Integer.toString(KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT2+ShortCut.GROUP_MENU), Integer.toString(KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT2+ShortCut.GROUP_EDIT), Integer.toString(KeyEvent.ALT_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT2+ShortCut.GROUP_LAYER), Integer.toString(KeyEvent.ALT_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT2+ShortCut.GROUP_DIRECT), Integer.toString(KeyEvent.CTRL_DOWN_MASK));
+ Main.pref.put("shortcut.groups."+(ShortCut.GROUPS_ALT2+ShortCut.GROUP_MNEMONIC), Integer.toString(KeyEvent.ALT_DOWN_MASK));
+ }
+ public void initSystemShortCuts() {
+ // This list if far from complete!
+ ShortCut.registerSystemCut("system:exit", "unused", KeyEvent.VK_F4, KeyEvent.ALT_DOWN_MASK).setAutomatic(); // items with automatic shortcuts will not be added to the menu bar at all
+ ShortCut.registerSystemCut("system:menuexit", "unused", KeyEvent.VK_Q, KeyEvent.CTRL_DOWN_MASK);
+ ShortCut.registerSystemCut("system:copy", "unused", KeyEvent.VK_C, KeyEvent.CTRL_DOWN_MASK);
+ ShortCut.registerSystemCut("system:paste", "unused", KeyEvent.VK_V, KeyEvent.CTRL_DOWN_MASK);
+ ShortCut.registerSystemCut("system:cut", "unused", KeyEvent.VK_X, KeyEvent.CTRL_DOWN_MASK);
+ ShortCut.registerSystemCut("system:duplicate", "unused", KeyEvent.VK_D, KeyEvent.CTRL_DOWN_MASK); // not really system, but to avoid odd results
+ ShortCut.registerSystemCut("system:help", "unused", KeyEvent.VK_F1, 0);
+ }
+}
+
+
+
+
Index: /trunk/src/org/openstreetmap/josm/tools/ShortCut.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/ShortCut.java (revision 1023)
+++ /trunk/src/org/openstreetmap/josm/tools/ShortCut.java (revision 1023)
@@ -0,0 +1,438 @@
+// License: GPL. Copyright 2007 by Immanuel Scholz and others
+package org.openstreetmap.josm.tools;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+import org.openstreetmap.josm.Main;
+
+import java.awt.event.KeyEvent;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Collection;
+import javax.swing.KeyStroke;
+import javax.swing.JMenu;
+import javax.swing.JOptionPane;
+
+/**
+ * Global shortcut class.
+ *
+ * Note: This class represents a single shortcut, contains the factory to obtain
+ * shortcut objects from, manages shortcuts and shortcut collisions, and
+ * finally manages loading and saving shortcuts to/from the preferences.
+ *
+ * Action authors: You only need the registerShortCut() factory. Ignore everything
+ * else.
+ *
+ * All: Use only public methods that are also marked to be used. The others are
+ * public so the shortcut preferences can use them.
+ *
+ */
+public class ShortCut {
+ private String shortText; // the unique ID of the shortcut
+ private String longText; // a human readable description that will be shown in the preferences
+ private int requestedKey; // the key, the caller requested
+ private int requestedGroup; // the group, the caller requested
+ private int assignedKey; // the key that actually is used
+ private int assignedModifier; // the modifiers that are used
+ private boolean assignedDefault; // true if it got assigned what was requested. (Note: modifiers will be ignored in favour of group when loading it from the preferences then.)
+ private boolean assignedUser; // true if the user changed this shortcut
+ private boolean automatic; // true if the user cannot change this shortcut (Note: it also will not be saved into the preferences)
+ private boolean reset; // true if the user requested this shortcut to be set to its default value (will happen on next restart, as this shortcut will not be saved to the preferences)
+
+ // simple constructor
+ private ShortCut(String shortText, String longText, int requestedKey, int requestedGroup, int assignedKey, int assignedModifier, boolean assignedDefault, boolean assignedUser) {
+ this.shortText = shortText;
+ this.longText = longText;
+ this.requestedKey = requestedKey;
+ this.requestedGroup = requestedGroup;
+ this.assignedKey = assignedKey;
+ this.assignedModifier = assignedModifier;
+ this.assignedDefault = assignedDefault;
+ this.assignedUser = assignedUser;
+ this.automatic = false;
+ this.reset = false;
+ }
+
+ public String getShortText() {
+ return shortText;
+ }
+
+ public String getLongText() {
+ return longText;
+ }
+
+ // a shortcut will be renamed when it is handed out again, because the original name
+ // may be a dummy
+ private void setLongText(String longText) {
+ this.longText = longText;
+ }
+
+ private int getRequestedKey() {
+ return requestedKey;
+ }
+
+ public int getRequestedGroup() {
+ return requestedGroup;
+ }
+
+ public int getAssignedKey() {
+ return assignedKey;
+ }
+
+ public int getAssignedModifier() {
+ return assignedModifier;
+ }
+
+ public boolean getAssignedDefault() {
+ return assignedDefault;
+ }
+
+ public boolean getAssignedUser() {
+ return assignedUser;
+ }
+
+ public boolean getAutomatic() {
+ return automatic;
+ }
+
+ private boolean getReset() {
+ return reset;
+ }
+
+ /**
+ * FOR PREF PANE ONLY
+ */
+ public void setAutomatic() {
+ automatic = true;
+ }
+
+ /**
+ * FOR PREF PANE ONLY
+ */
+ public void setAssignedModifier(int assignedModifier) {
+ this.assignedModifier = assignedModifier;
+ }
+
+ /**
+ * FOR PREF PANE ONLY
+ */
+ public void setAssignedKey(int assignedKey) {
+ this.assignedKey = assignedKey;
+ }
+
+ /**
+ * FOR PREF PANE ONLY
+ */
+ public void setAssignedUser(boolean assignedUser) {
+ this.reset = (!this.assignedUser && assignedUser);
+ if (assignedUser) assignedDefault = false;
+ this.assignedUser = assignedUser;
+ }
+
+ /**
+ * Use this to register the shortcut with Swing
+ */
+ public KeyStroke getKeyStroke() {
+ if (assignedModifier != -1) {
+ return KeyStroke.getKeyStroke(assignedKey, assignedModifier);
+ } else {
+ return null;
+ }
+ }
+
+ private boolean isSame(int isKey, int isModifier) {
+ // -1 --- an unassigned shortcut is different from any other shortcut
+ return( isKey == assignedKey && isModifier == assignedModifier && assignedModifier != Groups.get(GROUP_NONE));
+ }
+
+ // create a shortcut object from an string as saved in the preferences
+ private ShortCut(String prefString) {
+ String[] s = prefString.split(";");
+ this.shortText = s[0];
+ this.longText = s[1];
+ this.requestedKey = Integer.parseInt(s[2]);
+ this.requestedGroup = Integer.parseInt(s[3]);
+ this.assignedKey = Integer.parseInt(s[4]);
+ this.assignedModifier = Integer.parseInt(s[5]);
+ this.assignedDefault = Boolean.parseBoolean(s[6]);
+ this.assignedUser = Boolean.parseBoolean(s[7]);
+ }
+
+ // get a string that can be put into the preferences
+ private String asPrefString() {
+ return shortText + ";" + longText + ";" + requestedKey + ";" + requestedGroup + ";" + assignedKey + ";" + assignedModifier + ";" + assignedDefault + ";" + assignedUser;
+ }
+
+ private boolean isSame(ShortCut other) {
+ return assignedKey == other.assignedKey && assignedModifier == other.assignedModifier;
+ }
+
+ /**
+ * use this to set a menu's mnemonic
+ */
+ public void setMnemonic(JMenu menu) {
+ if (requestedGroup == GROUP_MNEMONIC && assignedModifier == Groups.get(requestedGroup + GROUPS_DEFAULT) && getKeyStroke() != null && KeyEvent.getKeyText(assignedKey).length() == 1) {
+ menu.setMnemonic(KeyEvent.getKeyText(assignedKey).charAt(0)); //getKeyStroke().getKeyChar() seems not to work here
+ }
+ }
+
+ /**
+ * use this to get a human readable text for your shortcut
+ */
+ public String getKeyText() {
+ KeyStroke keyStroke = getKeyStroke();
+ if (keyStroke == null) return "";
+ String modifText = KeyEvent.getKeyModifiersText(keyStroke.getModifiers());
+ if ("".equals (modifText)) return KeyEvent.getKeyText (keyStroke.getKeyCode ());
+ return modifText + "+" + KeyEvent.getKeyText(keyStroke.getKeyCode ());
+ }
+
+ ///////////////////////////////
+ // everything's static below //
+ ///////////////////////////////
+
+ // here we store our shortcuts
+ private static Map ShortCuts = new LinkedHashMap();
+
+ // and here our modifier groups
+ private static Map Groups = new HashMap();
+
+ // check if something collides with an existing shortcut
+ private static ShortCut findShortcut(int requestedKey, int modifier) {
+ if (modifier == Groups.get(GROUP_NONE)) {
+ return null;
+ }
+ for (ShortCut sc : ShortCuts.values()) {
+ if (sc.isSame(requestedKey, modifier)) {
+ return sc;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * FOR PREF PANE ONLY
+ */
+ public static Collection listAll() {
+ return ShortCuts.values();
+ }
+
+ // try to find an unused shortcut
+ private static ShortCut findRandomShortcut(String shortText, String longText, int requestedKey, int requestedGroup) {
+ int[] mods = {Groups.get(requestedGroup + GROUPS_DEFAULT), Groups.get(requestedGroup + GROUPS_ALT1), Groups.get(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, Groups.get(GROUP_NONE), false, false);
+ }
+
+ // use these constants to request shortcuts
+ public static final int GROUP_NONE = 0; // no shortcut
+ public static final int GROUP_HOTKEY = 1; // a button action, will use another modifier than MENU on system with a meta key
+ public static final int GROUP_MENU = 2; // a menu action, e.g. "ctrl-e"/"cmd-e" (export)
+ public static final int GROUP_EDIT = 3; // direct edit key, e.g. "a" (add)
+ public static final int GROUP_LAYER = 4; // toggle one of the right-hand-side windows, e.g. "alt-l" (layers)
+ public static final int GROUP_DIRECT = 5; // for non-letter keys, preferable without modifier, e.g. F5
+ public static final int GROUP_MNEMONIC = 6; // for use with Menu.setMnemonic() only!
+ public static final int GROUP__MAX = 7;
+ public static final int GROUP_RESERVED = 1000;
+ public static final int GROUPS_DEFAULT = 0;
+ public static final int GROUPS_ALT1 = GROUP__MAX;
+ public static final int GROUPS_ALT2 = GROUP__MAX * 2;
+
+ // safely read a shortcut from the preferences
+ private static String[] getConfigStringArray(String key) {
+ String s = Main.pref.get(key, null);
+ if (s == null || s.equals("null") || s.equals(""))
+ return null;
+ return s.split(";");
+ }
+
+ // bootstrap
+ private static boolean initdone = false;
+ private static void doInit() {
+ if (initdone) return;
+ initdone = true;
+ // if we have no modifier groups in the config, we have to create them
+ if (Main.pref.get("shortcut.groups.configured", null) == null) {
+ Main.platform.initShortCutGroups();
+ Main.pref.put("shortcut.groups.configured", true);
+ }
+ // pull in the gorups
+ for (int i = GROUP_NONE; i < GROUP__MAX+GROUPS_ALT2*2; i++) { // fill more groups, so registering with e.g. ALT2+MNEMONIC won't NPE
+ Groups.put(new Integer(i), new Integer(Main.pref.getInteger("shortcut.groups."+i, -1)));
+ }
+ // (1) System reserved shortcuts
+ Main.platform.initSystemShortCuts();
+ // (2) User defined shortcuts
+ int i = 0;
+ String p = Main.pref.get("shortcut.shortcut."+i, null);
+ while (p != null) {
+ ShortCut sc = new ShortCut(p);
+ if (sc.getAssignedUser()) registerShortCut(sc);
+ i++;
+ p = Main.pref.get("shortcut.shortcut."+i, null);
+ }
+ // Shortcuts at their default values
+ i = 0;
+ p = Main.pref.get("shortcut.shortcut."+i, null);
+ while (p != null) {
+ ShortCut sc = new ShortCut(p);
+ if (!sc.getAssignedUser() && sc.getAssignedDefault()) registerShortCut(sc);
+ i++;
+ p = Main.pref.get("shortcut.shortcut."+i, null);
+ }
+ // Shortcuts that were automatically moved
+ i = 0;
+ p = Main.pref.get("shortcut.shortcut."+i, null);
+ while (p != null) {
+ ShortCut sc = new ShortCut(p);
+ if (!sc.getAssignedUser() && !sc.getAssignedDefault()) registerShortCut(sc);
+ i++;
+ p = Main.pref.get("shortcut.shortcut."+i, null);
+ }
+ }
+
+ // shutdown handling
+ public static void savePrefs() {
+// we save this directly from the preferences pane, so don't overwrite these values here
+// for (int i = GROUP_NONE; i < GROUP__MAX+GROUPS_ALT2; i++) {
+// Main.pref.put("shortcut.groups."+i, Groups.get(i).toString());
+// }
+ int i = 0;
+ for (ShortCut sc : ShortCuts.values()) {
+ if (!sc.getAutomatic() && !sc.getReset()) {
+ Main.pref.put("shortcut.shortcut."+i, sc.asPrefString());
+ i++;
+ }
+ }
+ Main.pref.put("shortcut.shortcut."+i, "");
+ }
+
+ // this is used to register a shortcut that was read from the preferences
+ private static void registerShortCut(ShortCut sc) {
+ if (sc.getAssignedDefault()) { // a 100% default shortcut will go though unchanged -- unless the groups have been reconfigured
+ registerShortCut(sc.getShortText(), sc.getLongText(), sc.getRequestedKey(), sc.getRequestedGroup(), sc);
+ } else if (sc.getAssignedUser()) { // put a user configured shortcut in as-is -- unless there's a conflict
+ ShortCut potentialShortCut = findShortcut(sc.getAssignedKey(), sc.getAssignedModifier());
+ if (potentialShortCut == null) {
+ ShortCuts.put(sc.getShortText(), sc);
+ } else {
+ registerShortCut(sc.getShortText(), sc.getLongText(), sc.getRequestedKey(), sc.getRequestedGroup(), sc);
+ }
+ } else { // this shortcut was auto-moved before, re-register and warn if it changes
+ registerShortCut(sc.getShortText(), sc.getLongText(), sc.getRequestedKey(), sc.getRequestedGroup(), sc);
+ }
+ }
+
+ /**
+ * FOR PLATFORMHOOK USE ONLY
+ *
+ * This registers a system shortcut. See PlatformHook for details.
+ */
+ public static ShortCut registerSystemCut(String shortText, String longText, int key, int modifier) {
+ if (ShortCuts.containsKey(shortText)) {
+ return ShortCuts.get(shortText);
+ }
+ ShortCut potentialShortCut = findShortcut(key, modifier);
+ if (potentialShortCut != null) {
+ // this always is a logic error in the hook
+ System.err.println("CONFLICT WITH SYSTEM KEY "+shortText);
+ return null;
+ } else {
+ potentialShortCut = new ShortCut(shortText, longText, key, GROUP_RESERVED, key, modifier, true, false);
+ ShortCuts.put(shortText, potentialShortCut);
+ return potentialShortCut;
+ }
+ }
+
+ /**
+ * Register a shortcut.
+ *
+ * Here you get your shortcuts from. The parameters are:
+ *
+ * shortText - an ID. re-use a "system:*" ID if possible, else use something unique.
+ * "menu:*" is reserved for menu mnemonics, "core:*" is reserved for
+ * actions that are part of JOSM's core. Use something like
+ * +":"+
+ * longText - this will be displayed in the shortcut preferences dialog. Better
+ * use soomething the user will recognize...
+ * requestedKey - the key you'd prefer. Use a KeyEvent.VK_* constant here.
+ * requestedGroup - the group this shortcut fits best. This will determine the
+ * modifiers your shortcut will get assigned. Use the GROUP_*
+ * constants defined above.
+ */
+ public static ShortCut registerShortCut(String shortText, String longText, int requestedKey, int requestedGroup) {
+ return registerShortCut(shortText, longText, requestedKey, requestedGroup, null);
+ }
+
+ // 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.
+ // This is used when registering shortcuts that have been visible to the user before (read: have been
+ // read from the preferences file). New shortcuts will never warn, even when they land on some funny
+ // random fallback key like Ctrl+Alt+Shift+Z for "File Open..."
+ private static ShortCut registerShortCut(String shortText, String longText, int requestedKey, int requestedGroup, ShortCut originalShortCut) {
+ doInit();
+ if (ShortCuts.containsKey(shortText)) { // a re-register? maybe a sc already read from the preferences?
+ 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
+ return sc;
+ }
+ Integer defaultModifier = Groups.get(requestedGroup + GROUPS_DEFAULT);
+ if (defaultModifier == null) { // garbage in, no shortcurt out
+ defaultModifier = Groups.get(GROUP_NONE + GROUPS_DEFAULT);
+ }
+ ShortCut conflictsWith = null;
+ ShortCut potentialShortCut = findShortcut(requestedKey, defaultModifier);
+ if (potentialShortCut != null) { // 3 stage conflict handling
+ conflictsWith = potentialShortCut;
+ defaultModifier = Groups.get(requestedGroup + GROUPS_ALT1);
+ if (defaultModifier == null) { // garbage in, no shortcurt out
+ defaultModifier = Groups.get(GROUP_NONE + GROUPS_DEFAULT);
+ }
+ potentialShortCut = findShortcut(requestedKey, defaultModifier);
+ if (potentialShortCut != null) {
+ defaultModifier = Groups.get(requestedGroup + GROUPS_ALT2);
+ if (defaultModifier == null) { // garbage in, no shortcurt out
+ defaultModifier = Groups.get(GROUP_NONE + GROUPS_DEFAULT);
+ }
+ 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);
+ }
+ 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.)")
+ );
+ }
+}
Index: /trunk/src/org/openstreetmap/josm/tools/ShortCutLabel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/ShortCutLabel.java (revision 1022)
+++ /trunk/src/org/openstreetmap/josm/tools/ShortCutLabel.java (revision 1023)
@@ -6,6 +6,7 @@
import java.awt.event.KeyEvent;
-
+@Deprecated
public class ShortCutLabel {
+ @Deprecated
public static String name(int shortCut, int modifiers) {
if (shortCut == 0 && modifiers == 0)