Changeset 3298 in josm for trunk/src/org

Timestamp:

2010-06-03T08:52:40+02:00 (14 years ago)

Author:

stoecker

Message:

fixed #2786 - fixed wrong placement of marker argument

Location:

trunk/src/org/openstreetmap/josm/gui/preferences

Files:

• AudioPreference.java (modified) (3 diffs)
• DrawingPreference.java (modified) (4 diffs)

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

@@ -34 +34 @@
     private JCheckBox markerButtonLabels = new JCheckBox(tr("Label audio (and image and web) markers."));
     private JCheckBox markerAudioTraceVisible = new JCheckBox(tr("Display live audio trace."));
-    private JCheckBox makeAutoMarkers = new JCheckBox(tr("Create non-audio markers when reading GPX."));
 
     // various methods of making markers on import audio
@@ -63 +62 @@
         markerButtonLabels.setToolTipText(tr("Put text labels against audio (and image and web) markers as well as their button icons."));
         gui.audio.add(markerButtonLabels, GBC.eol().insets(0,0,0,0));
-
-        // makeAutoMarkers
-        makeAutoMarkers.setSelected(Main.pref.getBoolean("marker.makeautomarkers", true));
-        makeAutoMarkers.setToolTipText(tr("Automatically make a marker layer from any waypoints when opening a GPX layer."));
-        gui.audio.add(makeAutoMarkers, GBC.eol().insets(0,0,0,0));
 
         gui.audio.add(new JLabel(tr("When importing audio, make markers from...")), GBC.eol());
@@ -123 +117 @@
         Main.pref.put("marker.traceaudio", markerAudioTraceVisible.isSelected());
         Main.pref.put("marker.buttonlabels", markerButtonLabels.isSelected());
-        Main.pref.put("marker.makeautomarkers", makeAutoMarkers.isSelected());
         Main.pref.put("marker.audiofromexplicitwaypoints", audioMarkersFromExplicitWaypoints.isSelected());
         Main.pref.put("marker.audiofromuntimedwaypoints", audioMarkersFromUntimedWaypoints.isSelected());

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

@@ -33 +33 @@
     }
 
-    private ButtonGroup gpsLinesGroup;
     private JRadioButton drawRawGpsLinesAll = new JRadioButton(tr("All"));
     private JRadioButton drawRawGpsLinesLocal = new JRadioButton(tr("Local files"));
@@ -59 +58 @@
     private JCheckBox inactive = new JCheckBox(tr("Draw inactive layers in other color"));
     private JCheckBox useAntialiasing = new JCheckBox(tr("Smooth map graphics (antialiasing)"));
+    private JCheckBox makeAutoMarkers = new JCheckBox(tr("Create markers when reading GPX."));
 
     public void addGui(PreferenceTabbedPane gui) {
@@ -65 +65 @@
         panel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
 
+        // makeAutoMarkers
+        makeAutoMarkers.setSelected(Main.pref.getBoolean("marker.makeautomarkers", true));
+        makeAutoMarkers.setToolTipText(tr("Automatically make a marker layer from any waypoints when opening a GPX layer."));
+        panel.add(makeAutoMarkers, GBC.eol().insets(20,0,0,5));
+
         // drawRawGpsLines
-        gpsLinesGroup = new ButtonGroup();
+        ButtonGroup gpsLinesGroup = new ButtonGroup();
         gpsLinesGroup.add(drawRawGpsLinesNone);
         gpsLinesGroup.add(drawRawGpsLinesLocal);
         gpsLinesGroup.add(drawRawGpsLinesAll);
+
 
         /* ensure that default is in data base */
@@ -267 +273 @@
 
     public boolean ok() {
+        Main.pref.put("marker.makeautomarkers", makeAutoMarkers.isSelected());
         Main.pref.put("draw.rawgps.lines", drawRawGpsLinesAll.isSelected());
         Main.pref.put("draw.rawgps.lines.localfiles", drawRawGpsLinesLocal.isSelected());