Changeset 12955 in josm for trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

Timestamp:

2017-10-09T00:17:55+02:00 (7 years ago)

Author:

bastiK

Message:

applied #15414 - Redesign of SlippyMapBBoxChooser's SourceButton (patch by ris)

File:

• trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

@@ -22 +22 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import javax.swing.ButtonModel;
+import javax.swing.JToggleButton;
 import javax.swing.JOptionPane;
 import javax.swing.SpringLayout;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.ChangeEvent;
 
 import org.openstreetmap.gui.jmapviewer.Coordinate;
@@ -44 +48 @@
 import org.openstreetmap.josm.data.imagery.TileLoaderFactory;
 import org.openstreetmap.josm.data.osm.BBox;
+import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.StringProperty;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -56 +61 @@
  * This panel displays a map and lets the user chose a {@link BBox}.
  */
-public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser, MainLayerManager.ActiveLayerChangeListener {
+public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser, ChangeListener, MainLayerManager.ActiveLayerChangeListener {
 
     /**
@@ -121 +126 @@
 
     private static final StringProperty PROP_MAPSTYLE = new StringProperty("slippy_map_chooser.mapstyle", "Mapnik");
+    private static final BooleanProperty PROP_SHOWDLAREA = new BooleanProperty("slippy_map_chooser.show_downloaded_area", true);
     /**
      * The property name used for the resize button.
@@ -131 +137 @@
 
     private final SizeButton iSizeButton;
+    private final ButtonModel showDownloadAreaButtonModel;
     private final SourceButton iSourceButton;
     private transient Bounds bbox;
@@ -173 +180 @@
         List<TileSource> tileSources = getAllTileSources();
 
-        iSourceButton = new SourceButton(this, tileSources);
+        this.showDownloadAreaButtonModel = new JToggleButton.ToggleButtonModel();
+        this.showDownloadAreaButtonModel.setSelected(PROP_SHOWDLAREA.get());
+        this.showDownloadAreaButtonModel.addChangeListener(this);
+        iSourceButton = new SourceButton(this, tileSources, this.showDownloadAreaButtonModel);
         add(iSourceButton);
-        springLayout.putConstraint(SpringLayout.EAST, iSourceButton, 0, SpringLayout.EAST, this);
-        springLayout.putConstraint(SpringLayout.NORTH, iSourceButton, 30, SpringLayout.NORTH, this);
+        springLayout.putConstraint(SpringLayout.EAST, iSourceButton, -2, SpringLayout.EAST, this);
+        springLayout.putConstraint(SpringLayout.NORTH, iSourceButton, 2, SpringLayout.NORTH, this);
 
         iSizeButton = new SizeButton(this);
@@ -231 +241 @@
         // enough to make sharing code impractical)
         final OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
-        if (editLayer != null && Config.getPref().getBoolean("draw.data.downloaded_area", true) && !editLayer.data.getDataSources().isEmpty()) {
+        if (editLayer != null && this.showDownloadAreaButtonModel.isSelected() && !editLayer.data.getDataSources().isEmpty()) {
             // initialize area with current viewport
             Rectangle b = this.getBounds();
@@ -271 +281 @@
     @Override
     public void activeOrEditLayerChanged(MainLayerManager.ActiveLayerChangeEvent e) {
+        this.repaint();
+    }
+
+    @Override
+    public void stateChanged(ChangeEvent e) {
+        // fired for the stateChanged event of this.showDownloadAreaButtonModel
+        PROP_SHOWDLAREA.put(this.showDownloadAreaButtonModel.isSelected());
         this.repaint();
     }
@@ -342 +359 @@
         this.setTileSource(tileSource);
         PROP_MAPSTYLE.put(tileSource.getName()); // TODO Is name really unique?
+        if (this.iSourceButton.getCurrentSource() != tileSource) { // prevent infinite recursion
+            this.iSourceButton.setCurrentMap(tileSource);
+        }
     }