Changeset 4980 in josm for trunk/src


Ignore:
Timestamp:
2012-02-18T11:51:07+01:00 (8 years ago)
Author:
stoecker
Message:

move info text to wiki

Location:
trunk/src/org/openstreetmap/josm/gui/preferences/shortcut
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java

    r4971 r4980  
    2828import javax.swing.JPanel;
    2929import javax.swing.JScrollPane;
    30 import javax.swing.JTabbedPane;
    3130import javax.swing.JTable;
    3231import javax.swing.JTextField;
     
    148147        JPanel listPane = new JPanel();
    149148        JScrollPane listScrollPane = new JScrollPane();
    150         JTabbedPane prefTabPane = new JTabbedPane();
    151149        JPanel shortcutEditPane = new JPanel();
    152         JPanel shortcutTab = new JPanel();
    153         JPanel infoTab = new JPanel();
    154150
    155151        CbAction action = new CbAction(this);
    156 
    157152        setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
    158 
    159         // If someone wants to move this text into some resource, feel free.
    160         infoTab.setLayout(new BoxLayout(shortcutTab, BoxLayout.Y_AXIS));
    161         JEditorPane editor = new JEditorPane();
    162         editor.setEditable(false);
    163         editor.setContentType("text/html");
    164         editor.setText(
    165                 tr("<h1><a name=\"top\">Keyboard Shortcuts</a></h1>")+
    166                 tr("<br>")+
    167                 tr("<p>Please note that shortcut keys are assigned to the actions when JOSM is started. So you need to <b>restart</b> "
    168                     +"JOSM to see your changes.</p>")+
    169                 tr("<br>")+
    170                 tr("<p>Furthermore, the shortcuts are activated when the actions are assigned to a menu entry of a button for the first "
    171                     +"time. So some of your changes may become active even without restart --- but also without collision handling. "
    172                     +"This is another reason to <b>restart</b> JOSM after making any changes here.</p>")+
    173                 tr("<br>")+
    174                 tr("<p>You may notice that the key selection list on the next page lists all keys that exist on all kinds of keyboards "
    175                     +"Java knows about, not just those keys that exist on your keyboard. Please only use values that correspond to "
    176                     +"a real key on your keyboard. If your keyboard has no ''Copy'' key (PC keyboard do not have them, Sun keyboards do), "
    177                     +"then do not use it. Also there are ''keys'' listed that correspond to a shortcut on your keyboard (e.g. '':''/Colon). "
    178                     +"Please do not use them either, use the base key ('';''/Semicolon on US keyboards, ''.''/Period on German keyboards, etc.) "
    179                     +"instead. Not doing so may result in conflicts, as there is no way for JOSM to know that Ctrl+Shift+; and Ctrl+: "
    180                     +"actually is the same thing on an US keyboard.</p>")
    181         );
    182         editor.setCaretPosition(0); // scroll up
    183         prefTabPane.addTab(tr("Read First"), new JScrollPane(editor));
    184 
    185         shortcutTab.setLayout(new BoxLayout(shortcutTab, BoxLayout.Y_AXIS));
    186 
    187         shortcutTab.add(buildFilterPanel());
     153        add(buildFilterPanel());
    188154        listPane.setLayout(new java.awt.GridLayout());
    189155
     
    198164        listPane.add(listScrollPane);
    199165
    200         shortcutTab.add(listPane);
     166        add(listPane);
    201167
    202168        // and here follows the edit area. I won't object to someone re-designing it, it looks, um, "minimalistic" ;)
     
    232198        action.actionPerformed(null); // init checkboxes
    233199
    234         shortcutTab.add(shortcutEditPane);
    235 
    236         prefTabPane.addTab(tr("Keyboard Shortcuts"), shortcutTab);
    237 
    238         add(prefTabPane);
     200        add(shortcutEditPane);
    239201    }
    240202
  • trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java

    r4968 r4980  
    3131        // icon original size: 128x128
    3232        // modifications: icon was cropped, then resized
    33         super("shortcuts", tr("Shortcut Preferences"), tr("Changing keyboard shortcuts manually."));
     33        super("shortcuts", tr("Keyboard Shortcuts"), tr("Changing keyboard shortcuts manually."));
    3434    }
    3535
Note: See TracChangeset for help on using the changeset viewer.