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

Timestamp:

2013-01-28T14:06:52+01:00 (11 years ago)

Author:

bastiK

Message:

add session support for marker layers (see #4029)

The data is exported to a separate GPX file that contains one waypoint for each marker.
This is not very elegant, because most of the time, all the info is already contained in the original GPX File.
However, when dealing with audio markers, they can be synchronized, or additional markers are added
at certain playback positions. This info must be retained.
Another complication is, that two or more MarkerLayers can be merged to one.

All these problems are avoided by explicitly exporting the markers to a separate file (as done in this commit).

File:

• trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java (modified) (3 diffs)

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

@@ -14 +14 @@
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -64 +63 @@
         SessionSaveAsDialog dlg = new SessionSaveAsDialog();
         dlg.showDialog();
-        if (dlg.getValue() != 2) return;
+        if (dlg.getValue() != 1) return;
 
         zipRequired = false;
@@ -138 +137 @@
 
         public SessionSaveAsDialog() {
-            super(Main.parent, tr("Save Session"), new String[] {tr("Cancel"), tr("Save As")});
+            super(Main.parent, tr("Save Session"), new String[] {tr("Save As"), tr("Cancel")});
             initialize();
-            setButtonIcons(new String[] {"cancel", "save_as"});
-            setDefaultButton(2);
+            setButtonIcons(new String[] {"save_as", "cancel"});
+            setDefaultButton(1);
             setRememberWindowGeometry(getClass().getName() + ".geometry",
                     WindowGeometry.centerInWindow(Main.parent, new Dimension(350, 450)));