Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 8358)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 8359)
@@ -636,10 +636,17 @@
@Override
public void setContentPane(Container contentPane) {
- final String text = "" + Utils.join("
", Arrays.asList(
- tr("Ctrl-1 to apply first suggestion"),
- tr("Shift-Enter to add without closing the dialog"),
- tr("Shift-Ctrl-1 to add first suggestion without closing the dialog")
- ));
- final JLabel helpLabel = new JLabel(text);
+ final int commandDownMask = GuiHelper.getMenuShortcutKeyMaskEx();
+ ArrayList lines = new ArrayList<>();
+ Shortcut sc = Shortcut.findShortcut(KeyEvent.VK_1, commandDownMask);
+ if (sc != null) {
+ lines.add(""+sc.getKeyText()+" "+tr("to apply first suggestion"));
+ }
+ lines.add(""+KeyEvent.getKeyModifiersText(KeyEvent.SHIFT_MASK)+"+"+KeyEvent.getKeyText(KeyEvent.VK_ENTER)+" "
+ +tr("to add without closing the dialog"));
+ sc = Shortcut.findShortcut(KeyEvent.VK_1, commandDownMask|KeyEvent.SHIFT_DOWN_MASK);
+ if (sc != null) {
+ lines.add(""+sc.getKeyText()+" "+tr("to add first suggestion without closing the dialog"));
+ }
+ final JLabel helpLabel = new JLabel("" + Utils.join("
", lines) + "");
helpLabel.setFont(helpLabel.getFont().deriveFont(Font.PLAIN));
contentPane.add(helpLabel, GBC.eol().fill(GridBagConstraints.HORIZONTAL).insets(1, 2, 1, 2));
@@ -672,5 +679,5 @@
int count = 1;
// We store the maximum number (9) of recent tags to allow dynamic change of number of tags shown in the preferences.
- // This implies to iterate in descending order, as the oldest elements will only be removed after we reach the maximum numbern and not the number of tags to show.
+ // This implies to iterate in descending order, as the oldest elements will only be removed after we reach the maximum number and not the number of tags to show.
// However, as Set does not allow to iterate in descending order, we need to copy its elements into a List we can access in reverse order.
List tags = new LinkedList<>(recentTags.keySet());