Changeset 3298 in josm


Ignore:
Timestamp:
2010-06-03T08:52:40+02:00 (15 years ago)
Author:
stoecker
Message:

fixed #2786 - fixed wrong placement of marker argument

Location:
trunk/src/org/openstreetmap/josm/gui/preferences
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java

    r2745 r3298  
    3434    private JCheckBox markerButtonLabels = new JCheckBox(tr("Label audio (and image and web) markers."));
    3535    private JCheckBox markerAudioTraceVisible = new JCheckBox(tr("Display live audio trace."));
    36     private JCheckBox makeAutoMarkers = new JCheckBox(tr("Create non-audio markers when reading GPX."));
    3736
    3837    // various methods of making markers on import audio
     
    6362        markerButtonLabels.setToolTipText(tr("Put text labels against audio (and image and web) markers as well as their button icons."));
    6463        gui.audio.add(markerButtonLabels, GBC.eol().insets(0,0,0,0));
    65 
    66         // makeAutoMarkers
    67         makeAutoMarkers.setSelected(Main.pref.getBoolean("marker.makeautomarkers", true));
    68         makeAutoMarkers.setToolTipText(tr("Automatically make a marker layer from any waypoints when opening a GPX layer."));
    69         gui.audio.add(makeAutoMarkers, GBC.eol().insets(0,0,0,0));
    7064
    7165        gui.audio.add(new JLabel(tr("When importing audio, make markers from...")), GBC.eol());
     
    123117        Main.pref.put("marker.traceaudio", markerAudioTraceVisible.isSelected());
    124118        Main.pref.put("marker.buttonlabels", markerButtonLabels.isSelected());
    125         Main.pref.put("marker.makeautomarkers", makeAutoMarkers.isSelected());
    126119        Main.pref.put("marker.audiofromexplicitwaypoints", audioMarkersFromExplicitWaypoints.isSelected());
    127120        Main.pref.put("marker.audiofromuntimedwaypoints", audioMarkersFromUntimedWaypoints.isSelected());
  • trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java

    r2956 r3298  
    3333    }
    3434
    35     private ButtonGroup gpsLinesGroup;
    3635    private JRadioButton drawRawGpsLinesAll = new JRadioButton(tr("All"));
    3736    private JRadioButton drawRawGpsLinesLocal = new JRadioButton(tr("Local files"));
     
    5958    private JCheckBox inactive = new JCheckBox(tr("Draw inactive layers in other color"));
    6059    private JCheckBox useAntialiasing = new JCheckBox(tr("Smooth map graphics (antialiasing)"));
     60    private JCheckBox makeAutoMarkers = new JCheckBox(tr("Create markers when reading GPX."));
    6161
    6262    public void addGui(PreferenceTabbedPane gui) {
     
    6565        panel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
    6666
     67        // makeAutoMarkers
     68        makeAutoMarkers.setSelected(Main.pref.getBoolean("marker.makeautomarkers", true));
     69        makeAutoMarkers.setToolTipText(tr("Automatically make a marker layer from any waypoints when opening a GPX layer."));
     70        panel.add(makeAutoMarkers, GBC.eol().insets(20,0,0,5));
     71
    6772        // drawRawGpsLines
    68         gpsLinesGroup = new ButtonGroup();
     73        ButtonGroup gpsLinesGroup = new ButtonGroup();
    6974        gpsLinesGroup.add(drawRawGpsLinesNone);
    7075        gpsLinesGroup.add(drawRawGpsLinesLocal);
    7176        gpsLinesGroup.add(drawRawGpsLinesAll);
     77
    7278
    7379        /* ensure that default is in data base */
     
    267273
    268274    public boolean ok() {
     275        Main.pref.put("marker.makeautomarkers", makeAutoMarkers.isSelected());
    269276        Main.pref.put("draw.rawgps.lines", drawRawGpsLinesAll.isSelected());
    270277        Main.pref.put("draw.rawgps.lines.localfiles", drawRawGpsLinesLocal.isSelected());
Note: See TracChangeset for help on using the changeset viewer.