diff --git a/src/org/openstreetmap/josm/actions/search/SearchAction.java b/src/org/openstreetmap/josm/actions/search/SearchAction.java index 7b9ca85..da07509 100644 --- a/src/org/openstreetmap/josm/actions/search/SearchAction.java +++ b/src/org/openstreetmap/josm/actions/search/SearchAction.java @@ -7,11 +7,15 @@ import static org.openstreetmap.josm.tools.I18n.tr; import static org.openstreetmap.josm.tools.I18n.trc; import java.awt.Dimension; +import java.awt.FlowLayout; import java.awt.Font; import java.awt.GridBagLayout; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashSet; @@ -19,12 +23,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import javax.swing.ButtonGroup; -import javax.swing.JCheckBox; -import javax.swing.JLabel; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JRadioButton; +import javax.swing.*; +import javax.swing.text.BadLocationException; import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.ActionParameter; @@ -41,6 +41,7 @@ import org.openstreetmap.josm.gui.widgets.HistoryComboBox; import org.openstreetmap.josm.tools.GBC; import org.openstreetmap.josm.tools.Property; import org.openstreetmap.josm.tools.Shortcut; +import org.openstreetmap.josm.tools.Utils; public class SearchAction extends JosmAction implements ParameterizedAction { @@ -153,6 +154,47 @@ public class SearchAction extends JosmAction implements ParameterizedAction { } } + private static class SearchKeywordRow extends JPanel { + + private final HistoryComboBox hcb; + + public SearchKeywordRow(HistoryComboBox hcb) { + super(new FlowLayout(FlowLayout.LEFT)); + this.hcb = hcb; + } + + public SearchKeywordRow addTitle(String title) { + add(new JLabel(tr("{0}: ", title))); + return this; + } + + public SearchKeywordRow addKeyword(String displayText, final String insertText, String description, String... examples) { + JLabel label = new JLabel("
" + displayText + "
"); + add(label); + if (description != null || examples.length > 0) { + label.setToolTipText("" + + description + + (examples.length > 0 ? ("") : "") + + ""); + } + if (insertText != null) { + label.addMouseListener(new MouseAdapter() { + + @Override + public void mouseClicked(MouseEvent e) { + try { + JTextField tf = (JTextField) hcb.getEditor().getEditorComponent(); + tf.getDocument().insertString(tf.getCaretPosition(), " " + insertText, null); + } catch (BadLocationException ex) { + throw new RuntimeException(ex.getMessage(), ex); + } + } + }); + } + return this; + } + } + public static SearchSetting showSearchDialog(SearchSetting initialValues) { if (initialValues == null) { initialValues = new SearchSetting(); @@ -205,51 +247,74 @@ public class SearchAction extends JosmAction implements ParameterizedAction { left.add(addOnToolbar, GBC.eol()); } - JPanel right = new JPanel(); - DescriptionTextBuilder descriptionText = new DescriptionTextBuilder(); - descriptionText.append(""); - JLabel description = new JLabel(descriptionText.toString()); - description.setFont(description.getFont().deriveFont(Font.PLAIN)); - right.add(description); + JPanel right = new JPanel(new GridBagLayout()); + right.add(new SearchKeywordRow(hcbSearchString) + .addTitle(tr("basic examples")) + .addKeyword("Baker Street", "Baker Street", tr("''Baker'' and ''Street'' in any key")) + .addKeyword("\"Baker Street\"", "\"Baker Street\"", tr("''Baker Street'' in any key")) + , GBC.eol()); + right.add(new SearchKeywordRow(hcbSearchString) + .addTitle(tr("basics")) + .addKeyword("key:valuefragment", null, tr("''valuefragment'' anywhere in ''key''")) + .addKeyword("-key:valuefragment", null, tr("''valuefragment'' nowhere in ''key''")) + .addKeyword("key=value", null, tr("''key'' with exactly ''value''")) + .addKeyword("key=*", null, tr("''key'' with any value")) + .addKeyword("*=value", null, tr("''value'' in any key")) + .addKeyword("key=", null, null) + , GBC.eol()); + right.add(new SearchKeywordRow(hcbSearchString) + .addTitle(tr("combinators")) + .addKeyword("expr expr", null, tr("logical and (both expressions have to be satisfied)")) + .addKeyword("expr | expr", "| ", tr("logical or (at least one expression has to be satisfied)")) + .addKeyword("expr OR expr", "OR ", tr("logical or (at least one expression has to be satisfied)")) + .addKeyword("-expr", null, tr("logical not")) + .addKeyword("(expr)", null, tr("use parenthesis to group expressions")) + .addKeyword("\"key\"=\"value\"", null, tr("to quote operators.
Within quoted strings the \" and \\ characters need to be escaped by a preceding \\ (e.g. \\\" and \\\\)."), "\"addr:street\"") + , GBC.eol()); + + if (Main.pref.getBoolean("expert", false)) { + right.add(new SearchKeywordRow(hcbSearchString) + .addTitle(tr("objects")) + .addKeyword(" type:node", "type:node", tr("all ways")) + .addKeyword(" type:way", "type:way", tr("all ways")) + .addKeyword(" type:relation", "type:relation", tr("all relations")) + .addKeyword(" closed", "closed", tr("all closed ways")) + , GBC.eol()); + right.add(new SearchKeywordRow(hcbSearchString) + .addTitle(tr("metadata")) + .addKeyword("user:", "user:", tr("objects changed by user", "user:anonymous")) + .addKeyword("id:", "id:", tr("objects with given ID (0 for new objects)")) + .addKeyword("version:", "version:", tr("objects with given version (0 objects without an assigned version)")) + .addKeyword("changeset:", "changeset:", tr("objects with given changeset ID (0 objects without an assigned changeset)")) + .addKeyword("timestamp:", "timestamp:", tr("objects with last modification timestamp within range", "timestamp:2012/", "timestamp:2008/2011-02-04T12")) + , GBC.eol()); + right.add(new SearchKeywordRow(hcbSearchString) + .addTitle(tr("properties")) + .addKeyword("nodes:20-", "nodes:", tr("objects with at least 20 nodes")) + .addKeyword("tags:5-10", "tags:", tr("objects having 5 to 10 tags")) + .addKeyword("role:", "role:", tr("objects with given role in a relation")) + .addKeyword("areasize:-100", "areasize", tr("closed ways with an area of 100 m\u00b2")) + , GBC.eol()); + right.add(new SearchKeywordRow(hcbSearchString) + .addTitle(tr("state")) + .addKeyword("modified", "modified", tr("all modified objects")) + .addKeyword("new", "new", tr("all new objects")) + .addKeyword("selected", "selected", tr("all selected objects")) + .addKeyword("incomplete", "incomplete", tr("all incomplete objects")) + , GBC.eol()); + right.add(new SearchKeywordRow(hcbSearchString) + .addTitle(tr("relations")) + .addKeyword("child expr", "child", tr("all children of objects matching the expression", "child building")) + .addKeyword("parent expr", "parent", tr("all parents of objects matching the expression", "parent bus_stop")) + , GBC.eol()); + right.add(new SearchKeywordRow(hcbSearchString) + .addTitle(tr("view")) + .addKeyword("inview", "inview", tr("objects in current view")) + .addKeyword("allinview", "allinview", tr("objects (and all its way nodes / relation members) in current view")) + .addKeyword("indownloadedarea", "indownloadedarea", tr("objects in downloaded area")) + .addKeyword("allindownloadedarea", "allindownloadedarea", tr("objects (and all its way nodes / relation members) in downloaded area")) + , GBC.eol()); + } final JPanel p = new JPanel(new GridBagLayout()); p.add(top, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 5, 5, 0));