Changeset 1572 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-05-05T16:32:19+02:00 (15 years ago)

Author:

stoecker

Message:

close #2464 - patch by Henrik Niehaus - audio preferences fixed

File:

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

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

@@ -2 +2 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 import javax.swing.Box;
@@ -46 +43 @@
     public void addGui(PreferenceDialog gui) {
         // audioMenuVisible
-        audioMenuVisible.addActionListener(new ActionListener(){
-            public void actionPerformed(ActionEvent e) {
-                if (!audioMenuVisible.isSelected())
-                    audioMenuVisible.setSelected(false);
-                audioMenuVisible.setEnabled(audioMenuVisible.isSelected());
-            }
-        });
         audioMenuVisible.setSelected(! Main.pref.getBoolean("audio.menuinvisible"));
         audioMenuVisible.setToolTipText(tr("Show or hide the audio menu entry on the main menu bar."));
@@ -58 +48 @@
 
         // audioTraceVisible
-        markerAudioTraceVisible.addActionListener(new ActionListener(){
-            public void actionPerformed(ActionEvent e) {
-                if (!markerAudioTraceVisible.isSelected())
-                    markerAudioTraceVisible.setSelected(false);
-            }
-        });
         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."));
@@ -69 +53 @@
 
         // buttonLabels
-        markerButtonLabels.addActionListener(new ActionListener(){
-            public void actionPerformed(ActionEvent e) {
-                if (!markerButtonLabels.isSelected())
-                    markerButtonLabels.setSelected(false);
-            }
-        });
         markerButtonLabels.setSelected(Main.pref.getBoolean("marker.buttonlabels"));
         markerButtonLabels.setToolTipText(tr("Put text labels against audio (and image and web) markers as well as their button icons."));
@@ -80 +58 @@
 
         // makeAutoMarkers
-        makeAutoMarkers.addActionListener(new ActionListener(){
-            public void actionPerformed(ActionEvent e) {
-                if (!makeAutoMarkers.isSelected())
-                    makeAutoMarkers.setSelected(false);
-            }
-        });
         makeAutoMarkers.setSelected(Main.pref.getBoolean("marker.makeautomarkers", true));
         makeAutoMarkers.setToolTipText(tr("Automatically make a marker layer from any waypoints when opening a GPX layer."));
@@ -93 +65 @@
 
         // audioMarkersFromExplicitWaypoints
-        audioMarkersFromExplicitWaypoints.addActionListener(new ActionListener(){
-            public void actionPerformed(ActionEvent e) {
-                if (!audioMarkersFromExplicitWaypoints.isSelected())
-                    audioMarkersFromExplicitWaypoints.setSelected(false);
-            }
-        });
         audioMarkersFromExplicitWaypoints.setSelected(Main.pref.getBoolean("marker.audiofromexplicitwaypoints", true));
         audioMarkersFromExplicitWaypoints.setToolTipText(tr("When importing audio, apply it to any waypoints in the GPX layer."));
@@ -104 +70 @@
 
         // audioMarkersFromUntimedWaypoints
-        audioMarkersFromUntimedWaypoints.addActionListener(new ActionListener(){
-            public void actionPerformed(ActionEvent e) {
-                if (!audioMarkersFromUntimedWaypoints.isSelected())
-                    audioMarkersFromUntimedWaypoints.setSelected(false);
-            }
-        });
         audioMarkersFromUntimedWaypoints.setSelected(Main.pref.getBoolean("marker.audiofromuntimedwaypoints", true));
         audioMarkersFromUntimedWaypoints.setToolTipText(tr("When importing audio, apply it to any waypoints in the GPX layer."));
@@ -115 +75 @@
 
         // audioMarkersFromNamedTrackpoints
-        audioMarkersFromNamedTrackpoints.addActionListener(new ActionListener(){
-            public void actionPerformed(ActionEvent e) {
-                if (!audioMarkersFromNamedTrackpoints.isSelected())
-                    audioMarkersFromNamedTrackpoints.setSelected(false);
-            }
-        });
         audioMarkersFromNamedTrackpoints.setSelected(Main.pref.getBoolean("marker.audiofromnamedtrackpoints", false));
         audioMarkersFromNamedTrackpoints.setToolTipText(tr("Automatically create audio markers from trackpoints (rather than explicit waypoints) with names or descriptions."));
@@ -126 +80 @@
 
         // audioMarkersFromWavTimestamps
-        audioMarkersFromWavTimestamps.addActionListener(new ActionListener(){
-            public void actionPerformed(ActionEvent e) {
-                if (!audioMarkersFromWavTimestamps.isSelected())
-                    audioMarkersFromWavTimestamps.setSelected(false);
-            }
-        });
         audioMarkersFromWavTimestamps.setSelected(Main.pref.getBoolean("marker.audiofromwavtimestamps", false));
         audioMarkersFromWavTimestamps.setToolTipText(tr("Create audio markers at the position on the track corresponding to the modified time of each audio WAV file imported."));
@@ -137 +85 @@
 
         // audioMarkersFromStart
-        audioMarkersFromStart.addActionListener(new ActionListener(){
-            public void actionPerformed(ActionEvent e) {
-                if (!audioMarkersFromStart.isSelected())
-                    audioMarkersFromStart.setSelected(false);
-            }
-        });
         audioMarkersFromStart.setSelected(Main.pref.getBoolean("marker.audiofromstart"));
         audioMarkersFromStart.setToolTipText(tr("Automatically create audio markers from trackpoints (rather than explicit waypoints) with names or descriptions."));