Changeset 10369 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java

Timestamp:

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

Author:

stoecker

Message:

see #9995 - patch by strump - improve HIDPI

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified) (3 diffs)

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();
         }