Changeset 4590 in josm for trunk/src/org/openstreetmap/josm/gui/help

Timestamp:

2011-11-12T12:54:49+01:00 (13 years ago)

Author:

stoecker

Message:

see #59 - patch by xeen - apply parts of the new Windows menu stuff

File:

• trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java

@@ -25 +25 @@
 import javax.swing.JDialog;
 import javax.swing.JEditorPane;
+import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -45 +46 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
+import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.OpenBrowser;
@@ -53 +56 @@
     /** the unique instance */
     private static HelpBrowser instance;
+
+    /** the menu item in the windows menu. Required to properly
+     * hide on dialog close.
+     */
+    private JMenuItem windowMenuItem;
 
     /**
@@ -106 +114 @@
 
     private HelpContentReader reader;
+
+    private static final JosmAction focusAction = new JosmAction(tr("JOSM Help Browser"), "help", "", null, false, false) {
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            HelpBrowser.getInstance().setVisible(true);
+        }
+    };
 
     /**
@@ -193 +208 @@
         } else if (!visible && isShowing()){
             new WindowGeometry(this).remember(getClass().getName() + ".geometry");
+        }
+        if(windowMenuItem != null && !visible) {
+            Main.main.menu.windowMenu.remove(windowMenuItem);
+            windowMenuItem = null;
+        }
+        if(windowMenuItem == null && visible) {
+            windowMenuItem = MainMenu.add(Main.main.menu.windowMenu, focusAction, MainMenu.WINDOW_MENU_GROUP.VOLATILE);
         }
         super.setVisible(visible);