Index: trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (revision 2546) +++ trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (revision 2548) @@ -135,5 +135,5 @@ pnl.add(btn = new SideButton(actCancel = new CancelAction())); makeButtonRespondToEnter(btn); - pnl.add(new SideButton(new ContextSensitiveHelpAction(ht("/Actions/AddNode")))); + pnl.add(new SideButton(new ContextSensitiveHelpAction(ht("/Action/AddNode")))); return pnl; } @@ -158,5 +158,5 @@ // make dialog respond to F1 // - HelpUtil.setHelpContext(getRootPane(), ht("/Actions/AddNode")); + HelpUtil.setHelpContext(getRootPane(), ht("/Action/AddNode")); } Index: trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 2546) +++ trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 2548) @@ -3,4 +3,5 @@ package org.openstreetmap.josm.gui.layer; +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; @@ -59,4 +60,5 @@ import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil; +import org.openstreetmap.josm.gui.HelpAwareOptionPane; import org.openstreetmap.josm.gui.MapView; import org.openstreetmap.josm.gui.dialogs.LayerListDialog; @@ -280,7 +282,26 @@ JMenuItem tagimage = new JMenuItem(tr("Import images"), ImageProvider.get("tagimages")); - tagimage.putClientProperty("help", "Action/ImportImages"); + tagimage.putClientProperty("help", ht("/Action/ImportImages")); tagimage.addActionListener(new ActionListener() { + + private void warnCantImportIntoServerLayer(GpxLayer layer) { + String msg = tr("The data in the GPX layer ''{0}'' has been downloaded from the server.
" + + "Because its way points don''t include a timestamp we can''t correlate them with images.", + layer.getName() + ); + HelpAwareOptionPane.showOptionDialog( + Main.parent, + msg, + tr("Import not possible"), + JOptionPane.WARNING_MESSAGE, + ht("/Action/ImportImages#CantImportIntoGpxLayerFromServer") + ); + } + public void actionPerformed(ActionEvent e) { + if (GpxLayer.this.data.fromServer) { + warnCantImportIntoServerLayer(GpxLayer.this); + return; + } JFileChooser fc = new JFileChooser(Main.pref.get("tagimages.lastdirectory")); fc.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);