diff --git a/src/org/openstreetmap/josm/actions/search/SearchAction.java b/src/org/openstreetmap/josm/actions/search/SearchAction.java index 7b9ca85..4cfdcd2 100644 --- a/src/org/openstreetmap/josm/actions/search/SearchAction.java +++ b/src/org/openstreetmap/josm/actions/search/SearchAction.java @@ -7,10 +7,13 @@ 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.Collection; import java.util.Collections; @@ -19,12 +22,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; @@ -153,6 +152,28 @@ public class SearchAction extends JosmAction implements ParameterizedAction { } } + private static class SearchKeywordLabel extends JLabel { + + public SearchKeywordLabel(final HistoryComboBox hcb, final String text, String description) { + super("
" + + text + + "
"); + setToolTipText("" + description + ""); + addMouseListener(new MouseAdapter() { + + @Override + public void mouseClicked(MouseEvent e) { + try { + JTextField tf = (JTextField) hcb.getEditor().getEditorComponent(); + tf.getDocument().insertString(tf.getCaretPosition(), " " + text, null); + } catch (BadLocationException ex) { + throw new RuntimeException(ex.getMessage(), ex); + } + } + }); + } + } + public static SearchSetting showSearchDialog(SearchSetting initialValues) { if (initialValues == null) { initialValues = new SearchSetting(); @@ -205,7 +226,7 @@ public class SearchAction extends JosmAction implements ParameterizedAction { left.add(addOnToolbar, GBC.eol()); } - JPanel right = new JPanel(); + JPanel right = new JPanel(new GridBagLayout()); DescriptionTextBuilder descriptionText = new DescriptionTextBuilder(); descriptionText.append(""); JLabel description = new JLabel(descriptionText.toString()); description.setFont(description.getFont().deriveFont(Font.PLAIN)); - right.add(description); + right.add(description,GBC.eol()); + + if (Main.pref.getBoolean("expert", false)) { + JPanel ext = new JPanel(new GridBagLayout()); + right.add(ext, GBC.eol().fill(GBC.HORIZONTAL)); + final GBC same = GBC.std().insets(0, 0, 5, 5); + final GBC next = GBC.eol().fill(GBC.HORIZONTAL).insets(0, 0, 5, 5); + ext.add(new SearchKeywordLabel(hcbSearchString, "type:node", tr("all nodes")), same); + ext.add(new SearchKeywordLabel(hcbSearchString, "type:way", tr("all ways")), same); + ext.add(new SearchKeywordLabel(hcbSearchString, "type:relation", tr("all relations")), same); + ext.add(new SearchKeywordLabel(hcbSearchString, "closed", tr("all closed ways")), next); + ext.add(new SearchKeywordLabel(hcbSearchString, "user:", tr("objects changed by user")), same); + ext.add(new SearchKeywordLabel(hcbSearchString, "user:anonymous", tr("objects changed by anonymous users")), same); + ext.add(new SearchKeywordLabel(hcbSearchString, "id:", tr("objects with given ID (0 for new objects)")), same); + ext.add(new SearchKeywordLabel(hcbSearchString, "version:", tr("objects with given version (0 objects without an assigned version)")), same); + ext.add(new SearchKeywordLabel(hcbSearchString, "changeset:", tr("objects with given changeset ID (0 objects without an assigned changeset)")), same); + ext.add(new SearchKeywordLabel(hcbSearchString, "timestamp:2008/2011-02-04T12", tr("objects with last modification timestamp within range")), next); + ext.add(new SearchKeywordLabel(hcbSearchString, "nodes:20-", tr("objects with at least 20 nodes")), same); + ext.add(new SearchKeywordLabel(hcbSearchString, "tags:5-10", tr("objects having 5 to 10 tags")), same); + ext.add(new SearchKeywordLabel(hcbSearchString, "role:", tr("objects with given role in a relation")), same); + ext.add(new SearchKeywordLabel(hcbSearchString, "areasize:-100", tr("closed ways with an area of 100 m\u00b2")), next); + ext.add(new SearchKeywordLabel(hcbSearchString, "modified", tr("all modified objects")), same); + ext.add(new SearchKeywordLabel(hcbSearchString, "new", tr("all new objects")), same); + ext.add(new SearchKeywordLabel(hcbSearchString, "selected", tr("all selected objects")), same); + ext.add(new SearchKeywordLabel(hcbSearchString, "incomplete", tr("all incomplete objects")), next); + //ext.add(new SearchKeywordLabel(hcbSearchString, "untagged", tr("all untagged objects"))); // == "tags:0"? + ext.add(new SearchKeywordLabel(hcbSearchString, "child building", tr("all children of objects matching the expression (e.g., building)")), same); + ext.add(new SearchKeywordLabel(hcbSearchString, "parent bus_stop", tr("all parents of objects matching the expression (e.g., bus_stop)")), next); + ext.add(new SearchKeywordLabel(hcbSearchString, "inview", tr("objects in current view")), same); + ext.add(new SearchKeywordLabel(hcbSearchString, "allinview", tr("objects (and all its way nodes / relation members) in current view")), same); + ext.add(new SearchKeywordLabel(hcbSearchString, "indownloadedarea", tr("objects in downloaded area")), same); + ext.add(new SearchKeywordLabel(hcbSearchString, "allindownloadedarea", tr("objects (and all its way nodes / relation members) in downloaded area")), next); + } final JPanel p = new JPanel(new GridBagLayout()); p.add(top, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 5, 5, 0));