Changeset 5088 in josm for trunk/src/org

Timestamp:

2012-03-15T10:19:24+01:00 (13 years ago)

Author:

simon04

Message:

fix #6895 - improve MapPaintMenu (add "Preference", keep menu open after clicking checkbox) - thanks: ​http://tips4java.wordpress.com/2010/09/12/keeping-menus-open/

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MenuScroller.java (modified) (1 diff)
• dialogs/MapPaintDialog.java (modified) (1 diff)
• mappaint/MapPaintMenu.java (modified) (4 diffs)
• util/StayOpenCheckBoxMenuItem.java (added)
• util/StayOpenMenuItem.java (added)
• util/StayOpenRadioButtonMenuItem.java (added)

trunk/src/org/openstreetmap/josm/gui/MenuScroller.java

@@ -10 +10 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.MouseWheelEvent;
-import java.awt.event.MouseWheelListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import javax.swing.Icon;
 import javax.swing.JComponent;

trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

@@ -362 +362 @@
      * Opens preferences window and selects the mappaint tab.
      */
-    static class LaunchMapPaintPreferencesAction extends AbstractAction {
+    public static class LaunchMapPaintPreferencesAction extends AbstractAction {
         public LaunchMapPaintPreferencesAction() {
             putValue(NAME, tr("Preferences"));

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java

@@ -5 +5 @@
 import java.awt.event.ActionEvent;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JMenu;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.gui.dialogs.MapPaintDialog;
+import org.openstreetmap.josm.gui.dialogs.MapPaintDialog.LaunchMapPaintPreferencesAction;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.MapPaintSylesUpdateListener;
+import org.openstreetmap.josm.gui.util.StayOpenCheckBoxMenuItem;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -29 +30 @@
                 Main.toolbar.register(this);
             }
-            this.button = new JCheckBoxMenuItem(this);
+            this.button = new StayOpenCheckBoxMenuItem(this);
             this.style = style;
             updateButton();
@@ -57 +58 @@
         }
     }
-    private Map<String, MapPaintAction> actions = new HashMap<String, MapPaintAction>();
+    private final Map<String, MapPaintAction> actions = new HashMap<String, MapPaintAction>();
+    private final LaunchMapPaintPreferencesAction mapPaintPreferencesAction = new MapPaintDialog.LaunchMapPaintPreferencesAction() {
+
+        {
+            putValue("toolbar", "mappaintpreference");
+        }
+    };
 
     public MapPaintMenu() {
@@ -67 +74 @@
     @Override
     public void mapPaintStylesUpdated() {
-        final Set<String> actionsToRemove = new HashSet<String>(actions.keySet());
+        removeAll();
         for (StyleSource style : MapPaintStyles.getStyles().getStyleSources()) {
             final String k = style.getDisplayString();
             MapPaintAction a = actions.get(k);
             if (a == null) {
-                a = new MapPaintAction(style);
+                actions.put(k, a = new MapPaintAction(style));
                 add(a.getButton());
-                actions.put(k, a);
             } else {
+                add(a.getButton());
                 a.updateButton();
-                actionsToRemove.remove(k);
             }
         }
-        for (String k : actionsToRemove) {
-            final MapPaintAction a = actions.get(k);
-            if (a != null) {
-                remove(a.getButton());
-                actions.remove(k);
-            }
-        }
+        addSeparator();
+        add(mapPaintPreferencesAction);
     }