Changeset 13130 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2017-11-19T20:12:24+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15572 - use ImageProvider attach API for all JOSM actions to ensure proper icon size everywhere

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• CustomizeColor.java (modified) (1 diff)
• Layer.java (modified) (3 diffs)
• OsmDataLayer.java (modified) (1 diff)
• geoimage/CorrelateGpxWithImages.java (modified) (1 diff)
• geoimage/ImageViewerDialog.java (modified) (8 diffs)
• geoimage/ShowThumbnailAction.java (modified) (1 diff)
• gpx/ChooseTrackVisibilityAction.java (modified) (1 diff)
• gpx/ConvertToDataLayerAction.java (modified) (1 diff)
• gpx/CustomizeDrawingAction.java (modified) (1 diff)
• gpx/DownloadWmsAlongTrackAction.java (modified) (1 diff)
• gpx/ImportAudioAction.java (modified) (1 diff)
• gpx/ImportImagesAction.java (modified) (1 diff)
• gpx/MarkersFromNamedPointsAction.java (modified) (1 diff)
• markerlayer/MarkerLayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/CustomizeColor.java

@@ -41 +41 @@
      */
     public CustomizeColor(List<Layer> l) {
-        super(tr("Customize Color"), ImageProvider.get("colorchooser"));
+        super(tr("Customize Color"));
+        new ImageProvider("colorchooser").getResource().attachImageIcon(this, true);
         colors = l.stream().map(Layer::getColorProperty).collect(Collectors.toList());
         CheckParameterUtil.ensureThat(colors.stream().allMatch(Objects::nonNull), "All layers must have colors.");

trunk/src/org/openstreetmap/josm/gui/layer/Layer.java

@@ -543 +543 @@
          */
         public LayerSaveAction(Layer layer) {
-            putValue(SMALL_ICON, ImageProvider.get("save"));
+            new ImageProvider("save").getResource().attachImageIcon(this, true);
             putValue(SHORT_DESCRIPTION, tr("Save the current data."));
             putValue(NAME, tr("Save"));
@@ -567 +567 @@
          */
         public LayerSaveAsAction(Layer layer) {
-            putValue(SMALL_ICON, ImageProvider.get("save_as"));
+            new ImageProvider("save_as").getResource().attachImageIcon(this, true);
             putValue(SHORT_DESCRIPTION, tr("Save the current data to a new file."));
             putValue(NAME, tr("Save As..."));
@@ -591 +591 @@
          */
         public LayerGpxExportAction(Layer layer) {
-            putValue(SMALL_ICON, ImageProvider.get("exportgpx"));
+            new ImageProvider("exportgpx").getResource().attachImageIcon(this, true);
             putValue(SHORT_DESCRIPTION, tr("Export the data to GPX file."));
             putValue(NAME, tr("Export to GPX..."));

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -860 +860 @@
          */
         public ConvertToGpxLayerAction() {
-            super(tr("Convert to GPX layer"), ImageProvider.get("converttogpx"));
+            super(tr("Convert to GPX layer"));
+            new ImageProvider("converttogpx").getResource().attachImageIcon(this, true);
             putValue("help", ht("/Action/ConvertToGpxLayer"));
         }

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -107 +107 @@
      */
     public CorrelateGpxWithImages(GeoImageLayer layer) {
-        super(tr("Correlate to GPX"), ImageProvider.get("dialogs/geoimage/gpx2img"));
+        super(tr("Correlate to GPX"));
+        new ImageProvider("dialogs/geoimage/gpx2img").getResource().attachImageIcon(this, true);
         this.yLayer = layer;
     }

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

@@ -17 +17 @@
 import javax.swing.AbstractAction;
 import javax.swing.Box;
-import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JComponent;
@@ -95 +94 @@
         Dimension buttonDim = new Dimension(26, 26);
 
-        ImageAction prevAction = new ImageAction(COMMAND_PREVIOUS, ImageProvider.get("dialogs", "previous"), tr("Previous"));
+        ImageAction prevAction = new ImageAction(COMMAND_PREVIOUS, new ImageProvider("dialogs", "previous"), tr("Previous"));
         btnPrevious = new JButton(prevAction);
         btnPrevious.setPreferredSize(buttonDim);
@@ -107 +106 @@
 
         final String removePhoto = tr("Remove photo from layer");
-        ImageAction delAction = new ImageAction(COMMAND_REMOVE, ImageProvider.get("dialogs", "delete"), removePhoto);
+        ImageAction delAction = new ImageAction(COMMAND_REMOVE, new ImageProvider("dialogs", "delete"), removePhoto);
         JButton btnDelete = new JButton(delAction);
         btnDelete.setPreferredSize(buttonDim);
@@ -117 +116 @@
 
         ImageAction delFromDiskAction = new ImageAction(COMMAND_REMOVE_FROM_DISK,
-                ImageProvider.get("dialogs", "geoimage/deletefromdisk"), tr("Delete image file from disk"));
+                new ImageProvider("dialogs", "geoimage/deletefromdisk"), tr("Delete image file from disk"));
         JButton btnDeleteFromDisk = new JButton(delFromDiskAction);
         btnDeleteFromDisk.setPreferredSize(buttonDim);
@@ -127 +126 @@
         btnDeleteFromDisk.getActionMap().put(deleteImage, delFromDiskAction);
 
-        ImageAction copyPathAction = new ImageAction(COMMAND_COPY_PATH, ImageProvider.get("copy"), tr("Copy image path"));
+        ImageAction copyPathAction = new ImageAction(COMMAND_COPY_PATH, new ImageProvider("copy"), tr("Copy image path"));
         JButton btnCopyPath = new JButton(copyPathAction);
         btnCopyPath.setPreferredSize(buttonDim);
@@ -137 +136 @@
         btnCopyPath.getActionMap().put(copyImage, copyPathAction);
 
-        ImageAction nextAction = new ImageAction(COMMAND_NEXT, ImageProvider.get("dialogs", "next"), tr("Next"));
+        ImageAction nextAction = new ImageAction(COMMAND_NEXT, new ImageProvider("dialogs", "next"), tr("Next"));
         btnNext = new JButton(nextAction);
         btnNext.setPreferredSize(buttonDim);
@@ -160 +159 @@
 
         tbCentre = new JToggleButton(new ImageAction(COMMAND_CENTERVIEW,
-                ImageProvider.get("dialogs", "centreview"), tr("Center view")));
+                new ImageProvider("dialogs", "centreview"), tr("Center view")));
         tbCentre.setPreferredSize(buttonDim);
 
         JButton btnZoomBestFit = new JButton(new ImageAction(COMMAND_ZOOM,
-                ImageProvider.get("dialogs", "zoom-best-fit"), tr("Zoom best fit and 1:1")));
+                new ImageProvider("dialogs", "zoom-best-fit"), tr("Zoom best fit and 1:1")));
         btnZoomBestFit.setPreferredSize(buttonDim);
 
         btnCollapse = new JButton(new ImageAction(COMMAND_COLLAPSE,
-                ImageProvider.get("dialogs", "collapse"), tr("Move dialog to the side pane")));
+                new ImageProvider("dialogs", "collapse"), tr("Move dialog to the side pane")));
         btnCollapse.setPreferredSize(new Dimension(20, 20));
         btnCollapse.setAlignmentY(Component.TOP_ALIGNMENT);
@@ -213 +212 @@
         private final String action;
 
-        ImageAction(String action, ImageIcon icon, String toolTipText) {
+        ImageAction(String action, ImageProvider provider, String toolTipText) {
             this.action = action;
             putValue(SHORT_DESCRIPTION, toolTipText);
-            putValue(SMALL_ICON, icon);
+            if (provider != null) {
+                provider.getResource().attachImageIcon(this, true);
+            }
         }
 

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ShowThumbnailAction.java

@@ -28 +28 @@
      */
     public ShowThumbnailAction(GeoImageLayer layer) {
-        super(tr("Show thumbnails"), ImageProvider.get("dialogs/geoimage/togglegit"));
+        super(tr("Show thumbnails"));
+        new ImageProvider("dialogs/geoimage/togglegit").getResource().attachImageIcon(this, true);
         putValue(SHORT_DESCRIPTION, tr("Show image thumbnails instead of icons."));
         this.layer = layer;

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java

@@ -58 +58 @@
      */
     public ChooseTrackVisibilityAction(final GpxLayer layer) {
-        super(tr("Choose visible tracks"), ImageProvider.get("dialogs/filter"));
+        super(tr("Choose visible tracks"));
+        new ImageProvider("dialogs/filter").getResource().attachImageIcon(this, true);
         this.layer = layer;
         putValue("help", ht("/Action/ChooseTrackVisibility"));

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java

@@ -56 +56 @@
      */
     protected ConvertToDataLayerAction(final T layer) {
-        super(tr("Convert to data layer"), ImageProvider.get("converttoosm"));
+        super(tr("Convert to data layer"));
+        new ImageProvider("converttoosm").getResource().attachImageIcon(this, true);
         this.layer = layer;
         putValue("help", ht("/Action/ConvertToDataLayer"));

trunk/src/org/openstreetmap/josm/gui/layer/gpx/CustomizeDrawingAction.java

@@ -54 +54 @@
 
     private CustomizeDrawingAction() {
-        super(tr("Customize track drawing"), ImageProvider.get("mapmode/addsegment"));
+        super(tr("Customize track drawing"));
+        new ImageProvider("mapmode/addsegment").getResource().attachImageIcon(this, true);
         putValue("help", ht("/Action/GPXLayerCustomizeLineDrawing"));
     }

trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java

@@ -43 +43 @@
      */
     public DownloadWmsAlongTrackAction(final GpxData data) {
-        super(tr("Precache imagery tiles along this track"), ImageProvider.get("downloadalongtrack"));
+        super(tr("Precache imagery tiles along this track"));
+        new ImageProvider("downloadalongtrack").getResource().attachImageIcon(this, true);
         this.data = data;
     }

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java

@@ -69 +69 @@
      */
     public ImportAudioAction(final GpxLayer layer) {
-        super(tr("Import Audio"), ImageProvider.get("importaudio"));
+        super(tr("Import Audio"));
+        new ImageProvider("importaudio").getResource().attachImageIcon(this, true);
         this.layer = layer;
         putValue("help", ht("/Action/ImportAudio"));

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java

@@ -36 +36 @@
      */
     public ImportImagesAction(final GpxLayer layer) {
-        super(tr("Import images"), ImageProvider.get("dialogs/geoimage"));
+        super(tr("Import images"));
+        new ImageProvider("dialogs/geoimage").getResource().attachImageIcon(this, true);
         this.layer = layer;
         putValue("help", ht("/Action/ImportImages"));

trunk/src/org/openstreetmap/josm/gui/layer/gpx/MarkersFromNamedPointsAction.java

@@ -26 +26 @@
      */
     public MarkersFromNamedPointsAction(final GpxLayer layer) {
-        super(tr("Markers From Named Points"), ImageProvider.get("addmarkers"));
+        super(tr("Markers From Named Points"));
+        new ImageProvider("addmarkers").getResource().attachImageIcon(this, true);
         this.layer = layer;
         putValue("help", ht("/Action/MarkersFromNamedPoints"));

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -484 +484 @@
 
         public ShowHideMarkerText(MarkerLayer layer) {
-            super(tr("Show Text/Icons"), ImageProvider.get("dialogs", "showhide"));
+            super(tr("Show Text/Icons"));
+            new ImageProvider("dialogs", "showhide").getResource().attachImageIcon(this, true);
             putValue(SHORT_DESCRIPTION, tr("Toggle visible state of the marker text and icons."));
             putValue("help", ht("/Action/ShowHideTextIcons"));
@@ -515 +516 @@
          */
         SynchronizeAudio() {
-            super(tr("Synchronize Audio"), ImageProvider.get("audio-sync"));
+            super(tr("Synchronize Audio"));
+            new ImageProvider("audio-sync").getResource().attachImageIcon(this, true);
             putValue("help", ht("/Action/SynchronizeAudio"));
         }
@@ -552 +554 @@
 
         MoveAudio() {
-            super(tr("Make Audio Marker at Play Head"), ImageProvider.get("addmarkers"));
+            super(tr("Make Audio Marker at Play Head"));
+            new ImageProvider("addmarkers").getResource().attachImageIcon(this, true);
             putValue("help", ht("/Action/MakeAudioMarkerAtPlayHead"));
         }