Changeset 3396 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java

Timestamp:

31.07.2010 16:28:43 (22 months ago)

Author:

bastiK

Message:

applied #3617 (patch by reini122) - Would like to see waypoint descriptions in JOSM

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java (modified) (3 diffs)

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

@@ -59 +59 @@
     private JCheckBox useAntialiasing = new JCheckBox(tr("Smooth map graphics (antialiasing)"));
     private JCheckBox makeAutoMarkers = new JCheckBox(tr("Create markers when reading GPX."));
+    private JComboBox waypointLabel = new JComboBox(new String[] {tr("Auto"), tr("Name"), tr("Desc"), tr("Both"), tr("None")});
 
     public void addGui(PreferenceTabbedPane gui) {
@@ -203 +204 @@
         panel.add(colorTypeVelocityTune, GBC.eop().insets(5,0,0,5));
         panel.add(colorTypeDilution, GBC.eol().insets(40,0,0,0));
+
+        // waypointLabel
+        panel.add(Box.createVerticalGlue(), GBC.eol().insets(0, 20, 0, 0));
+
+        waypointLabel.setSelectedIndex(Main.pref.getInteger("draw.rawgps.layer.wpt", 0 ));
+        colorTypeDilution.setToolTipText(tr("Allows to change the labelling of track waypoints."));
+        panel.add(new JLabel(tr("Waypoint labelling")), GBC.std().insets(20,0,0,0));
+        panel.add(waypointLabel, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
 
         panel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
@@ -301 +310 @@
         Main.pref.put("mappaint.use-antialiasing", useAntialiasing.isSelected());
         int vn = Main.pref.getInteger("mappaint.node.virtual-size", 8);
-        if(virtualNodes.isSelected()) { if (vn < 1) {
-            vn = 8;
-        } }
-        else { vn = 0; }
+        if (virtualNodes.isSelected()) {
+            if (vn < 1) {
+                vn = 8;
+            }
+        }
+        else {
+            vn = 0;
+        }
         Main.pref.putInteger("mappaint.node.virtual-size", vn);
+        Main.pref.putInteger("draw.rawgps.layer.wpt", waypointLabel.getSelectedIndex());
         return false;
     }