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

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/io

Files:

• ChangesetManagementPanel.java (modified) (2 diffs)
• CloseChangesetDialog.java (modified) (2 diffs)
• SaveLayersDialog.java (modified) (2 diffs)
• UploadDialog.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java

@@ -295 +295 @@
         RefreshAction() {
             putValue(SHORT_DESCRIPTION, tr("Load the list of your open changesets from the server"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh"));
+            new ImageProvider("dialogs", "refresh").getResource().attachImageIcon(this, true);
         }
 
@@ -310 +310 @@
     class CloseChangesetAction extends AbstractAction implements ItemListener {
         CloseChangesetAction() {
-            putValue(SMALL_ICON, ImageProvider.get("closechangeset"));
+            new ImageProvider("closechangeset").getResource().attachImageIcon(this, true);
             putValue(SHORT_DESCRIPTION, tr("Close the currently selected open changeset"));
             refreshEnabledState();

trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java

@@ -116 +116 @@
         CloseAction() {
             putValue(NAME, tr("Close changesets"));
-            putValue(SMALL_ICON, ImageProvider.get("closechangeset"));
+            new ImageProvider("closechangeset").getResource().attachImageIcon(this, true);
             putValue(SHORT_DESCRIPTION, tr("Close the selected open changesets"));
             refreshEnabledState();
@@ -142 +142 @@
         CancelAction() {
             putValue(NAME, tr("Cancel"));
-            putValue(SMALL_ICON, ImageProvider.get("cancel"));
+            new ImageProvider("cancel").getResource().attachImageIcon(this, true);
             putValue(SHORT_DESCRIPTION, tr("Cancel closing of changesets"));
         }

trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java

@@ -364 +364 @@
             putValue(NAME, tr("Cancel"));
             putValue(SHORT_DESCRIPTION, tr("Close this dialog and resume editing in JOSM"));
-            putValue(SMALL_ICON, ImageProvider.get("cancel"));
+            new ImageProvider("cancel").getResource().attachImageIcon(this, true);
             InputMapUtils.addEscapeAction(getRootPane(), this);
         }
@@ -398 +398 @@
                     putValue(NAME, tr("Exit now!"));
                     putValue(SHORT_DESCRIPTION, tr("Exit JOSM without saving. Unsaved changes are lost."));
-                    putValue(SMALL_ICON, ImageProvider.get("exit"));
+                    new ImageProvider("exit").getResource().attachImageIcon(this, true);
                     break;
                 case RESTART:
                     putValue(NAME, tr("Restart now!"));
                     putValue(SHORT_DESCRIPTION, tr("Restart JOSM without saving. Unsaved changes are lost."));
-                    putValue(SMALL_ICON, ImageProvider.get("restart"));
+                    new ImageProvider("restart").getResource().attachImageIcon(this, true);
                     break;
                 case DELETE:
                     putValue(NAME, tr("Delete now!"));
                     putValue(SHORT_DESCRIPTION, tr("Delete layers without saving. Unsaved changes are lost."));
-                    putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
+                    new ImageProvider("dialogs", "delete").getResource().attachImageIcon(this, true);
                     break;
             }

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -43 +43 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.APIDataSet;
-import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
-import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.spi.preferences.Setting;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
@@ -61 +58 @@
 import org.openstreetmap.josm.io.UploadStrategySpecification;
 import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
+import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
+import org.openstreetmap.josm.spi.preferences.Setting;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageOverlay;
@@ -433 +433 @@
             this.dialog = dialog;
             putValue(NAME, tr("Upload Changes"));
-            putValue(SMALL_ICON, ImageProvider.get("upload"));
+            new ImageProvider("upload").getResource().attachImageIcon(this, true);
             putValue(SHORT_DESCRIPTION, tr("Upload the changed primitives"));
         }
@@ -588 +588 @@
             this.dialog = dialog;
             putValue(NAME, tr("Cancel"));
-            putValue(SMALL_ICON, ImageProvider.get("cancel"));
+            new ImageProvider("cancel").getResource().attachImageIcon(this, true);
             putValue(SHORT_DESCRIPTION, tr("Cancel the upload and resume editing"));
         }