Changeset 9699 in josm for trunk


Ignore:
Timestamp:
2016-01-31T15:20:51+01:00 (9 years ago)
Author:
simon04
Message:

fix #12440 - Add tag: Keyboard shortcuts is not really readable on Mac (patch by codesman)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

    r9684 r9699  
    673673        }
    674674
    675         private String code(String text) {
    676             return "<code>" + text + "</code> ";
    677         }
    678 
    679675        @Override
    680676        public void setContentPane(Container contentPane) {
    … …  
    683679            Shortcut sc = Shortcut.findShortcut(KeyEvent.VK_1, commandDownMask);
    684680            if (sc != null) {
    685                 lines.add(code(sc.getKeyText()) + tr("to apply first suggestion"));
    686             }
    687             lines.add(code(KeyEvent.getKeyModifiersText(KeyEvent.SHIFT_MASK)+'+'+KeyEvent.getKeyText(KeyEvent.VK_ENTER))
     681                lines.add(sc.getKeyText() + " " + tr("to apply first suggestion"));
     682            }
     683            lines.add(KeyEvent.getKeyModifiersText(KeyEvent.SHIFT_MASK)+'+'+KeyEvent.getKeyText(KeyEvent.VK_ENTER) + " "
    688684                    +tr("to add without closing the dialog"));
    689685            sc = Shortcut.findShortcut(KeyEvent.VK_1, commandDownMask | KeyEvent.SHIFT_DOWN_MASK);
    690686            if (sc != null) {
    691                 lines.add(code(sc.getKeyText()) + tr("to add first suggestion without closing the dialog"));
     687                lines.add(sc.getKeyText() + " " + tr("to add first suggestion without closing the dialog"));
    692688            }
    693689            final JLabel helpLabel = new JLabel("<html>" + Utils.join("<br>", lines) + "</html>");
    694690            helpLabel.setFont(helpLabel.getFont().deriveFont(Font.PLAIN));
    695             contentPane.add(helpLabel, GBC.eol().fill(GridBagConstraints.HORIZONTAL).insets(1, 2, 1, 2));
     691            contentPane.add(helpLabel, GBC.eol().fill(GridBagConstraints.HORIZONTAL).insets(5, 5, 5, 5));
    696692            super.setContentPane(contentPane);
    697693        }
Note: See TracChangeset for help on using the changeset viewer.