- Timestamp:
- 2009-11-29T14:01:41+01:00 (15 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java
r2546 r2548 135 135 pnl.add(btn = new SideButton(actCancel = new CancelAction())); 136 136 makeButtonRespondToEnter(btn); 137 pnl.add(new SideButton(new ContextSensitiveHelpAction(ht("/Action s/AddNode"))));137 pnl.add(new SideButton(new ContextSensitiveHelpAction(ht("/Action/AddNode")))); 138 138 return pnl; 139 139 } … … 158 158 // make dialog respond to F1 159 159 // 160 HelpUtil.setHelpContext(getRootPane(), ht("/Action s/AddNode"));160 HelpUtil.setHelpContext(getRootPane(), ht("/Action/AddNode")); 161 161 } 162 162 -
trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
r2512 r2548 3 3 package org.openstreetmap.josm.gui.layer; 4 4 5 import static org.openstreetmap.josm.gui.help.HelpUtil.ht; 5 6 import static org.openstreetmap.josm.tools.I18n.marktr; 6 7 import static org.openstreetmap.josm.tools.I18n.tr; … … 59 60 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; 60 61 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil; 62 import org.openstreetmap.josm.gui.HelpAwareOptionPane; 61 63 import org.openstreetmap.josm.gui.MapView; 62 64 import org.openstreetmap.josm.gui.dialogs.LayerListDialog; … … 280 282 281 283 JMenuItem tagimage = new JMenuItem(tr("Import images"), ImageProvider.get("tagimages")); 282 tagimage.putClientProperty("help", "Action/ImportImages");284 tagimage.putClientProperty("help", ht("/Action/ImportImages")); 283 285 tagimage.addActionListener(new ActionListener() { 286 287 private void warnCantImportIntoServerLayer(GpxLayer layer) { 288 String msg = tr("<html>The data in the GPX layer ''{0}'' has been downloaded from the server.<br>" 289 + "Because its way points don''t include a timestamp we can''t correlate them with images.</html>", 290 layer.getName() 291 ); 292 HelpAwareOptionPane.showOptionDialog( 293 Main.parent, 294 msg, 295 tr("Import not possible"), 296 JOptionPane.WARNING_MESSAGE, 297 ht("/Action/ImportImages#CantImportIntoGpxLayerFromServer") 298 ); 299 } 300 284 301 public void actionPerformed(ActionEvent e) { 302 if (GpxLayer.this.data.fromServer) { 303 warnCantImportIntoServerLayer(GpxLayer.this); 304 return; 305 } 285 306 JFileChooser fc = new JFileChooser(Main.pref.get("tagimages.lastdirectory")); 286 307 fc.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
Note:
See TracChangeset
for help on using the changeset viewer.