Changeset 3754 in josm for trunk/src/org/openstreetmap/josm
- Timestamp:
- 2011-01-01T22:12:03+01:00 (14 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java
r3083 r3754 2 2 package org.openstreetmap.josm.actions; 3 3 4 import static org.openstreetmap.josm.gui.help.HelpUtil.ht; 4 5 import static org.openstreetmap.josm.tools.I18n.tr; 5 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;6 6 7 7 import java.awt.event.ActionEvent; -
trunk/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java
r3753 r3754 20 20 super(trc("audio", "Back"), "audio-back", trc("audio", "Jump back."), 21 21 Shortcut.registerShortcut("audio:back", tr("Audio: {0}", trc("audio", "Back")), KeyEvent.VK_F6, Shortcut.GROUP_DIRECT), true); 22 this.putValue("help", ht(" Action/AudioBack"));22 this.putValue("help", ht("/Action/AudioBack")); 23 23 } 24 24 -
trunk/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java
r2857 r3754 2 2 package org.openstreetmap.josm.actions.audio; 3 3 4 import static org.openstreetmap.josm.gui.help.HelpUtil.ht; 4 5 import static org.openstreetmap.josm.tools.I18n.tr; 5 6 import static org.openstreetmap.josm.tools.I18n.trc; … … 14 15 super(trc("audio", "Faster"), "audio-faster", trc("audio", "Faster Forward"), 15 16 Shortcut.registerShortcut("audio:faster", tr("Audio: {0}", trc("audio", "Faster")), KeyEvent.VK_F9, Shortcut.GROUP_DIRECT), true); 17 this.putValue("help", ht("/Action/AudioFaster")); 16 18 } 17 19 } -
trunk/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java
r2857 r3754 2 2 package org.openstreetmap.josm.actions.audio; 3 3 4 import static org.openstreetmap.josm.gui.help.HelpUtil.ht; 4 5 import static org.openstreetmap.josm.tools.I18n.tr; 5 6 import static org.openstreetmap.josm.tools.I18n.trc; … … 14 15 super(trc("audio", "Slower"), "audio-slower", trc("audio", "Slower Forward"), 15 16 Shortcut.registerShortcut("audio:slower", tr("Audio: {0}", trc("audio", "Slower")), KeyEvent.VK_F4, Shortcut.GROUP_DIRECT), true); 17 this.putValue("help", ht("/Action/AudioSlower")); 16 18 } 17 19 } -
trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
r3682 r3754 2 2 package org.openstreetmap.josm.actions.mapmode; 3 3 4 import static org.openstreetmap.josm.gui.help.HelpUtil.ht; 4 5 import static org.openstreetmap.josm.tools.I18n.tr; 5 6 … … 110 111 mapFrame, 111 112 getCursor("normal", "rectangle", Cursor.DEFAULT_CURSOR)); 112 putValue("help", "Action/Extrude/Extrude");113 putValue("help", ht("/Action/Extrude/Extrude")); 113 114 initialMoveDelay = Main.pref.getInteger("edit.initial-move-delay",200); 114 115 selectedColor = PaintColors.SELECTED.get(); -
trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
r3702 r3754 2 2 package org.openstreetmap.josm.actions.mapmode; 3 3 4 import static org.openstreetmap.josm.gui.help.HelpUtil.ht; 4 5 import static org.openstreetmap.josm.tools.I18n.tr; 5 6 import static org.openstreetmap.josm.tools.I18n.trn; … … 110 111 getCursor("normal", "selection", Cursor.DEFAULT_CURSOR)); 111 112 mv = mapFrame.mapView; 112 putValue("help", "Action/Move/Move");113 putValue("help", ht("/Action/Move/Move")); 113 114 selectionManager = new SelectionManager(this, false, mv); 114 115 initialMoveDelay = Main.pref.getInteger("edit.initial-move-delay", 200); -
trunk/src/org/openstreetmap/josm/gui/MapScaler.java
r3530 r3754 3 3 package org.openstreetmap.josm.gui; 4 4 5 import static org.openstreetmap.josm.gui.help.HelpUtil.ht; 5 6 import static org.openstreetmap.josm.tools.I18n.marktr; 6 7 … … 46 47 47 48 public String helpTopic() { 48 return "MapView/Scaler";49 return ht("/MapView/Scaler"); 49 50 } 50 51 } -
trunk/src/org/openstreetmap/josm/gui/MapSlider.java
r2512 r3754 1 1 // License: GPL. Copyright 2007 by Immanuel Scholz and others 2 2 package org.openstreetmap.josm.gui; 3 4 import static org.openstreetmap.josm.gui.help.HelpUtil.ht; 3 5 4 6 import java.beans.PropertyChangeEvent; … … 64 66 65 67 public String helpTopic() { 66 return "MapView/Slider";68 return ht("/MapView/Slider"); 67 69 } 68 70 } -
trunk/src/org/openstreetmap/josm/gui/MapStatus.java
r3642 r3754 2 2 package org.openstreetmap.josm.gui; 3 3 4 import static org.openstreetmap.josm.gui.help.HelpUtil.ht; 4 5 import static org.openstreetmap.josm.tools.I18n.tr; 5 6 … … 624 625 625 626 public String helpTopic() { 626 return "Statusline";627 return ht("/Statusline"); 627 628 } 628 629 -
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
r3416 r3754 2 2 package org.openstreetmap.josm.gui.dialogs; 3 3 4 import static org.openstreetmap.josm.gui.help.HelpUtil.ht; 4 5 import static org.openstreetmap.josm.tools.I18n.marktr; 5 6 import static org.openstreetmap.josm.tools.I18n.tr; … … 258 259 @Override 259 260 public String helpTopic() { 260 return "Dialogs/ConflictListDialog";261 return ht("/Dialogs/ConflictListDialog"); 261 262 } 262 263 … … 327 328 putValue(SHORT_DESCRIPTION, tr("Open a merge dialog of all selected items in the list above.")); 328 329 putValue(SMALL_ICON, ImageProvider.get("dialogs", "conflict")); 329 putValue("help", "Dialogs/ConflictListDialog#ResolveAction");330 putValue("help", ht("/Dialogs/ConflictListDialog#ResolveAction")); 330 331 } 331 332 … … 347 348 putValue(SHORT_DESCRIPTION, tr("Set the selected elements on the map to the selected items in the list above.")); 348 349 putValue(SMALL_ICON, ImageProvider.get("dialogs", "select")); 349 putValue("help", "Dialogs/ConflictListDialog#SelectAction");350 putValue("help", ht("/Dialogs/ConflictListDialog#SelectAction")); 350 351 } 351 352 -
trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java
r3083 r3754 179 179 spec, 180 180 spec[0], 181 ht(" Concepts/Conflict")181 ht("/Concepts/Conflict") 182 182 ); 183 183 if (ret == 0) { -
trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
r3753 r3754 1277 1277 public CustomizeColor() { 1278 1278 super(tr("Customize Color"), ImageProvider.get("colorchooser")); 1279 putValue("help", ht(" Action/LayerCustomizeColor"));1279 putValue("help", ht("/Action/LayerCustomizeColor")); 1280 1280 } 1281 1281 … … 1312 1312 public MarkersFromNamedPoins() { 1313 1313 super(tr("Markers From Named Points"), ImageProvider.get("addmarkers")); 1314 putValue("help", ht(" Action/MarkersFromNamedPoints"));1314 putValue("help", ht("/Action/MarkersFromNamedPoints")); 1315 1315 } 1316 1316 … … 1340 1340 public ImportAudio() { 1341 1341 super(tr("Import Audio"), ImageProvider.get("importaudio")); 1342 putValue("help", ht(" ImportAudio"));1342 putValue("help", ht("/ImportAudio")); 1343 1343 } 1344 1344 -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
r3408 r3754 2 2 package org.openstreetmap.josm.gui.layer.markerlayer; 3 3 4 import static org.openstreetmap.josm.gui.help.HelpUtil.ht; 4 5 import static org.openstreetmap.josm.tools.I18n.marktr; 5 6 import static org.openstreetmap.josm.tools.I18n.tr; … … 377 378 super(tr("Show Text/Icons"), ImageProvider.get("dialogs", "showhide")); 378 379 putValue(SHORT_DESCRIPTION, tr("Toggle visible state of the marker text and icons.")); 379 putValue("help", "Action/ShowHideTextIcons");380 putValue("help", ht("/Action/ShowHideTextIcons")); 380 381 this.layer = layer; 381 382 } … … 406 407 public CustomizeColor() { 407 408 super(tr("Customize Color"), ImageProvider.get("colorchooser")); 408 putValue("help", "Action/LayerCustomizeColor");409 putValue("help", ht("/Action/LayerCustomizeColor")); 409 410 } 410 411 … … 441 442 public SynchronizeAudio() { 442 443 super(tr("Synchronize Audio"), ImageProvider.get("audio-sync")); 443 putValue("help", "Action/SynchronizeAudio");444 putValue("help", ht("/Action/SynchronizeAudio")); 444 445 } 445 446 … … 478 479 public MoveAudio() { 479 480 super(tr("Make Audio Marker at Play Head"), ImageProvider.get("addmarkers")); 480 putValue("help", "Action/MakeAudioMarkerAtPlayHead");481 putValue("help", ht("/Action/MakeAudioMarkerAtPlayHead")); 481 482 } 482 483 -
trunk/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java
r3646 r3754 757 757 tr("Error"), 758 758 JOptionPane.ERROR_MESSAGE, 759 ht(" Preferences/Styles#FailedToLoadStyleSources")759 ht("/Preferences/Styles#FailedToLoadStyleSources") 760 760 ); 761 761 }
Note:
See TracChangeset
for help on using the changeset viewer.