Changeset 4587 in josm

Timestamp:

Nov 7, 2011 1:12:19 PM (19 months ago)

Author:

stoecker

Message:

fix #6974 - patch by akks - Ability to add custom search from search dialog

File:

• trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified) (5 diffs)

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

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import org.openstreetmap.josm.gui.preferences.ToolbarPreferences.ActionParser;
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trc;
@@ -36 +37 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
 import org.openstreetmap.josm.tools.GBC;
@@ -186 +188 @@
         allElements.setToolTipText(tr("Also include incomplete and deleted objects in search."));
         final JCheckBox regexSearch   = new JCheckBox(tr("regular expression"), initialValues.regexSearch);
+        final JCheckBox addOnToolbar  = new JCheckBox(tr("Add toolbar button"), false); 
 
         JPanel top = new JPanel(new GridBagLayout());
@@ -200 +203 @@
             left.add(allElements, GBC.eol());
             left.add(regexSearch, GBC.eol());
+            left.add(addOnToolbar, GBC.eol()); 
         }
 
@@ -293 +297 @@
         initialValues.allElements = allElements.isSelected();
         initialValues.regexSearch = regexSearch.isSelected();
+        
+        if (addOnToolbar.isSelected()) {
+            ToolbarPreferences.ActionDefinition aDef = 
+                    new ToolbarPreferences.ActionDefinition(Main.main.menu.search);
+            aDef.getParameters().put("searchExpression", initialValues);
+            // parametrized action definition is now composed
+            ActionParser actionParser = new ToolbarPreferences.ActionParser(null);
+            String res = actionParser.saveAction(aDef);
+            
+            Collection<String> t = new LinkedList<String>(Main.pref.getCollection("toolbar"));
+            if (t!=null) {
+                // add custom search button to toolbar preferences
+                if (!t.contains(res)) t.add(res);
+                Main.pref.putCollection("toolbar", t);
+                Main.toolbar.refreshToolbarControl();
+            }
+        }
         return initialValues;
     }