Changeset 2530 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-11-28T14:06:35+01:00 (15 years ago)

Author:

Gubaer

Message:

fixed #2261: "Wireframe View" should be turned into a JosmAction

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/WireframeToggleAction.java (added)
• gui/MainMenu.java (modified) (6 diffs)

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

@@ -3 +3 @@
 package org.openstreetmap.josm.gui;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -25 +26 @@
 import org.openstreetmap.josm.actions.AlignInLineAction;
 import org.openstreetmap.josm.actions.AutoScaleAction;
+import org.openstreetmap.josm.actions.CloseChangesetAction;
 import org.openstreetmap.josm.actions.CombineWayAction;
 import org.openstreetmap.josm.actions.CopyAction;
@@ -58 +60 @@
 import org.openstreetmap.josm.actions.ShowStatusReportAction;
 import org.openstreetmap.josm.actions.SplitWayAction;
-import org.openstreetmap.josm.actions.CloseChangesetAction;
 import org.openstreetmap.josm.actions.ToggleGPXLinesAction;
 import org.openstreetmap.josm.actions.UnGlueAction;
@@ -67 +68 @@
 import org.openstreetmap.josm.actions.UploadAction;
 import org.openstreetmap.josm.actions.UploadSelectionAction;
+import org.openstreetmap.josm.actions.WireframeToggleAction;
 import org.openstreetmap.josm.actions.ZoomInAction;
 import org.openstreetmap.josm.actions.ZoomOutAction;
@@ -81 +83 @@
 import org.openstreetmap.josm.tools.PlatformHookUnixoid;
 import org.openstreetmap.josm.tools.Shortcut;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 /**
  * This is the JOSM main menu bar. It is overwritten to initialize itself and provide all menu
@@ -237 +238 @@
         add(editMenu, preferences);
 
-        // TODO move code to an "action" like the others?
-        final JCheckBoxMenuItem wireframe = new JCheckBoxMenuItem(tr("Wireframe View"));
-        wireframe.setSelected(Main.pref.getBoolean("draw.wireframe", false));
-        wireframe.setAccelerator(Shortcut.registerShortcut("menu:view:wireframe", tr("Toggle Wireframe view"),
-                KeyEvent.VK_W, Shortcut.GROUP_MENU).getKeyStroke());
-        wireframe.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent ev) {
-                Main.pref.put("draw.wireframe", wireframe.isSelected());
-                if (Main.map != null) {
-                    Main.map.mapView.repaint();
-                }
-            }
-        });
+        // -- wireframe toggle action
+        WireframeToggleAction wireFrameToggleAction = new WireframeToggleAction();
+        final JCheckBoxMenuItem wireframe = new JCheckBoxMenuItem(wireFrameToggleAction);
         viewMenu.add(wireframe);
+        wireframe.setAccelerator(wireFrameToggleAction.getShortcut().getKeyStroke());
+        wireFrameToggleAction.addButtonModel(wireframe.getModel());
+
         viewMenu.addSeparator();
         add(viewMenu, new ZoomInAction());