Changeset 155 in josm for src/org/openstreetmap/josm/Main.java

Timestamp:

2006-10-08T17:29:58+02:00 (20 years ago)

Author:

imi

Message:

• added online help system

File:

• src/org/openstreetmap/josm/Main.java (modified) (9 diffs)

src/org/openstreetmap/josm/Main.java

@@ -8 +8 @@
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 import java.io.File;
 import java.net.URI;
@@ -22 +23 @@
 import javax.swing.AbstractAction;
 import javax.swing.Action;
+import javax.swing.JComponent;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
@@ -28 +30 @@
 import javax.swing.JSeparator;
 import javax.swing.JToolBar;
-import javax.swing.SwingUtilities;
+import javax.swing.KeyStroke;
 import javax.swing.UIManager;
 
@@ -37 +39 @@
 import org.openstreetmap.josm.actions.ExternalToolsAction;
 import org.openstreetmap.josm.actions.GpxExportAction;
+import org.openstreetmap.josm.actions.HelpAction;
 import org.openstreetmap.josm.actions.OpenAction;
 import org.openstreetmap.josm.actions.PreferencesAction;
@@ -104 +107 @@
          */
         public static PleaseWaitDialog pleaseWaitDlg;
+        /**
+         * The access to the help subsystem
+         */
+        public HelpAction help;
 
 
@@ -192 +199 @@
                 final Action exitAction = new ExitAction();
                 final Action preferencesAction = new PreferencesAction();
+                help = new HelpAction();
                 final Action aboutAction = new AboutAction();
 
@@ -235 +243 @@
                 final JMenu helpMenu = new JMenu(tr("Help"));
                 helpMenu.setMnemonic('H');
+                helpMenu.add(help);
+                helpMenu.add(aboutAction);
+                helpMenu.addSeparator();
                 helpMenu.add(annotationTesterAction);
-                helpMenu.addSeparator();
-                helpMenu.add(aboutAction);
                 mainMenu.add(helpMenu);
 
@@ -256 +265 @@
                 contentPane.add(toolBar, BorderLayout.NORTH);
 
+        contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_F1, 0), "Help");
+        contentPane.getActionMap().put("Help", help);
+
                 contentPane.updateUI();
-
-                // Plugins
-                if (Main.pref.hasKey("plugins")) {
+        }
+
+        /**
+         * Load all plugins specified in preferences. Has to be called after the complete
+         * GUI has been set up. (post-constructor)
+         */
+        public void loadPlugins() {
+            if (Main.pref.hasKey("plugins")) {
                         for (String pluginName : Main.pref.get("plugins").split(",")) {
                                 try {
@@ -273 +290 @@
                         }
                 }
-
-                SwingUtilities.updateComponentTreeUI(parent);
-                for (DownloadTask task : downloadAction.downloadTasks)
-                        task.getCheckBox().updateUI();
-        }
+    }
 
         /**