Changeset 6844 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

Timestamp:

2014-02-12T15:58:32+01:00 (10 years ago)

Author:

akks

Message:

see #9709: "Add to toolbar" in preset list context menu (F3-right click)

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -469 +469 @@
      * Value: The action to execute.
      */
-    private Map<String, Action> actions = new HashMap<String, Action>();
-    private Map<String, Action> regactions = new HashMap<String, Action>();
-
-    private DefaultMutableTreeNode rootActionsNode = new DefaultMutableTreeNode(tr("Actions"));
+    private final Map<String, Action> actions = new HashMap<String, Action>();
+    private final Map<String, Action> regactions = new HashMap<String, Action>();
+
+    private final DefaultMutableTreeNode rootActionsNode = new DefaultMutableTreeNode(tr("Actions"));
 
     public JToolBar control = new JToolBar();
-    private Map<Object, ActionDefinition> buttonActions = new HashMap<Object, ActionDefinition>(30);
+    private final Map<Object, ActionDefinition> buttonActions = new HashMap<Object, ActionDefinition>(30);
 
     @Override
@@ -529 +529 @@
         private class ActionTransferable implements Transferable {
 
-            private DataFlavor[] flavors = new DataFlavor[] { ACTION_FLAVOR };
+            private final DataFlavor[] flavors = new DataFlavor[] { ACTION_FLAVOR };
 
             private final List<ActionDefinition> actions;
@@ -1056 +1056 @@
         control.repaint();
     }
+    
+    /**
+     * The method to add custom button on toolbar like search or preset buttons
+     * @param definitionText toolbar definition text to describe the new button,
+     * must be carefully generated by using {@link ActionParser}
+     * @param preferredIndex place to put the new button, give -1 for the end of toolbar
+     * @param removeIfExists if true and the button already exists, remove it
+     */
+    public void addCustomButton(String definitionText, int preferredIndex, boolean removeIfExists) {
+        LinkedList<String> t = new LinkedList<String>(getToolString());
+        if (t.contains(definitionText)) {
+            if (!removeIfExists) return; // do nothing
+            t.remove(definitionText);
+        } else {
+            if (preferredIndex>=0 && preferredIndex < t.size()) {
+                t.add(preferredIndex, definitionText); // add to specified place
+            } else {
+                t.add(definitionText); // add to the end
+            }
+        }
+        Main.pref.putCollection("toolbar", t);
+        Main.toolbar.refreshToolbarControl();
+    }
 
     private JButton addButtonAndShortcut(ActionDefinition action) {