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

Timestamp:

2009-03-18T15:46:46+01:00 (15 years ago)

Author:

stoecker

Message:

fix translation issues for help, add fullscreen mode (patch by avar) - closes #1915, #2279, #2336 - breaks plugin interface

File:

• trunk/src/org/openstreetmap/josm/actions/HelpAction.java (modified) (2 diffs)

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

@@ -134 +134 @@
         if (c instanceof Helpful)
             return ((Helpful)c).helpTopic();
-        if (c instanceof JMenu)
-            return "Menu/"+((JMenu)c).getText();
+        if (c instanceof JMenu) {
+            JMenu b = (JMenu)c;
+            if (b.getClientProperty("help") != null)
+                return (String)b.getClientProperty("help");
+            return "Menu/"+b.getText();
+        }
         if (c instanceof AbstractButton) {
             AbstractButton b = (AbstractButton)c;
@@ -163 +167 @@
      */
     public void setHelpUrl(String url) {
-        int i = url.lastIndexOf("/")+1;
-        String title = url.substring(i);
-        if(!title.startsWith(languageCode) && !languageCode.equals("En:"))
-            title = languageCode + title;
-        String langurl = url.substring(0, i) + title;
+        int i = url.indexOf("/wiki/Help/")+6;
+        String langurl = url;
+        if(i > 0)
+        {
+            String title = url.substring(i);
+            if(!title.startsWith(languageCode) && !languageCode.equals("En:"))
+                title = languageCode + title;
+            langurl = url.substring(0, i) + title;
+        }
         boolean loaded = false;
         if(!langurl.equals(this.url) && !langurl.equals(url))