Changeset 878 in josm for trunk

Timestamp:

2008-08-28T13:44:27+02:00 (16 years ago)

Author:

stoecker

Message:

added ToolBar popup menus. Closes #1087.

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• preferences/TaggingPresetPreference.java (modified) (1 diff)
• tagging/TaggingPresetMenu.java (modified) (2 diffs)

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

@@ -138 +138 @@
                                 {
                                         JMenu submenu = new JMenu(p);
+                                        ((TaggingPresetMenu)p).menu = submenu;
                                         submenus.put((TaggingPresetMenu)p, submenu);
                                         m.add(submenu);

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.event.ActionEvent;
+import java.awt.Component;
+
 import javax.swing.Action;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+import javax.swing.JSeparator;
 
 import org.openstreetmap.josm.gui.tagging.TaggingPreset;
 
 public class TaggingPresetMenu extends TaggingPreset {
+        public JMenu menu = null; // set by TaggingPresetPreferences
         public void setDisplayName() {
                 String n = getName();
@@ -18 +26 @@
                 super.setIcon(iconName);
         }
+        public void actionPerformed(ActionEvent e) {
+                Object s = e.getSource();
+                if(menu != null && s instanceof Component)
+                {
+                        Component co = (Component)s;
+                        JPopupMenu pm = new JPopupMenu(getName());
+                        for(Component c : menu.getMenuComponents())
+                        {
+                                if(c instanceof JMenuItem)
+                                {
+                                        JMenuItem j = new JMenuItem(((JMenuItem)c).getAction());
+                                        j.setText(((JMenuItem)c).getText());
+                                        pm.add(j);
+                                }
+                                else if(c instanceof JSeparator)
+                                        pm.addSeparator();
+                        }
+                        pm.show(co, co.getWidth()/2, co.getHeight()/2);
+                }
+        }
 }