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

Timestamp:

2017-09-13T23:24:50+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - use Config.getPref() wherever possible

File:

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

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

@@ -11 +11 @@
 import javax.swing.JPanel;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
@@ -18 +17 @@
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -60 +60 @@
 
         // audioMenuVisible
-        audioMenuVisible.setSelected(!Main.pref.getBoolean("audio.menuinvisible"));
+        audioMenuVisible.setSelected(!Config.getPref().getBoolean("audio.menuinvisible"));
         audioMenuVisible.setToolTipText(tr("Show or hide the audio menu entry on the main menu bar."));
         audio.add(audioMenuVisible, GBC.eol().insets(0, 0, 0, 0));
 
         // audioTraceVisible
-        markerAudioTraceVisible.setSelected(Main.pref.getBoolean("marker.traceaudio", true));
+        markerAudioTraceVisible.setSelected(Config.getPref().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."));
@@ -71 +71 @@
 
         // buttonLabels
-        markerButtonLabels.setSelected(Main.pref.getBoolean("marker.buttonlabels", true));
+        markerButtonLabels.setSelected(Config.getPref().getBoolean("marker.buttonlabels", true));
         markerButtonLabels.setToolTipText(tr("Put text labels against audio (and image and web) markers as well as their button icons."));
         audio.add(markerButtonLabels, GBC.eol().insets(0, 0, 0, 0));
@@ -78 +78 @@
 
         // audioMarkersFromExplicitWaypoints
-        audioMarkersFromExplicitWaypoints.setSelected(Main.pref.getBoolean("marker.audiofromexplicitwaypoints", true));
+        audioMarkersFromExplicitWaypoints.setSelected(Config.getPref().getBoolean("marker.audiofromexplicitwaypoints", true));
         audioMarkersFromExplicitWaypoints.setToolTipText(tr("When importing audio, apply it to any waypoints in the GPX layer."));
         audio.add(audioMarkersFromExplicitWaypoints, GBC.eol().insets(10, 0, 0, 0));
 
         // audioMarkersFromUntimedWaypoints
-        audioMarkersFromUntimedWaypoints.setSelected(Main.pref.getBoolean("marker.audiofromuntimedwaypoints", true));
+        audioMarkersFromUntimedWaypoints.setSelected(Config.getPref().getBoolean("marker.audiofromuntimedwaypoints", true));
         audioMarkersFromUntimedWaypoints.setToolTipText(tr("When importing audio, apply it to any waypoints in the GPX layer."));
         audio.add(audioMarkersFromUntimedWaypoints, GBC.eol().insets(10, 0, 0, 0));
 
         // audioMarkersFromNamedTrackpoints
-        audioMarkersFromNamedTrackpoints.setSelected(Main.pref.getBoolean("marker.audiofromnamedtrackpoints", false));
+        audioMarkersFromNamedTrackpoints.setSelected(Config.getPref().getBoolean("marker.audiofromnamedtrackpoints", false));
         audioMarkersFromNamedTrackpoints.setToolTipText(
                 tr("Automatically create audio markers from trackpoints (rather than explicit waypoints) with names or descriptions."));
@@ -94 +94 @@
 
         // audioMarkersFromWavTimestamps
-        audioMarkersFromWavTimestamps.setSelected(Main.pref.getBoolean("marker.audiofromwavtimestamps", false));
+        audioMarkersFromWavTimestamps.setSelected(Config.getPref().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."));
@@ -100 +100 @@
 
         // audioMarkersFromStart
-        audioMarkersFromStart.setSelected(Main.pref.getBoolean("marker.audiofromstart"));
+        audioMarkersFromStart.setSelected(Config.getPref().getBoolean("marker.audiofromstart"));
         audioMarkersFromStart.setToolTipText(
                 tr("Automatically create audio markers from trackpoints (rather than explicit waypoints) with names or descriptions."));
         audio.add(audioMarkersFromStart, GBC.eol().insets(10, 0, 0, 0));
 
-        audioForwardBackAmount.setText(Main.pref.get("audio.forwardbackamount", "10.0"));
+        audioForwardBackAmount.setText(Config.getPref().get("audio.forwardbackamount", "10.0"));
         audioForwardBackAmount.setToolTipText(tr("The number of seconds to jump forward or back when the relevant button is pressed"));
         audio.add(new JLabel(tr("Forward/back time (seconds)")), GBC.std());
         audio.add(audioForwardBackAmount, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 0, 0, 5));
 
-        audioFastForwardMultiplier.setText(Main.pref.get("audio.fastfwdmultiplier", "1.3"));
+        audioFastForwardMultiplier.setText(Config.getPref().get("audio.fastfwdmultiplier", "1.3"));
         audioFastForwardMultiplier.setToolTipText(tr("The amount by which the speed is multiplied for fast forwarding"));
         audio.add(new JLabel(tr("Fast forward multiplier")), GBC.std());
         audio.add(audioFastForwardMultiplier, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 0, 0, 5));
 
-        audioLeadIn.setText(Main.pref.get("audio.leadin", "1.0"));
+        audioLeadIn.setText(Config.getPref().get("audio.leadin", "1.0"));
         audioLeadIn.setToolTipText(
                 tr("Playback starts this number of seconds before (or after, if negative) the audio track position requested"));
@@ -121 +121 @@
         audio.add(audioLeadIn, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 0, 0, 5));
 
-        audioCalibration.setText(Main.pref.get("audio.calibration", "1.0"));
+        audioCalibration.setText(Config.getPref().get("audio.calibration", "1.0"));
         audioCalibration.setToolTipText(tr("The ratio of voice recorder elapsed time to true elapsed time"));
         audio.add(new JLabel(tr("Voice recorder calibration")), GBC.std());
@@ -133 +133 @@
     @Override
     public boolean ok() {
-        Main.pref.putBoolean("audio.menuinvisible", !audioMenuVisible.isSelected());
-        Main.pref.putBoolean("marker.traceaudio", markerAudioTraceVisible.isSelected());
-        Main.pref.putBoolean("marker.buttonlabels", markerButtonLabels.isSelected());
-        Main.pref.putBoolean("marker.audiofromexplicitwaypoints", audioMarkersFromExplicitWaypoints.isSelected());
-        Main.pref.putBoolean("marker.audiofromuntimedwaypoints", audioMarkersFromUntimedWaypoints.isSelected());
-        Main.pref.putBoolean("marker.audiofromnamedtrackpoints", audioMarkersFromNamedTrackpoints.isSelected());
-        Main.pref.putBoolean("marker.audiofromwavtimestamps", audioMarkersFromWavTimestamps.isSelected());
-        Main.pref.putBoolean("marker.audiofromstart", audioMarkersFromStart.isSelected());
-        Main.pref.put("audio.forwardbackamount", audioForwardBackAmount.getText());
-        Main.pref.put("audio.fastfwdmultiplier", audioFastForwardMultiplier.getText());
-        Main.pref.put("audio.leadin", audioLeadIn.getText());
-        Main.pref.put("audio.calibration", audioCalibration.getText());
+        Config.getPref().putBoolean("audio.menuinvisible", !audioMenuVisible.isSelected());
+        Config.getPref().putBoolean("marker.traceaudio", markerAudioTraceVisible.isSelected());
+        Config.getPref().putBoolean("marker.buttonlabels", markerButtonLabels.isSelected());
+        Config.getPref().putBoolean("marker.audiofromexplicitwaypoints", audioMarkersFromExplicitWaypoints.isSelected());
+        Config.getPref().putBoolean("marker.audiofromuntimedwaypoints", audioMarkersFromUntimedWaypoints.isSelected());
+        Config.getPref().putBoolean("marker.audiofromnamedtrackpoints", audioMarkersFromNamedTrackpoints.isSelected());
+        Config.getPref().putBoolean("marker.audiofromwavtimestamps", audioMarkersFromWavTimestamps.isSelected());
+        Config.getPref().putBoolean("marker.audiofromstart", audioMarkersFromStart.isSelected());
+        Config.getPref().put("audio.forwardbackamount", audioForwardBackAmount.getText());
+        Config.getPref().put("audio.fastfwdmultiplier", audioFastForwardMultiplier.getText());
+        Config.getPref().put("audio.leadin", audioLeadIn.getText());
+        Config.getPref().put("audio.calibration", audioCalibration.getText());
         return false;
     }