Changeset 4980 in josm for trunk/src/org/openstreetmap

Timestamp:

2012-02-18T11:51:07+01:00 (12 years ago)

Author:

stoecker

Message:

move info text to wiki

Location:

trunk/src/org/openstreetmap/josm/gui/preferences/shortcut

Files:

• PrefJPanel.java (modified) (4 diffs)
• ShortcutPreference.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java

@@ -28 +28 @@
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-import javax.swing.JTabbedPane;
 import javax.swing.JTable;
 import javax.swing.JTextField;
@@ -148 +147 @@
         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("<h1><a name=\"top\">Keyboard Shortcuts</a></h1>")+
-                tr("<br>")+
-                tr("<p>Please note that shortcut keys are assigned to the actions when JOSM is started. So you need to <b>restart</b> "
-                    +"JOSM to see your changes.</p>")+
-                tr("<br>")+
-                tr("<p>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 <b>restart</b> JOSM after making any changes here.</p>")+
-                tr("<br>")+
-                tr("<p>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.</p>")
-        );
-        editor.setCaretPosition(0); // scroll up
-        prefTabPane.addTab(tr("Read First"), new JScrollPane(editor));
-
-        shortcutTab.setLayout(new BoxLayout(shortcutTab, BoxLayout.Y_AXIS));
-
-        shortcutTab.add(buildFilterPanel());
+        add(buildFilterPanel());
         listPane.setLayout(new java.awt.GridLayout());
 
@@ -198 +164 @@
         listPane.add(listScrollPane);
 
-        shortcutTab.add(listPane);
+        add(listPane);
 
         // and here follows the edit area. I won't object to someone re-designing it, it looks, um, "minimalistic" ;)
@@ -232 +198 @@
         action.actionPerformed(null); // init checkboxes
 
-        shortcutTab.add(shortcutEditPane);
-
-        prefTabPane.addTab(tr("Keyboard Shortcuts"), shortcutTab);
-
-        add(prefTabPane);
+        add(shortcutEditPane);
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java

@@ -31 +31 @@
         // icon original size: 128x128
         // modifications: icon was cropped, then resized
-        super("shortcuts", tr("Shortcut Preferences"), tr("Changing keyboard shortcuts manually."));
+        super("shortcuts", tr("Keyboard Shortcuts"), tr("Changing keyboard shortcuts manually."));
     }