Changeset 2533 in josm for trunk

Timestamp:

2009-11-28T16:01:05+01:00 (15 years ago)

Author:

Gubaer

Message:

applied #4033: patch by avar: "Fullscreen View" should be turned into a JosmAction

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/FullscreenToggleAction.java (added)
• gui/MainMenu.java (modified) (4 diffs)

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

@@ -7 +7 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Frame;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -69 +66 @@
 import org.openstreetmap.josm.actions.UploadSelectionAction;
 import org.openstreetmap.josm.actions.WireframeToggleAction;
+import org.openstreetmap.josm.actions.FullscreenToggleAction;
 import org.openstreetmap.josm.actions.ZoomInAction;
 import org.openstreetmap.josm.actions.ZoomOutAction;
@@ -81 +79 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;
-import org.openstreetmap.josm.tools.PlatformHookUnixoid;
 import org.openstreetmap.josm.tools.Shortcut;
 /**
@@ -254 +251 @@
         }
 
-        //
-        // Full Screen action
-        //
-        final GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
-
-        if (Main.platform instanceof PlatformHookUnixoid && gd.isFullScreenSupported()) {
-            final JCheckBoxMenuItem fullscreen = new JCheckBoxMenuItem(tr("Full Screen"));
-            fullscreen.setSelected(Main.pref.getBoolean("draw.fullscreen", false));
-            fullscreen.setAccelerator(Shortcut.registerShortcut("menu:view:fullscreen", tr("Toggle Full Screen view"),
-                    KeyEvent.VK_F11, Shortcut.GROUP_DIRECT).getKeyStroke());
-
-            fullscreen.addActionListener(new ActionListener() {
-                public void actionPerformed(ActionEvent ev) {
-                    Main.pref.put("draw.fullscreen", fullscreen.isSelected());
-
-                    if (Main.pref.getBoolean("draw.fullscreen")) {
-                        Frame frame = (Frame)Main.parent;
-                        gd.setFullScreenWindow(frame);
-                    } else {
-                        gd.setFullScreenWindow(null);
-                    }
-                }
-            });
+        // -- fullscreen toggle action
+        FullscreenToggleAction fullscreenToggleAction = new FullscreenToggleAction();
+        if (fullscreenToggleAction.canFullscreen()) {
+            final JCheckBoxMenuItem fullscreen = new JCheckBoxMenuItem(fullscreenToggleAction);
             viewMenu.addSeparator();
             viewMenu.add(fullscreen);
+            fullscreen.setAccelerator(fullscreenToggleAction.getShortcut().getKeyStroke());
+            fullscreenToggleAction.addButtonModel(fullscreen.getModel());
         }