Changeset 554 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java

Timestamp:

2008-02-22T18:31:49+01:00 (16 years ago)

Author:

david

Message:

new "Add Audio Marker At Play Head" facility; and tidy up Audio Preferences; default for displaying audio trace now true.

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java (modified) (5 diffs)

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

@@ -7 +7 @@
 import java.awt.event.ActionListener;
 
+import javax.swing.Box;
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
@@ -61 +62 @@
                         }
                 });
-                markerAudioTraceVisible.setSelected(Main.pref.getBoolean("marker.traceaudio"));
+                markerAudioTraceVisible.setSelected(Main.pref.getBoolean("marker.traceaudio", true));
                 markerAudioTraceVisible.setToolTipText(tr("Display a moving icon representing the point on the synchronized track where the audio currently playing was recorded."));
                 gui.audio.add(markerAudioTraceVisible, GBC.eol().insets(0,0,0,0));
@@ -85 +86 @@
                         }
                 });
-                markersNamedTrackpoints.setSelected(Main.pref.getBoolean("markers.namedtrackpoints"));
+                markersNamedTrackpoints.setSelected(Main.pref.getBoolean("marker.namedtrackpoints"));
                 markersNamedTrackpoints.setToolTipText(tr("Automatically create audio markers from trackpoints (rather than explicit waypoints) with names or descriptions."));
                 gui.audio.add(markersNamedTrackpoints, GBC.eol().insets(0,0,0,0));
@@ -108 +109 @@
                 gui.audio.add(new JLabel(tr("Lead-in time (seconds)")), GBC.std());
                 gui.audio.add(audioLeadIn, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
+
+                gui.audio.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL));
         }
 
@@ -114 +117 @@
                 Main.pref.put("marker.traceaudio", markerAudioTraceVisible.isSelected());
                 Main.pref.put("marker.buttonlabels", markerButtonLabels.isSelected());
-                Main.pref.put("markers.namedtrackpoints", markersNamedTrackpoints.isSelected());
+                Main.pref.put("marker.namedtrackpoints", markersNamedTrackpoints.isSelected());
                 Main.pref.put("marker.audiosampleminsecs", audioSampleMinSecs.getText());               
                 Main.pref.put("marker.audiosampleminmetres", audioSampleMinMetres.getText());