Index: trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 4541)
+++ trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 4543)
@@ -196,6 +196,9 @@
left.add(in_selection, GBC.eop());
left.add(caseSensitive, GBC.eol());
- left.add(allElements, GBC.eol());
- left.add(regexSearch, GBC.eol());
+ if(Main.pref.getBoolean("expert", false))
+ {
+ left.add(allElements, GBC.eol());
+ left.add(regexSearch, GBC.eol());
+ }
JPanel right = new JPanel();
@@ -210,25 +213,28 @@
descriptionText.appendItem(tr("key: - key ''key'' set to any value"));
descriptionText.appendItem(tr("key? - key ''key'' with the value ''yes'', ''true'', ''1'' or ''on''"));
- descriptionText.appendItemHeader(tr("Special targets"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("type:... - objects with corresponding type (node, way, relation)"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("user:... - objects changed by user"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("user:anonymous - objects changed by anonymous users"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("id:... - objects with given ID (0 for new objects)"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("version:... - objects with given version (0 objects without an assigned version)"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("changeset:... - objects with given changeset ID (0 objects without an assigned changeset)"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("nodes:... - objects with given number of nodes (nodes:count, nodes:min-max, nodes:min- or nodes:-max)"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("tags:... - objects with given number of tags (tags:count, tags:min-max, tags:min- or tags:-max)"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("role:... - objects with given role in a relation"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("timestamp:... - objects with this timestamp (2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("areasize:... - closed ways with given area in m\u00b2 (areasize:min-max or areasize:max)"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("modified - all changed objects"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("selected - all selected objects"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("incomplete - all incomplete objects"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("untagged - all untagged objects"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("closed - all closed ways (a node is not considered closed)"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("child expr - all children of objects matching the expression"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("parent expr - all parents of objects matching the expression"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("(all)indownloadedarea - objects (and all its way nodes / relation members) in downloaded area"));
- /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("(all)inview - objects (and all its way nodes / relation members) in current view"));
+ if(Main.pref.getBoolean("expert", false))
+ {
+ descriptionText.appendItemHeader(tr("Special targets"));
+ /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("type:... - objects with corresponding type (node, way, relation)"));
+ /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("user:... - objects changed by user"));
+ /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("user:anonymous - objects changed by anonymous users"));
+ /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("id:... - objects with given ID (0 for new objects)"));
+ /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("version:... - objects with given version (0 objects without an assigned version)"));
+ /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("changeset:... - objects with given changeset ID (0 objects without an assigned changeset)"));
+ /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("nodes:... - objects with given number of nodes (nodes:count, nodes:min-max, nodes:min- or nodes:-max)"));
+ /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("tags:... - objects with given number of tags (tags:count, tags:min-max, tags:min- or tags:-max)"));
+ /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("role:... - objects with given role in a relation"));
+ /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("timestamp:... - objects with this timestamp (2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)"));
+ /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("areasize:... - closed ways with given area in m\u00b2 (areasize:min-max or areasize:max)"));
+ /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("modified - all changed objects"));
+ /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("selected - all selected objects"));
+ /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("incomplete - all incomplete objects"));
+ /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("untagged - all untagged objects"));
+ /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("closed - all closed ways (a node is not considered closed)"));
+ /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("child expr - all children of objects matching the expression"));
+ /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("parent expr - all parents of objects matching the expression"));
+ /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("(all)indownloadedarea - objects (and all its way nodes / relation members) in downloaded area"));
+ /* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("(all)inview - objects (and all its way nodes / relation members) in current view"));
+ }
/* I18n: don't translate the bold text keyword */ descriptionText.appendItem(tr("Use | or OR to combine with logical or"));
descriptionText.appendItem(tr("Use \" to quote operators (e.g. if key contains :)")