Changeset 3298 in josm
- Timestamp:
- 2010-06-03T08:52:40+02:00 (15 years ago)
- 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 34 34 private JCheckBox markerButtonLabels = new JCheckBox(tr("Label audio (and image and web) markers.")); 35 35 private JCheckBox markerAudioTraceVisible = new JCheckBox(tr("Display live audio trace.")); 36 private JCheckBox makeAutoMarkers = new JCheckBox(tr("Create non-audio markers when reading GPX."));37 36 38 37 // 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.")); 64 63 gui.audio.add(markerButtonLabels, GBC.eol().insets(0,0,0,0)); 65 66 // makeAutoMarkers67 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));70 64 71 65 gui.audio.add(new JLabel(tr("When importing audio, make markers from...")), GBC.eol()); … … 123 117 Main.pref.put("marker.traceaudio", markerAudioTraceVisible.isSelected()); 124 118 Main.pref.put("marker.buttonlabels", markerButtonLabels.isSelected()); 125 Main.pref.put("marker.makeautomarkers", makeAutoMarkers.isSelected());126 119 Main.pref.put("marker.audiofromexplicitwaypoints", audioMarkersFromExplicitWaypoints.isSelected()); 127 120 Main.pref.put("marker.audiofromuntimedwaypoints", audioMarkersFromUntimedWaypoints.isSelected()); -
trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java
r2956 r3298 33 33 } 34 34 35 private ButtonGroup gpsLinesGroup;36 35 private JRadioButton drawRawGpsLinesAll = new JRadioButton(tr("All")); 37 36 private JRadioButton drawRawGpsLinesLocal = new JRadioButton(tr("Local files")); … … 59 58 private JCheckBox inactive = new JCheckBox(tr("Draw inactive layers in other color")); 60 59 private JCheckBox useAntialiasing = new JCheckBox(tr("Smooth map graphics (antialiasing)")); 60 private JCheckBox makeAutoMarkers = new JCheckBox(tr("Create markers when reading GPX.")); 61 61 62 62 public void addGui(PreferenceTabbedPane gui) { … … 65 65 panel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); 66 66 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 67 72 // drawRawGpsLines 68 gpsLinesGroup = new ButtonGroup();73 ButtonGroup gpsLinesGroup = new ButtonGroup(); 69 74 gpsLinesGroup.add(drawRawGpsLinesNone); 70 75 gpsLinesGroup.add(drawRawGpsLinesLocal); 71 76 gpsLinesGroup.add(drawRawGpsLinesAll); 77 72 78 73 79 /* ensure that default is in data base */ … … 267 273 268 274 public boolean ok() { 275 Main.pref.put("marker.makeautomarkers", makeAutoMarkers.isSelected()); 269 276 Main.pref.put("draw.rawgps.lines", drawRawGpsLinesAll.isSelected()); 270 277 Main.pref.put("draw.rawgps.lines.localfiles", drawRawGpsLinesLocal.isSelected());
Note:
See TracChangeset
for help on using the changeset viewer.