Changeset 2274 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2009-10-11T21:15:33+02:00 (17 years ago)

Author:

Gubaer

Message:

Improved help browser layout (now uses custom CSS shipped with JOSM)
Help browser now in separate process, not blocked any more when invoked from modal dialogs in JOSM
Added standard browser actions (home, prev, next) etc.
Added help support for conflict resolution

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• ExitAction.java (modified) (1 diff)
• HelpAction.java (modified) (6 diffs)
• HistoryInfoAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/ExitAction.java

@@ -27 +27 @@
         if (Main.saveUnsavedModifications()) {
             Main.saveGuiGeometry();
+            Main.cleanupBeforeExit();
             System.exit(0);
         }

trunk/src/org/openstreetmap/josm/actions/HelpAction.java

@@ -16 +16 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.help.HelpBrowser;
+import org.openstreetmap.josm.gui.help.HelpBrowserProxy;
 import org.openstreetmap.josm.gui.help.Helpful;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -27 +27 @@
 public class HelpAction extends AbstractAction {
 
-    private HelpBrowser helpBrowser;
 
     private String pathhelp = Main.pref.get("help.pathhelp", "Help/");
@@ -34 +33 @@
     public HelpAction() {
         super(tr("Help"), ImageProvider.get("help"));
-        this.helpBrowser = new HelpBrowser();
     }
 
@@ -43 +41 @@
                 Component c = SwingUtilities.getRoot((Component)e.getSource());
                 Point mouse = c.getMousePosition();
-                c = SwingUtilities.getDeepestComponentAt(c, mouse.x, mouse.y);
-                topic = contextSensitiveHelp(c);
+                if (mouse != null) {
+                    c = SwingUtilities.getDeepestComponentAt(c, mouse.x, mouse.y);
+                    topic = contextSensitiveHelp(c);
+                } else {
+                    topic = null;
+                }
             } else {
                 Point mouse = Main.parent.getMousePosition();
@@ -50 +52 @@
             }
             if (topic == null) {
-                helpBrowser.setVisible(false);
-                helpBrowser.setUrlForHelpTopic("Help");
+                HelpBrowserProxy.getInstance().setUrlForHelpTopic("Help");
             } else {
                 help(topic);
             }
         } else {
-            helpBrowser.setVisible(false);
-            helpBrowser.setUrlForHelpTopic("Help");
+            HelpBrowserProxy.getInstance().setUrlForHelpTopic("Help");
         }
     }
@@ -95 +95 @@
      */
     public void help(String topic) {
-        helpBrowser.setVisible(false);
-        helpBrowser.setUrlForHelpTopic(pathhelp + topic);
+        HelpBrowserProxy.getInstance().setUrlForHelpTopic(pathhelp + topic);
     }
 }

trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java

@@ -13 +13 @@
 
     public HistoryInfoAction() {
-        super(tr("History of Element"), "about",
+        super(tr("Object history"), "about",
                 tr("Display history information about OSM ways, nodes, or relations."),
                 Shortcut.registerShortcut("core:history",
-                        tr("History of Element"), KeyEvent.VK_H, Shortcut.GROUP_HOTKEY), true);
+                        tr("Object history"), KeyEvent.VK_H, Shortcut.GROUP_HOTKEY), true);
     }