Index: /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 12332)
+++ /trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 12333)
@@ -29,5 +29,4 @@
import java.util.function.Predicate;
-import javax.swing.ButtonGroup;
import javax.swing.JCheckBox;
import javax.swing.JLabel;
@@ -37,4 +36,6 @@
import javax.swing.text.BadLocationException;
import javax.swing.text.JTextComponent;
+import javax.swing.BorderFactory;
+import javax.swing.ButtonGroup;
import org.openstreetmap.josm.Main;
@@ -275,8 +276,9 @@
JCheckBox allElements = new JCheckBox(tr("all objects"), initialValues.allElements);
allElements.setToolTipText(tr("Also include incomplete and deleted objects in search."));
+ JCheckBox addOnToolbar = new JCheckBox(tr("add toolbar button"), false);
+
final JRadioButton standardSearch = new JRadioButton(tr("standard"), !initialValues.regexSearch && !initialValues.mapCSSSearch);
final JRadioButton regexSearch = new JRadioButton(tr("regular expression"), initialValues.regexSearch);
final JRadioButton mapCSSSearch = new JRadioButton(tr("MapCSS selector"), initialValues.mapCSSSearch);
- final JCheckBox addOnToolbar = new JCheckBox(tr("add toolbar button"), false);
final ButtonGroup bg2 = new ButtonGroup();
bg2.add(standardSearch);
@@ -284,24 +286,39 @@
bg2.add(mapCSSSearch);
- JPanel top = new JPanel(new GridBagLayout());
+ JPanel left = new JPanel(new GridBagLayout());
+
+ JPanel selectionSettings = new JPanel(new GridBagLayout());
+ selectionSettings.setBorder(BorderFactory.createTitledBorder(tr("Selection settings")));
+ selectionSettings.add(replace, GBC.eol());
+ selectionSettings.add(add, GBC.eol());
+ selectionSettings.add(remove, GBC.eol());
+ selectionSettings.add(inSelection, GBC.eop());
+
+ JPanel additionalSettings = new JPanel(new GridBagLayout());
+ additionalSettings.setBorder(BorderFactory.createTitledBorder(tr("Additional settings")));
+ additionalSettings.add(caseSensitive, GBC.eol());
+
+ if (Main.pref.getBoolean("expert", false)) {
+ additionalSettings.add(allElements, GBC.eol());
+ additionalSettings.add(addOnToolbar, GBC.eop());
+
+ JPanel searchOptions = new JPanel(new GridBagLayout());
+ searchOptions.setBorder(BorderFactory.createTitledBorder(tr("Search Options")));
+ searchOptions.add(standardSearch, GBC.eol());
+ searchOptions.add(regexSearch, GBC.eol());
+ searchOptions.add(mapCSSSearch, GBC.eol());
+
+ left.add(selectionSettings, GBC.eol().fill(GBC.BOTH));
+ left.add(additionalSettings, GBC.eol().fill(GBC.BOTH));
+ left.add(searchOptions, GBC.eol().fill(GBC.BOTH));
+ } else {
+ left.add(selectionSettings, GBC.eol().fill(GBC.BOTH));
+ left.add(additionalSettings, GBC.eol().fill(GBC.BOTH));
+ }
+
+ final JPanel right = SearchAction.buildHintsSection(hcbSearchString);
+ final JPanel top = new JPanel(new GridBagLayout());
top.add(label, GBC.std().insets(0, 0, 5, 0));
top.add(hcbSearchString, GBC.eol().fill(GBC.HORIZONTAL));
- JPanel left = new JPanel(new GridBagLayout());
- left.add(replace, GBC.eol());
- left.add(add, GBC.eol());
- left.add(remove, GBC.eol());
- left.add(inSelection, GBC.eop());
- left.add(caseSensitive, GBC.eol());
- if (Main.pref.getBoolean("expert", false)) {
- left.add(allElements, GBC.eol());
- left.add(addOnToolbar, GBC.eop());
- left.add(standardSearch, GBC.eol());
- left.add(regexSearch, GBC.eol());
- left.add(mapCSSSearch, GBC.eol());
- }
-
- final JPanel right;
- right = new JPanel(new GridBagLayout());
- buildHints(right, hcbSearchString);
final JTextComponent editorComponent = hcbSearchString.getEditorComponent();
@@ -335,6 +352,7 @@
final JPanel p = new JPanel(new GridBagLayout());
p.add(top, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 5, 5, 0));
- p.add(left, GBC.std().anchor(GBC.NORTH).insets(5, 10, 10, 0));
- p.add(right, GBC.eol());
+ p.add(left, GBC.std().anchor(GBC.NORTH).insets(5, 10, 10, 0).fill(GBC.VERTICAL));
+ p.add(right, GBC.eol().fill(GBC.BOTH).insets(0, 10, 0, 0));
+
ExtendedDialog dialog = new ExtendedDialog(
Main.parent,
@@ -400,15 +418,17 @@
}
- private static void buildHints(JPanel right, HistoryComboBox hcbSearchString) {
- right.add(new SearchKeywordRow(hcbSearchString)
- .addTitle(tr("basic examples"))
+ private static JPanel buildHintsSection(HistoryComboBox hcbSearchString) {
+ JPanel hintPanel = new JPanel(new GridBagLayout());
+ hintPanel.setBorder(BorderFactory.createTitledBorder(tr("Search hints")));
+
+ hintPanel.add(new SearchKeywordRow(hcbSearchString)
+ .addTitle(tr("basics"))
.addKeyword(tr("Baker Street"), null, tr("''Baker'' and ''Street'' in any key"))
- .addKeyword(tr("\"Baker Street\""), "\"\"", tr("''Baker Street'' in any key")),
- GBC.eol());
- right.add(new SearchKeywordRow(hcbSearchString)
- .addTitle(tr("basics"))
+ .addKeyword(tr("\"Baker Street\""), "\"\"", tr("''Baker Street'' in any key"))
.addKeyword("key:valuefragment", null,
tr("''valuefragment'' anywhere in ''key''"), "name:str matches name=Bakerstreet")
- .addKeyword("-key:valuefragment", null, tr("''valuefragment'' nowhere in ''key''"))
+ .addKeyword("-key:valuefragment", null, tr("''valuefragment'' nowhere in ''key''")),
+ GBC.eol());
+ hintPanel.add(new SearchKeywordRow(hcbSearchString)
.addKeyword("key=value", null, tr("''key'' with exactly ''value''"))
.addKeyword("key=*", null, tr("''key'' with any value"))
@@ -418,8 +438,8 @@
.addKeyword("\"key\"=\"value\"", "\"\"=\"\"",
tr("to quote operators.
Within quoted strings the \" and \\ characters need to be escaped " +
- "by a preceding \\ (e.g. \\\" and \\\\)."),
+ "by a preceding \\ (e.g. \\\" and \\\\)."),
"\"addr:street\""),
- GBC.eol());
- right.add(new SearchKeywordRow(hcbSearchString)
+ GBC.eol().anchor(GBC.CENTER));
+ hintPanel.add(new SearchKeywordRow(hcbSearchString)
.addTitle(tr("combinators"))
.addKeyword("expr expr", null, tr("logical and (both expressions have to be satisfied)"))
@@ -431,5 +451,5 @@
if (Main.pref.getBoolean("expert", false)) {
- right.add(new SearchKeywordRow(hcbSearchString)
+ hintPanel.add(new SearchKeywordRow(hcbSearchString)
.addTitle(tr("objects"))
.addKeyword("type:node", "type:node ", tr("all nodes"))
@@ -439,5 +459,5 @@
.addKeyword("untagged", "untagged ", tr("object without useful tags")),
GBC.eol());
- right.add(new SearchKeywordRow(hcbSearchString)
+ hintPanel.add(new SearchKeywordRow(hcbSearchString)
.addTitle(tr("metadata"))
.addKeyword("user:", "user:", tr("objects changed by user", "user:anonymous"))
@@ -449,5 +469,5 @@
"timestamp:2008/2011-02-04T12"),
GBC.eol());
- right.add(new SearchKeywordRow(hcbSearchString)
+ hintPanel.add(new SearchKeywordRow(hcbSearchString)
.addTitle(tr("properties"))
.addKeyword("nodes:20-", "nodes:", tr("ways with at least 20 nodes, or relations containing at least 20 nodes"))
@@ -458,5 +478,5 @@
.addKeyword("waylength:200-", "waylength:", tr("ways with a length of 200 m or more")),
GBC.eol());
- right.add(new SearchKeywordRow(hcbSearchString)
+ hintPanel.add(new SearchKeywordRow(hcbSearchString)
.addTitle(tr("state"))
.addKeyword("modified", "modified ", tr("all modified objects"))
@@ -466,5 +486,5 @@
.addKeyword("deleted", "deleted ", tr("all deleted objects (checkbox {0} must be enabled)", tr("all objects"))),
GBC.eol());
- right.add(new SearchKeywordRow(hcbSearchString)
+ hintPanel.add(new SearchKeywordRow(hcbSearchString)
.addTitle(tr("related objects"))
.addKeyword("child expr", "child ", tr("all children of objects matching the expression"), "child building")
@@ -477,5 +497,5 @@
tr("every n-th member of relation and/or every n-th node of way"), "nth%:100 (child waterway)"),
GBC.eol());
- right.add(new SearchKeywordRow(hcbSearchString)
+ hintPanel.add(new SearchKeywordRow(hcbSearchString)
.addTitle(tr("view"))
.addKeyword("inview", "inview ", tr("objects in current view"))
@@ -486,4 +506,6 @@
GBC.eol());
}
+
+ return hintPanel;
}
@@ -605,5 +627,5 @@
);
}
- } else if (Main.map != null) {
+ } else {
Main.map.statusLine.setHelpText(tr("Found {0} matches", foundMatches));
}