Changeset 3754 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2011-01-01T22:12:03+01:00 (13 years ago)

Author:

stoecker

Message:

some cleanups in help page marking

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapScaler.java (modified) (2 diffs)
• MapSlider.java (modified) (2 diffs)
• MapStatus.java (modified) (2 diffs)
• dialogs/ConflictDialog.java (modified) (4 diffs)
• io/AbstractUploadTask.java (modified) (1 diff)
• layer/GpxLayer.java (modified) (3 diffs)
• layer/markerlayer/MarkerLayer.java (modified) (5 diffs)
• preferences/StyleSourceEditor.java (modified) (1 diff)

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

@@ -3 +3 @@
 package org.openstreetmap.josm.gui;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.marktr;
 
@@ -46 +47 @@
 
     public String helpTopic() {
-        return "MapView/Scaler";
+        return ht("/MapView/Scaler");
     }
 }

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

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.gui;
+
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 import java.beans.PropertyChangeEvent;
@@ -64 +66 @@
 
     public String helpTopic() {
-        return "MapView/Slider";
+        return ht("/MapView/Slider");
     }
 }

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -624 +625 @@
 
     public String helpTopic() {
-        return "Statusline";
+        return ht("/Statusline");
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.dialogs;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -258 +259 @@
     @Override
     public String helpTopic() {
-        return "Dialogs/ConflictListDialog";
+        return ht("/Dialogs/ConflictListDialog");
     }
 
@@ -327 +328 @@
             putValue(SHORT_DESCRIPTION,  tr("Open a merge dialog of all selected items in the list above."));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "conflict"));
-            putValue("help", "Dialogs/ConflictListDialog#ResolveAction");
+            putValue("help", ht("/Dialogs/ConflictListDialog#ResolveAction"));
         }
 
@@ -347 +348 @@
             putValue(SHORT_DESCRIPTION,  tr("Set the selected elements on the map to the selected items in the list above."));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "select"));
-            putValue("help", "Dialogs/ConflictListDialog#SelectAction");
+            putValue("help", ht("/Dialogs/ConflictListDialog#SelectAction"));
         }
 

trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java

@@ -179 +179 @@
                 spec,
                 spec[0],
-                ht("Concepts/Conflict")
+                ht("/Concepts/Conflict")
         );
         if (ret == 0) {

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -1277 +1277 @@
         public CustomizeColor() {
             super(tr("Customize Color"), ImageProvider.get("colorchooser"));
-            putValue("help", ht("Action/LayerCustomizeColor"));
+            putValue("help", ht("/Action/LayerCustomizeColor"));
         }
 
@@ -1312 +1312 @@
         public MarkersFromNamedPoins() {
             super(tr("Markers From Named Points"), ImageProvider.get("addmarkers"));
-            putValue("help", ht("Action/MarkersFromNamedPoints"));
+            putValue("help", ht("/Action/MarkersFromNamedPoints"));
         }
 
@@ -1340 +1340 @@
         public ImportAudio() {
             super(tr("Import Audio"), ImageProvider.get("importaudio"));
-            putValue("help", ht("ImportAudio"));
+            putValue("help", ht("/ImportAudio"));
         }
 

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.layer.markerlayer;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -377 +378 @@
             super(tr("Show Text/Icons"), ImageProvider.get("dialogs", "showhide"));
             putValue(SHORT_DESCRIPTION, tr("Toggle visible state of the marker text and icons."));
-            putValue("help", "Action/ShowHideTextIcons");
+            putValue("help", ht("/Action/ShowHideTextIcons"));
             this.layer = layer;
         }
@@ -406 +407 @@
         public CustomizeColor() {
             super(tr("Customize Color"), ImageProvider.get("colorchooser"));
-            putValue("help", "Action/LayerCustomizeColor");
+            putValue("help", ht("/Action/LayerCustomizeColor"));
         }
 
@@ -441 +442 @@
         public SynchronizeAudio() {
             super(tr("Synchronize Audio"), ImageProvider.get("audio-sync"));
-            putValue("help", "Action/SynchronizeAudio");
+            putValue("help", ht("/Action/SynchronizeAudio"));
         }
 
@@ -478 +479 @@
         public MoveAudio() {
             super(tr("Make Audio Marker at Play Head"), ImageProvider.get("addmarkers"));
-            putValue("help", "Action/MakeAudioMarkerAtPlayHead");
+            putValue("help", ht("/Action/MakeAudioMarkerAtPlayHead"));
         }
 

trunk/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java

@@ -757 +757 @@
                     tr("Error"),
                     JOptionPane.ERROR_MESSAGE,
-                    ht("Preferences/Styles#FailedToLoadStyleSources")
+                    ht("/Preferences/Styles#FailedToLoadStyleSources")
             );
         }