Changeset 10357 in josm for trunk


Ignore:
Timestamp:
2016-06-12T00:26:29+02:00 (8 years ago)
Author:
stoecker
Message:

see #9995, see #10684 - remove more hardcoded places of images

Location:
trunk/src/org/openstreetmap/josm/gui
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r10179 r10357  
    367367            putValue(Action.SHORT_DESCRIPTION, tr("Cancel conflict resolution"));
    368368            putValue(Action.NAME, tr("Cancel"));
    369             putValue(Action.SMALL_ICON, ImageProvider.get("", "cancel"));
     369            new ImageProvider("cancel").getResource().getImageIcon(this);
    370370            setEnabled(true);
    371371        }
    … …  
    382382            putValue(Action.SHORT_DESCRIPTION, tr("Apply resolved conflicts"));
    383383            putValue(Action.NAME, tr("Apply"));
    384             putValue(Action.SMALL_ICON, ImageProvider.get("ok"));
     384            new ImageProvider("ok").getResource().getImageIcon(this);
    385385            updateEnabledState();
    386386        }

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

    r10217 r10357  
    265265            putValue(Action.SHORT_DESCRIPTION, tr("Cancel conflict resolution"));
    266266            putValue(Action.NAME, tr("Cancel"));
    267             putValue(Action.SMALL_ICON, ImageProvider.get("", "cancel"));
     267            new ImageProvider("cancel").getResource().getImageIcon(this);
    268268            setEnabled(true);
    269269        }
    … …  
    281281            putValue(Action.SHORT_DESCRIPTION, tr("Apply resolved conflicts"));
    282282            putValue(Action.NAME, tr("Apply"));
    283             putValue(Action.SMALL_ICON, ImageProvider.get("ok"));
     283            new ImageProvider("ok").getResource().getImageIcon(this);
    284284            updateEnabledState();
    285285        }

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

    r10179 r10357  
    155155        ApplyRoleAction() {
    156156            putValue(NAME, tr("Apply"));
    157             putValue(SMALL_ICON, ImageProvider.get("ok"));
     157            new ImageProvider("ok").getResource().getImageIcon(this);
    158158            putValue(SHORT_DESCRIPTION, tr("Apply this role to all members"));
    159159        }

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

    r10035 r10357  
    158158            putValue(Action.SHORT_DESCRIPTION, tr("Cancel conflict resolution and close the dialog"));
    159159            putValue(Action.NAME, tr("Cancel"));
    160             putValue(Action.SMALL_ICON, ImageProvider.get("", "cancel"));
     160            new ImageProvider("cancel").getResource().getImageIcon(this);
    161161            setEnabled(true);
    162162        }
    … …  
    175175            putValue(Action.SHORT_DESCRIPTION, tr("Show help information"));
    176176            putValue(Action.NAME, tr("Help"));
    177             putValue(Action.SMALL_ICON, ImageProvider.get("help"));
     177            new ImageProvider("help").getResource().getImageIcon(this);
    178178            setEnabled(true);
    179179        }
    … …  
    193193            putValue(Action.SHORT_DESCRIPTION, tr("Apply resolved conflicts and close the dialog"));
    194194            putValue(Action.NAME, tr("Apply Resolution"));
    195             putValue(Action.SMALL_ICON, ImageProvider.get("dialogs", "conflict"));
     195            new ImageProvider("dialogs", "conflict").getResource().getImageIcon(this);
    196196            updateEnabledState();
    197197        }

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

    r10179 r10357  
    259259            putValue(Action.SHORT_DESCRIPTION, tr("Cancel uploading"));
    260260            putValue(Action.NAME, tr("Cancel"));
    261             putValue(Action.SMALL_ICON, ImageProvider.get("", "cancel"));
     261            new ImageProvider("cancel").getResource().getImageIcon(this);
    262262            getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
    263263            .put(KeyStroke.getKeyStroke("ESCAPE"), "ESCAPE");
    … …  
    277277            putValue(Action.SHORT_DESCRIPTION, tr("Continue uploading"));
    278278            putValue(Action.NAME, tr("Continue"));
    279             putValue(Action.SMALL_ICON, ImageProvider.get("", "upload"));
     279            new ImageProvider("upload").getResource().getImageIcon(this);
    280280            updateEnabledState();
    281281        }

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

    r10217 r10357  
    164164
    165165        DeleteAction() {
    166             putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
     166            new ImageProvider("dialogs", "delete").getResource().getImageIcon(this);
    167167            putValue(SHORT_DESCRIPTION, tr("Delete the selection in the tag table"));
    168168            getSelectionModel().addListSelectionListener(this);
    … …  
    253253    class AddAction extends AbstractAction implements PropertyChangeListener {
    254254        AddAction() {
    255             putValue(SMALL_ICON, ImageProvider.get("dialogs", "add"));
     255            new ImageProvider("dialogs", "add").getResource().getImageIcon(this);
    256256            putValue(SHORT_DESCRIPTION, tr("Add a new tag"));
    257257            TagTable.this.addPropertyChangeListener(this);
    … …  
    287287    class PasteAction extends AbstractAction implements PropertyChangeListener {
    288288        PasteAction() {
    289             putValue(SMALL_ICON, ImageProvider.get("", "pastetags"));
     289            new ImageProvider("pastetags").getResource().getImageIcon(this);
    290290            putValue(SHORT_DESCRIPTION, tr("Paste tags from buffer"));
    291291            TagTable.this.addPropertyChangeListener(this);
Note: See TracChangeset for help on using the changeset viewer.