Changeset 1291 in josm for trunk/src


Ignore:
Timestamp:
2009-01-18T00:01:15+01:00 (16 years ago)
Author:
stoecker
Message:

fix #1878. modified patch by xeen

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

    r1213 r1291  
    5555        JLabel label = new JLabel(tr("Please enter a search string."));
    5656        final JTextField input = new JTextField(initialValues.text);
    57         input.setToolTipText(tr("<html>Fulltext search:<ul>"
    58                 + "<li><b>Baker Street</b> - 'Baker' and 'Street' in any key or name.</li>"
    59                 + "<li><b>\"Baker Street\"</b> - 'Baker Street' in any key or name.</li>"
    60                 + "<li><b>name:Bak</b> - 'Bak' anywhere in the name.</li>"
    61                 + "<li><b>-name:Bak</b> - not 'Bak' in the name.</li>"
    62                 + "<li><b>foot:</b> - key=foot set to any value.</li>" + "<li>Special targets:</li>"
    63                 + "<li><b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)</li>"
    64                 + "<li><b>user:</b>... - all objects changed by user</li>"
    65                 + "<li><b>id:</b>... - object with given ID</li>"
    66                 + "<li><b>nodes:</b>... - object with given number of nodes</li>"
    67                 + "<li><b>modified</b> - all changed objects</li>"
    68                 + "<li><b>selected</b> - all selected objects</li>"
    69                 + "<li><b>incomplete</b> - all incomplete objects</li>"
    70                 + "<li>Use <b>|</b> or <b>OR</b> to combine with logical or</li>"
    71                 + "<li>Use <b>\"</b> to quote operators (e.g. if key contains :)</li>"
    72                 + "<li>Use <b>(</b> and <b>)</b> to group expressions</li>" + "</ul></html>"));
    73 
    7457        JRadioButton replace = new JRadioButton(tr("replace selection"), initialValues.mode == SearchMode.replace);
    7558        JRadioButton add = new JRadioButton(tr("add to selection"), initialValues.mode == SearchMode.add);
    … …  
    8366        JCheckBox regexSearch   = new JCheckBox(tr("regular expression"), initialValues.regexSearch);
    8467
    85         JPanel p = new JPanel(new GridBagLayout());
    86         p.add(label, GBC.eop());
    87         p.add(input, GBC.eop().fill(GBC.HORIZONTAL));
    88         p.add(replace, GBC.eol());
    89         p.add(add, GBC.eol());
    90         p.add(remove, GBC.eop());
    91         p.add(caseSensitive, GBC.eol());
    92         p.add(regexSearch, GBC.eol());
     68        JPanel left = new JPanel(new GridBagLayout());
     69        left.add(label, GBC.eop());
     70        left.add(input, GBC.eop().fill(GBC.HORIZONTAL));
     71        left.add(replace, GBC.eol());
     72        left.add(add, GBC.eol());
     73        left.add(remove, GBC.eop());
     74        left.add(caseSensitive, GBC.eol());
     75        left.add(regexSearch, GBC.eol());
     76
     77        JPanel right = new JPanel();
     78        right.add(new JLabel("<html><ul>"
     79                + "<li>"+tr("<b>Baker Street</b> - 'Baker' and 'Street' in any key or name.")+"</li>"
     80                + "<li>"+tr("<b>\"Baker Street\"</b> - 'Baker Street' in any key or name.")+"</li>"
     81                + "<li>"+tr("<b>name:Bak</b> - 'Bak' anywhere in the name.")+"</li>"
     82                + "<li>"+tr("<b>-name:Bak</b> - not 'Bak' in the name.")+"</li>"
     83                + "<li>"+tr("<b>foot:</b> - key=foot set to any value.")+"</li>"
     84                + "<li>"+tr("<u>Special targets:</u>")+"</li>"
     85                + "<li>"+tr("<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)")+"</li>"
     86                + "<li>"+tr("<b>user:</b>... - all objects changed by user")+"</li>"
     87                + "<li>"+tr("<b>id:</b>... - object with given ID")+"</li>"
     88                + "<li>"+tr("<b>nodes:</b>... - object with given number of nodes")+"</li>"
     89                + "<li>"+tr("<b>modified</b> - all changed objects")+"</li>"
     90                + "<li>"+tr("<b>selected</b> - all selected objects")+"</li>"
     91                + "<li>"+tr("<b>incomplete</b> - all incomplete objects")+"</li>"
     92                + "<li>"+tr("Use <b>|</b> or <b>OR</b> to combine with logical or")+"</li>"
     93                + "<li>"+tr("Use <b>\"</b> to quote operators (e.g. if key contains :)")+"</li>"
     94                + "<li>"+tr("Use <b>(</b> and <b>)</b> to group expressions")+"</li>"
     95                + "</ul></html>"));
     96
     97        final JPanel p = new JPanel();
     98        p.add(left);
     99        p.add(right);
     100
    93101        JOptionPane pane = new JOptionPane(p, JOptionPane.INFORMATION_MESSAGE, JOptionPane.OK_CANCEL_OPTION, null) {
    94102            @Override
Note: See TracChangeset for help on using the changeset viewer.