Ticket #15832: 15832.patch

File 15832.patch, 3.2 KB (added by simon04, 7 years ago)
  • src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java

    diff --git a/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java b/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java
    index 9b89ab6d9..f17e7a226 100644
    a b  
    22package org.openstreetmap.josm.gui.dialogs.layer;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     5import static org.openstreetmap.josm.tools.I18n.trc;
    56
    67import java.awt.BorderLayout;
    78import java.awt.Color;
     
    1415import java.awt.event.MouseWheelEvent;
    1516import java.util.ArrayList;
    1617import java.util.Collection;
     18import java.util.Dictionary;
    1719import java.util.HashMap;
     20import java.util.Hashtable;
    1821import java.util.List;
    1922import java.util.function.Supplier;
    2023import java.util.stream.Collectors;
    public JComponent getPanel() {  
    247250            slider.setPaintTicks(true);
    248251
    249252            slider.addChangeListener(e -> onStateChanged());
     253
     254            //final NumberFormat format = DecimalFormat.getInstance();
     255            //setLabels(format.format(minValue), format.format((minValue + maxValue) / 2), format.format(maxValue));
     256        }
     257
     258        protected void setLabels(String labelMinimum, String labelMiddle, String labelMaximum) {
     259            final Dictionary<Integer, JLabel> labels = new Hashtable<>();
     260            labels.put(slider.getMinimum(), new JLabel(labelMinimum));
     261            labels.put((slider.getMaximum() + slider.getMinimum()) / 2, new JLabel(labelMiddle));
     262            labels.put(slider.getMaximum(), new JLabel(labelMaximum));
     263            slider.setLabelTable(labels);
     264            slider.setPaintLabels(true);
    250265        }
    251266
    252267        /**
    public JComponent getPanel() {  
    333348     */
    334349    class OpacitySlider extends AbstractFilterSlider<Layer> {
    335350        /**
    336          * Creaate a new {@link OpacitySlider}.
     351         * Create a new {@link OpacitySlider}.
    337352         */
    338353        OpacitySlider() {
    339354            super(0, 1, Layer.class);
     355            setLabels("0%", "50%", "100%");
    340356            slider.setToolTipText(tr("Adjust opacity of the layer."));
    341357        }
    342358
    public String toString() {  
    409425         */
    410426        GammaFilterSlider() {
    411427            super(-1, 1, ImageryLayer.class);
     428            setLabels("0", "1", "∞");
    412429            slider.setToolTipText(tr("Adjust gamma value of the layer."));
    413430        }
    414431
    private double mapGammaToInterval(double gamma) {  
    468485         */
    469486        SharpnessSlider() {
    470487            super(0, MAX_SHARPNESS_FACTOR, ImageryLayer.class);
     488            setLabels(trc("image sharpness", "blurred"), trc("image sharpness", "normal"), trc("image sharpness", "sharp"));
    471489            slider.setToolTipText(tr("Adjust sharpness/blur value of the layer."));
    472490        }
    473491
    public String getLabel() {  
    505523         */
    506524        ColorfulnessSlider() {
    507525            super(0, MAX_COLORFUL_FACTOR, ImageryLayer.class);
     526            setLabels(trc("image colorfulness", "less"), trc("image colorfulness", "normal"), trc("image colorfulness", "more"));
    508527            slider.setToolTipText(tr("Adjust colorfulness of the layer."));
    509528        }
    510529