Changeset 10369 in josm for trunk/src

Timestamp:

2016-06-14T17:23:20+02:00 (8 years ago)

Author:

stoecker

Message:

see #9995 - patch by strump - improve HIDPI

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AboutAction.java (modified) (1 diff)
• actions/AbstractSelectAction.java (modified) (1 diff)
• actions/AddImageryLayerAction.java (modified) (1 diff)
• actions/JosmAction.java (modified) (1 diff)
• gui/conflict/tags/CombinePrimitiveResolverDialog.java (modified) (2 diffs)
• gui/conflict/tags/PasteTagsConflictResolverDialog.java (modified) (2 diffs)
• gui/conflict/tags/RelationMemberConflictResolver.java (modified) (1 diff)
• gui/dialogs/CommandStackDialog.java (modified) (3 diffs)
• gui/dialogs/ConflictDialog.java (modified) (1 diff)
• gui/dialogs/ConflictResolutionDialog.java (modified) (3 diffs)
• gui/dialogs/FilterDialog.java (modified) (5 diffs)
• gui/dialogs/SelectionListDialog.java (modified) (4 diffs)
• gui/dialogs/UserListDialog.java (modified) (2 diffs)
• gui/dialogs/ValidatorDialog.java (modified) (3 diffs)
• gui/help/ContextSensitiveHelpAction.java (modified) (1 diff)
• gui/io/UploadSelectionDialog.java (modified) (2 diffs)
• gui/oauth/FullyAutomaticAuthorizationUI.java (modified) (3 diffs)
• gui/oauth/ManualAuthorizationUI.java (modified) (1 diff)
• gui/oauth/OAuthAuthorizationWizard.java (modified) (2 diffs)
• gui/oauth/SemiAutomaticAuthorizationUI.java (modified) (5 diffs)
• gui/preferences/PreferenceDialog.java (modified) (2 diffs)
• gui/tagging/TagTable.java (modified) (3 diffs)
• gui/tagging/presets/TaggingPreset.java (modified) (1 diff)
• io/session/GenericSessionExporter.java (modified) (1 diff)
• tools/ImageResource.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/AboutAction.java

@@ -105 +105 @@
         JPanel panel = new JPanel(new GridBagLayout());
         panel.setPreferredSize(new Dimension(890, 300));
-        panel.add(new JLabel("", new ImageIcon(ImageProvider.get("logo.svg").getImage().getScaledInstance(256, 258, Image.SCALE_SMOOTH)),
+        panel.add(new JLabel("", new ImageProvider("logo.svg").setSize(ImageProvider.ImageSizes.ABOUT_LOGO).get(),
                 JLabel.CENTER), GBC.std().insets(0, 5, 0, 0));
         panel.add(about, GBC.std().fill());

trunk/src/org/openstreetmap/josm/actions/AbstractSelectAction.java

@@ -20 +20 @@
         putValue(NAME, tr("Select"));
         putValue(SHORT_DESCRIPTION,  tr("Set the selected elements on the map to the selected items in the list above."));
-        new ImageProvider("dialogs", "select").getResource().getImageIcon(this, true);
+        new ImageProvider("dialogs", "select").getResource().attachImageIcon(this, true);
     }
 }

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -63 +63 @@
                                     @Override
                                     public void run() {
-                                        result.getImageIcon(AddImageryLayerAction.this);
+                                        result.attachImageIcon(AddImageryLayerAction.this);
                                     }
                                 });

trunk/src/org/openstreetmap/josm/actions/JosmAction.java

@@ -73 +73 @@
         super(name);
         if (icon != null)
-            icon.getResource().getImageIcon(this);
+            icon.getResource().attachImageIcon(this);
         setHelpId();
         sc = shortcut;

trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

@@ -367 +367 @@
             putValue(Action.SHORT_DESCRIPTION, tr("Cancel conflict resolution"));
             putValue(Action.NAME, tr("Cancel"));
-            new ImageProvider("cancel").getResource().getImageIcon(this);
+            new ImageProvider("cancel").getResource().attachImageIcon(this);
             setEnabled(true);
         }
@@ -382 +382 @@
             putValue(Action.SHORT_DESCRIPTION, tr("Apply resolved conflicts"));
             putValue(Action.NAME, tr("Apply"));
-            new ImageProvider("ok").getResource().getImageIcon(this);
+            new ImageProvider("ok").getResource().attachImageIcon(this);
             updateEnabledState();
         }

trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java

@@ -265 +265 @@
             putValue(Action.SHORT_DESCRIPTION, tr("Cancel conflict resolution"));
             putValue(Action.NAME, tr("Cancel"));
-            new ImageProvider("cancel").getResource().getImageIcon(this);
+            new ImageProvider("cancel").getResource().attachImageIcon(this);
             setEnabled(true);
         }
@@ -281 +281 @@
             putValue(Action.SHORT_DESCRIPTION, tr("Apply resolved conflicts"));
             putValue(Action.NAME, tr("Apply"));
-            new ImageProvider("ok").getResource().getImageIcon(this);
+            new ImageProvider("ok").getResource().attachImageIcon(this);
             updateEnabledState();
         }

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java

@@ -155 +155 @@
         ApplyRoleAction() {
             putValue(NAME, tr("Apply"));
-            new ImageProvider("ok").getResource().getImageIcon(this);
+            new ImageProvider("ok").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Apply this role to all members"));
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

@@ -376 +376 @@
             putValue(NAME, tr("Select"));
             putValue(SHORT_DESCRIPTION, tr("Selects the objects that take part in this command (unless currently deleted)"));
-            new ImageProvider("dialogs", "select").getResource().getImageIcon(this, true);
+            new ImageProvider("dialogs", "select").getResource().attachImageIcon(this, true);
         }
 
@@ -411 +411 @@
             putValue(SHORT_DESCRIPTION,
                     tr("Selects the objects that take part in this command (unless currently deleted), then and zooms to it"));
-            new ImageProvider("dialogs/autoscale", "selection").getResource().getImageIcon(this, true);
+            new ImageProvider("dialogs/autoscale", "selection").getResource().attachImageIcon(this, true);
         }
 
@@ -447 +447 @@
                 putValue(NAME, tr("Undo"));
                 putValue(SHORT_DESCRIPTION, tr("Undo the selected and all later commands"));
-                new ImageProvider("undo").getResource().getImageIcon(this, true);
+                new ImageProvider("undo").getResource().attachImageIcon(this, true);
             } else {
                 tree = redoTree;
                 putValue(NAME, tr("Redo"));
                 putValue(SHORT_DESCRIPTION, tr("Redo the selected and all earlier commands"));
-                new ImageProvider("redo").getResource().getImageIcon(this, true);
+                new ImageProvider("redo").getResource().attachImageIcon(this, true);
             }
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -434 +434 @@
             putValue(NAME, tr("Resolve"));
             putValue(SHORT_DESCRIPTION,  tr("Open a merge dialog of all selected items in the list above."));
-            new ImageProvider("dialogs", "conflict").getResource().getImageIcon(this, true);
+            new ImageProvider("dialogs", "conflict").getResource().attachImageIcon(this, true);
             putValue("help", ht("/Dialog/ConflictList#ResolveAction"));
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java

@@ -158 +158 @@
             putValue(Action.SHORT_DESCRIPTION, tr("Cancel conflict resolution and close the dialog"));
             putValue(Action.NAME, tr("Cancel"));
-            new ImageProvider("cancel").getResource().getImageIcon(this);
+            new ImageProvider("cancel").getResource().attachImageIcon(this);
             setEnabled(true);
         }
@@ -175 +175 @@
             putValue(Action.SHORT_DESCRIPTION, tr("Show help information"));
             putValue(Action.NAME, tr("Help"));
-            new ImageProvider("help").getResource().getImageIcon(this);
+            new ImageProvider("help").getResource().attachImageIcon(this);
             setEnabled(true);
         }
@@ -193 +193 @@
             putValue(Action.SHORT_DESCRIPTION, tr("Apply resolved conflicts and close the dialog"));
             putValue(Action.NAME, tr("Apply Resolution"));
-            new ImageProvider("dialogs", "conflict").getResource().getImageIcon(this);
+            new ImageProvider("dialogs", "conflict").getResource().attachImageIcon(this);
             updateEnabledState();
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java

@@ -141 +141 @@
                 putValue(NAME, tr("Add"));
                 putValue(SHORT_DESCRIPTION,  tr("Add filter."));
-                new ImageProvider("dialogs", "add").getResource().getImageIcon(this, true);
+                new ImageProvider("dialogs", "add").getResource().attachImageIcon(this, true);
             }
 
@@ -156 +156 @@
                 putValue(NAME, tr("Edit"));
                 putValue(SHORT_DESCRIPTION, tr("Edit filter."));
-                new ImageProvider("dialogs", "edit").getResource().getImageIcon(this, true);
+                new ImageProvider("dialogs", "edit").getResource().attachImageIcon(this, true);
             }
 
@@ -174 +174 @@
                 putValue(NAME, tr("Delete"));
                 putValue(SHORT_DESCRIPTION, tr("Delete filter."));
-                new ImageProvider("dialogs", "delete").getResource().getImageIcon(this, true);
+                new ImageProvider("dialogs", "delete").getResource().attachImageIcon(this, true);
             }
 
@@ -189 +189 @@
                 putValue(NAME, tr("Up"));
                 putValue(SHORT_DESCRIPTION, tr("Move filter up."));
-                new ImageProvider("dialogs", "up").getResource().getImageIcon(this, true);
+                new ImageProvider("dialogs", "up").getResource().attachImageIcon(this, true);
             }
 
@@ -205 +205 @@
                 putValue(NAME, tr("Down"));
                 putValue(SHORT_DESCRIPTION, tr("Move filter down."));
-                new ImageProvider("dialogs", "down").getResource().getImageIcon(this, true);
+                new ImageProvider("dialogs", "down").getResource().attachImageIcon(this, true);
             }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -299 +299 @@
             putValue(NAME, tr("Search"));
             putValue(SHORT_DESCRIPTION,   tr("Search for objects"));
-            new ImageProvider("dialogs", "search").getResource().getImageIcon(this, true);
+            new ImageProvider("dialogs", "search").getResource().attachImageIcon(this, true);
             updateEnabledState();
         }
@@ -361 +361 @@
             putValue(NAME, tr("History"));
             putValue(SHORT_DESCRIPTION, tr("Display the history of the selected objects."));
-            new ImageProvider("dialogs", "history").getResource().getImageIcon(this, true);
+            new ImageProvider("dialogs", "history").getResource().attachImageIcon(this, true);
             updateEnabledState(model.getSize());
         }
@@ -401 +401 @@
             putValue(NAME, tr("Zoom to selection"));
             putValue(SHORT_DESCRIPTION, tr("Zoom to selection"));
-            new ImageProvider("dialogs/autoscale", "selection").getResource().getImageIcon(this, true);
+            new ImageProvider("dialogs/autoscale", "selection").getResource().attachImageIcon(this, true);
             updateEnabledState();
         }
@@ -442 +442 @@
             putValue(NAME, tr("Zoom to selected element(s)"));
             putValue(SHORT_DESCRIPTION, tr("Zoom to selected element(s)"));
-            new ImageProvider("dialogs/autoscale", "selection").getResource().getImageIcon(this, true);
+            new ImageProvider("dialogs/autoscale", "selection").getResource().attachImageIcon(this, true);
             updateEnabledState();
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java

@@ -158 +158 @@
             putValue(NAME, tr("Select"));
             putValue(SHORT_DESCRIPTION, tr("Select objects submitted by this user"));
-            new ImageProvider("dialogs", "select").getResource().getImageIcon(this, true);
+            new ImageProvider("dialogs", "select").getResource().attachImageIcon(this, true);
             updateEnabledState();
         }
@@ -193 +193 @@
             putValue(NAME, tr("Show info"));
             putValue(SHORT_DESCRIPTION, tr("Launches a browser with information about the user"));
-            new ImageProvider("help/internet").getResource().getImageIcon(this, true);
+            new ImageProvider("help/internet").getResource().attachImageIcon(this, true);
             updateEnabledState();
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

@@ -120 +120 @@
                 putValue(NAME, tr("Lookup"));
                 putValue(SHORT_DESCRIPTION, tr("Looks up the selected primitives in the error list."));
-                new ImageProvider("dialogs", "search").getResource().getImageIcon(this, true);
+                new ImageProvider("dialogs", "search").getResource().attachImageIcon(this, true);
             }
 
@@ -141 +141 @@
                 putValue(NAME, tr("Fix"));
                 putValue(SHORT_DESCRIPTION,  tr("Fix the selected issue."));
-                new ImageProvider("dialogs", "fix").getResource().getImageIcon(this, true);
+                new ImageProvider("dialogs", "fix").getResource().attachImageIcon(this, true);
             }
             @Override
@@ -156 +156 @@
                     putValue(NAME, tr("Ignore"));
                     putValue(SHORT_DESCRIPTION,  tr("Ignore the selected issue next time."));
-                    new ImageProvider("dialogs", "fix").getResource().getImageIcon(this, true);
+                    new ImageProvider("dialogs", "fix").getResource().attachImageIcon(this, true);
                 }
                 @Override

trunk/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java

@@ -47 +47 @@
         putValue(SHORT_DESCRIPTION, tr("Show help information"));
         putValue(NAME, tr("Help"));
-        new ImageProvider("help").getResource().getImageIcon(this);
+        new ImageProvider("help").getResource().attachImageIcon(this);
         this.helpTopic = helpTopic;
         setEnabled(!Main.isOffline(OnlineResource.JOSM_WEBSITE));

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

@@ -259 +259 @@
             putValue(Action.SHORT_DESCRIPTION, tr("Cancel uploading"));
             putValue(Action.NAME, tr("Cancel"));
-            new ImageProvider("cancel").getResource().getImageIcon(this);
+            new ImageProvider("cancel").getResource().attachImageIcon(this);
             getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
             .put(KeyStroke.getKeyStroke("ESCAPE"), "ESCAPE");
@@ -277 +277 @@
             putValue(Action.SHORT_DESCRIPTION, tr("Continue uploading"));
             putValue(Action.NAME, tr("Continue"));
-            new ImageProvider("upload").getResource().getImageIcon(this);
+            new ImageProvider("upload").getResource().attachImageIcon(this);
             updateEnabledState();
         }

trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java

@@ -325 +325 @@
         RunAuthorisationAction() {
             putValue(NAME, tr("Authorize now"));
-            new ImageProvider("oauth", "oauth-small").getResource().getImageIcon(this);
+            new ImageProvider("oauth", "oauth-small").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Click to redirect you to the authorization form on the JOSM web site"));
             updateEnabledState();
@@ -362 +362 @@
             putValue(NAME, tr("Back"));
             putValue(SHORT_DESCRIPTION, tr("Run the automatic authorization steps again"));
-            new ImageProvider("dialogs", "previous").getResource().getImageIcon(this);
+            new ImageProvider("dialogs", "previous").getResource().attachImageIcon(this);
         }
 
@@ -377 +377 @@
         TestAccessTokenAction() {
             putValue(NAME, tr("Test Access Token"));
-            new ImageProvider("logo").getResource().getImageIcon(this);
+            new ImageProvider("logo").getResource().attachImageIcon(this);
         }
 

trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java

@@ -223 +223 @@
         TestAccessTokenAction() {
             putValue(NAME, tr("Test Access Token"));
-            new ImageProvider("oauth", "oauth-small").getResource().getImageIcon(this);
+            new ImageProvider("oauth", "oauth-small").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Click to test the Access Token"));
             updateEnabledState();

trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java

@@ -351 +351 @@
         CancelAction() {
             putValue(NAME, tr("Cancel"));
-            new ImageProvider("cancel").getResource().getImageIcon(this);
+            new ImageProvider("cancel").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Close the dialog and cancel authorization"));
         }
@@ -373 +373 @@
         AcceptAccessTokenAction() {
             putValue(NAME, tr("Accept Access Token"));
-            new ImageProvider("ok").getResource().getImageIcon(this);
+            new ImageProvider("ok").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Close the dialog and accept the Access Token"));
             updateEnabledState(null);

trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java

@@ -292 +292 @@
                 putValue(NAME, tr("Back"));
                 putValue(SHORT_DESCRIPTION, tr("Go back to step 1/3"));
-                new ImageProvider("dialogs", "previous").getResource().getImageIcon(this);
+                new ImageProvider("dialogs", "previous").getResource().attachImageIcon(this);
             }
 
@@ -368 +368 @@
                 putValue(NAME, tr("Restart"));
                 putValue(SHORT_DESCRIPTION, tr("Go back to step 1/3"));
-                new ImageProvider("dialogs", "previous").getResource().getImageIcon(this);
+                new ImageProvider("dialogs", "previous").getResource().attachImageIcon(this);
             }
 
@@ -389 +389 @@
         RetrieveRequestTokenAction() {
             putValue(NAME, tr("Retrieve Request Token"));
-            new ImageProvider("oauth", "oauth-small").getResource().getImageIcon(this);
+            new ImageProvider("oauth", "oauth-small").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Click to retrieve a Request Token"));
         }
@@ -425 +425 @@
         RetrieveAccessTokenAction() {
             putValue(NAME, tr("Retrieve Access Token"));
-            new ImageProvider("oauth", "oauth-small").getResource().getImageIcon(this);
+            new ImageProvider("oauth", "oauth-small").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Click to retrieve an Access Token"));
         }
@@ -462 +462 @@
         TestAccessTokenAction() {
             putValue(NAME, tr("Test Access Token"));
-            new ImageProvider("oauth", "oauth-small").getResource().getImageIcon(this);
+            new ImageProvider("oauth", "oauth-small").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Click to test the Access Token"));
         }

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java

@@ -157 +157 @@
         CancelAction() {
             putValue(NAME, tr("Cancel"));
-            new ImageProvider("cancel").getResource().getImageIcon(this);
+            new ImageProvider("cancel").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Close the preferences dialog and discard preference updates"));
         }
@@ -176 +176 @@
         OKAction() {
             putValue(NAME, tr("OK"));
-            new ImageProvider("ok").getResource().getImageIcon(this);
+            new ImageProvider("ok").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Save the preferences and close the dialog"));
         }

trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java

@@ -164 +164 @@
 
         DeleteAction() {
-            new ImageProvider("dialogs", "delete").getResource().getImageIcon(this);
+            new ImageProvider("dialogs", "delete").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Delete the selection in the tag table"));
             getSelectionModel().addListSelectionListener(this);
@@ -253 +253 @@
     class AddAction extends AbstractAction implements PropertyChangeListener {
         AddAction() {
-            new ImageProvider("dialogs", "add").getResource().getImageIcon(this);
+            new ImageProvider("dialogs", "add").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Add a new tag"));
             TagTable.this.addPropertyChangeListener(this);
@@ -287 +287 @@
     class PasteAction extends AbstractAction implements PropertyChangeListener {
         PasteAction() {
-            new ImageProvider("pastetags").getResource().getImageIcon(this);
+            new ImageProvider("pastetags").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Paste tags from buffer"));
             TagTable.this.addPropertyChangeListener(this);

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -192 +192 @@
                         @Override
                         public void run() {
-                            result.getImageIcon(TaggingPreset.this);
+                            result.attachImageIcon(TaggingPreset.this);
                         }
                     });

trunk/src/org/openstreetmap/josm/io/session/GenericSessionExporter.java

@@ -74 +74 @@
          */
         LayerSaveAction() {
-            putValue(SMALL_ICON, new ImageProvider("save").setWidth(16).get());
+            new ImageProvider("save").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, ((AbstractModifiableLayer) layer).requiresSaveToFile() ?
                     tr("Layer contains unsaved data - save to file.") :

trunk/src/org/openstreetmap/josm/tools/ImageResource.java

@@ -108 +108 @@
      * Set both icons of an Action
      * @param a The action for the icons
-     * @since 7693
-     */
-    public void getImageIcon(AbstractAction a) {
+     * @since 10368
+     */
+    public void attachImageIcon(AbstractAction a) {
         Dimension iconDimension = ImageProvider.ImageSizes.SMALLICON.getImageDimension();
         ImageIcon icon = getImageIconBounded(iconDimension);
@@ -125 +125 @@
      * @param a The action for the icons
      * @param addresource Adds an resource named "ImageResource" if <code>true</code>
-     * @since 10356
-     */
-    public void getImageIcon(AbstractAction a, boolean addresource) {
-        getImageIcon(a);
+     * @since 10368
+     */
+    public void attachImageIcon(AbstractAction a, boolean addresource) {
+        attachImageIcon(a);
         if (addresource) {
             a.putValue("ImageResource", this);