Changeset 6314 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/display

Timestamp:

2013-10-07T16:23:05+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8512 - Do not display discardable keys by default. Expert users can display them by enabling "Display discardable keys" in OSM Data preferences, and change their display colour

File:

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

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

@@ -41 +41 @@
     private JCheckBox virtualNodes = new JCheckBox(tr("Draw virtual nodes in select mode"));
     private JCheckBox inactive = new JCheckBox(tr("Draw inactive layers in other color"));
+    private JCheckBox discardableKeys = new JCheckBox(tr("Display discardable keys"));
 
     // Options that affect performance
@@ -117 +118 @@
 
         // outlineOnly
+        outlineOnly.setToolTipText(tr("This option suppresses the filling of areas, overriding anything specified in the selected style."));
         outlineOnly.setSelected(Main.pref.getBoolean("draw.data.area_outline_only", false));
-        outlineOnly.setToolTipText(tr("This option suppresses the filling of areas, overriding anything specified in the selected style."));
-
+
+        // discardable keys
+        discardableKeys.setToolTipText(tr("Display keys which have been deemed uninteresting to the point that they can be silently removed."));
+        discardableKeys.setSelected(Main.pref.getBoolean("display.discardable-keys", false));
+        
         JLabel performanceLabel = new JLabel(tr("Options that affect drawing performance"));
 
@@ -144 +149 @@
         panel.add(sourceBounds, GBC.eop().insets(20,0,0,0));
         panel.add(inactive, GBC.eop().insets(20,0,0,0));
+        panel.add(discardableKeys, GBC.eop().insets(20,0,0,0));
 
         ExpertToggleAction.addVisibilitySwitcher(performanceLabel);
@@ -150 +156 @@
         ExpertToggleAction.addVisibilitySwitcher(useHighlighting);
         ExpertToggleAction.addVisibilitySwitcher(outlineOnly);
+        ExpertToggleAction.addVisibilitySwitcher(discardableKeys);
 
         panel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
@@ -171 +178 @@
         Main.pref.put("draw.target-highlight", useHighlighting.isSelected());
         Main.pref.put("draw.helper-line", drawHelperLine.isSelected());
+        Main.pref.put("display.discardable-keys", discardableKeys.isSelected());
         int vn = Main.pref.getInteger("mappaint.node.virtual-size", 8);
         if (virtualNodes.isSelected()) {