Index: trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 1290)
+++ trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 1291)
@@ -55,21 +55,4 @@
JLabel label = new JLabel(tr("Please enter a search string."));
final JTextField input = new JTextField(initialValues.text);
- input.setToolTipText(tr("Fulltext search:"
- + "- Baker Street - 'Baker' and 'Street' in any key or name.
"
- + "- \"Baker Street\" - 'Baker Street' in any key or name.
"
- + "- name:Bak - 'Bak' anywhere in the name.
"
- + "- -name:Bak - not 'Bak' in the name.
"
- + "- foot: - key=foot set to any value.
" + "- Special targets:
"
- + "- type: - type of the object (node, way, relation)
"
- + "- user:... - all objects changed by user
"
- + "- id:... - object with given ID
"
- + "- nodes:... - object with given number of nodes
"
- + "- modified - all changed objects
"
- + "- selected - all selected objects
"
- + "- incomplete - all incomplete objects
"
- + "- Use | or OR to combine with logical or
"
- + "- Use \" to quote operators (e.g. if key contains :)
"
- + "- Use ( and ) to group expressions
" + "
"));
-
JRadioButton replace = new JRadioButton(tr("replace selection"), initialValues.mode == SearchMode.replace);
JRadioButton add = new JRadioButton(tr("add to selection"), initialValues.mode == SearchMode.add);
@@ -83,12 +66,37 @@
JCheckBox regexSearch = new JCheckBox(tr("regular expression"), initialValues.regexSearch);
- JPanel p = new JPanel(new GridBagLayout());
- p.add(label, GBC.eop());
- p.add(input, GBC.eop().fill(GBC.HORIZONTAL));
- p.add(replace, GBC.eol());
- p.add(add, GBC.eol());
- p.add(remove, GBC.eop());
- p.add(caseSensitive, GBC.eol());
- p.add(regexSearch, GBC.eol());
+ JPanel left = new JPanel(new GridBagLayout());
+ left.add(label, GBC.eop());
+ left.add(input, GBC.eop().fill(GBC.HORIZONTAL));
+ left.add(replace, GBC.eol());
+ left.add(add, GBC.eol());
+ left.add(remove, GBC.eop());
+ left.add(caseSensitive, GBC.eol());
+ left.add(regexSearch, GBC.eol());
+
+ JPanel right = new JPanel();
+ right.add(new JLabel(""
+ + "- "+tr("Baker Street - 'Baker' and 'Street' in any key or name.")+"
"
+ + "- "+tr("\"Baker Street\" - 'Baker Street' in any key or name.")+"
"
+ + "- "+tr("name:Bak - 'Bak' anywhere in the name.")+"
"
+ + "- "+tr("-name:Bak - not 'Bak' in the name.")+"
"
+ + "- "+tr("foot: - key=foot set to any value.")+"
"
+ + "- "+tr("Special targets:")+"
"
+ + "- "+tr("type: - type of the object (node, way, relation)")+"
"
+ + "- "+tr("user:... - all objects changed by user")+"
"
+ + "- "+tr("id:... - object with given ID")+"
"
+ + "- "+tr("nodes:... - object with given number of nodes")+"
"
+ + "- "+tr("modified - all changed objects")+"
"
+ + "- "+tr("selected - all selected objects")+"
"
+ + "- "+tr("incomplete - all incomplete objects")+"
"
+ + "- "+tr("Use | or OR to combine with logical or")+"
"
+ + "- "+tr("Use \" to quote operators (e.g. if key contains :)")+"
"
+ + "- "+tr("Use ( and ) to group expressions")+"
"
+ + "
"));
+
+ final JPanel p = new JPanel();
+ p.add(left);
+ p.add(right);
+
JOptionPane pane = new JOptionPane(p, JOptionPane.INFORMATION_MESSAGE, JOptionPane.OK_CANCEL_OPTION, null) {
@Override