Changeset 12280 in josm

Timestamp:

2017-05-30T18:49:42+02:00 (8 years ago)

Author:

Don-vip

Message:

drop remaining png extensions from few icons in java code so we can provide svg replacements in the future

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• NoteInputDialog.java (modified) (1 diff)
• preferences/advanced/AbstractListEditor.java (modified) (1 diff)
• preferences/advanced/PreferencesTable.java (modified) (1 diff)
• preferences/projection/LambertCC9ZonesProjectionChoice.java (modified) (1 diff)
• preferences/projection/LambertProjectionChoice.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/NoteInputDialog.java

@@ -56 +56 @@
         contentPanel.add(scrollPane);
         setContent(contentPanel, false);
-        setButtonIcons(icon, ImageProvider.get("cancel.png"));
+        setButtonIcons(icon, ImageProvider.get("cancel"));
 
         showDialog();

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AbstractListEditor.java

@@ -31 +31 @@
         super(parent, title, tr("OK"), tr("Cancel"));
         this.entry = entry;
-        setButtonIcons("ok.png", "cancel.png");
+        setButtonIcons("ok", "cancel");
         setRememberWindowGeometry(getClass().getName() + ".geometry", WindowGeometry.centerInWindow(parent, new Dimension(500, 350)));
     }

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java

@@ -221 +221 @@
     private static boolean askAddSetting(JComponent gui, JPanel p) {
         return new ExtendedDialog(gui, tr("Add setting"), tr("OK"), tr("Cancel"))
-                .setContent(p).setButtonIcons("ok.png", "cancel.png").showDialog().getValue() == 1;
+                .setContent(p).setButtonIcons("ok", "cancel").showDialog().getValue() == 1;
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java

@@ -44 +44 @@
         LambertCC9CBPanel(String[] entries, int initialIndex, String label, ActionListener listener) {
             super(entries, initialIndex, label, listener);
-            this.add(new JLabel(ImageProvider.get("data/projection", "LambertCC9Zones.png")), GBC.eol().fill(GBC.HORIZONTAL));
+            this.add(new JLabel(ImageProvider.get("data/projection", "LambertCC9Zones")), GBC.eol().fill(GBC.HORIZONTAL));
             this.add(GBC.glue(1, 1), GBC.eol().fill(GBC.BOTH));
         }

trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java

@@ -39 +39 @@
         LambertCBPanel(String[] entries, int initialIndex, String label, ActionListener listener) {
             super(entries, initialIndex, label, listener);
-            this.add(new JLabel(ImageProvider.get("data/projection", "Departements_Lambert4Zones.png")), GBC.eol().fill(GBC.HORIZONTAL));
+            this.add(new JLabel(ImageProvider.get("data/projection", "Departements_Lambert4Zones")), GBC.eol().fill(GBC.HORIZONTAL));
             this.add(GBC.glue(1, 1), GBC.eol().fill(GBC.BOTH));
         }