Changeset 8061 in josm for trunk/src


Ignore:
Timestamp:
2015-02-14T07:31:36+01:00 (5 years ago)
Author:
bastiK
Message:

see #11096 - strip .png

Location:
trunk/src/org/openstreetmap/josm
Files:
27 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

    r7509 r8061  
    6262                tr("Change directions?"),
    6363                new String[] {tr("Reverse and Combine"), tr("Cancel")});
    64         ed.setButtonIcons(new String[] {"wayflip.png", "cancel.png"});
     64        ed.setButtonIcons(new String[] {"wayflip", "cancel"});
    6565        ed.setContent(tr("The ways can not be combined in their current directions.  "
    6666                + "Do you want to reverse some of them?"));
  • trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java

    r7771 r8061  
    5959        public HistoryObjectIDDialog() {
    6060            super(Main.parent, tr("Show history"), new String[]{tr("Show history"), tr("Cancel")});
    61             setButtonIcons(new String[]{"dialogs/history.png", "cancel.png"});
     61            setButtonIcons(new String[]{"dialogs/history", "cancel"});
    6262            init();
    6363        }
  • trunk/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java

    r7859 r8061  
    165165                new String[] {tr("Add Rectified Image"), tr("Cancel")});
    166166        diag.setContent(panel);
    167         diag.setButtonIcons(new String[] {"OLmarker.png", "cancel.png"});
     167        diag.setButtonIcons(new String[] {"OLmarker", "cancel"});
    168168
    169169        // This repeatedly shows the dialog in case there has been an error.
  • trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java

    r7859 r8061  
    118118        );
    119119        dialog.setContent(all, false /* don't embedded content in JScrollpane  */);
    120         dialog.setButtonIcons(new String[] {"download.png", "cancel.png"});
     120        dialog.setButtonIcons(new String[] {"download", "cancel"});
    121121        dialog.setToolTipTexts(new String[] {
    122122                tr("Start downloading data"),
  • trunk/src/org/openstreetmap/josm/actions/PasteAction.java

    r7987 r8061  
    180180                tr("Delete incomplete members?"),
    181181                new String[] {tr("Paste without incomplete members"), tr("Cancel")});
    182         ed.setButtonIcons(new String[] {"dialogs/relation/deletemembers.png", "cancel.png"});
     182        ed.setButtonIcons(new String[] {"dialogs/relation/deletemembers", "cancel"});
    183183        ed.setContent(tr("The copied data contains incomplete objects.  "
    184184                + "When pasting the incomplete objects are removed.  "
  • trunk/src/org/openstreetmap/josm/actions/ReportBugAction.java

    r7937 r8061  
    2222     */
    2323    public ReportBugAction() {
    24         super(tr("Report bug"), "bug.png", tr("Report a ticket to JOSM bugtracker"),
     24        super(tr("Report bug"), "bug", tr("Report a ticket to JOSM bugtracker"),
    2525                Shortcut.registerShortcut("reportbug", tr("Report a ticket to JOSM bugtracker"),
    2626                        KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), true);
  • trunk/src/org/openstreetmap/josm/actions/SaveAction.java

    r6380 r8061  
    4949                    new String[] {tr("Overwrite"), tr("Cancel")}
    5050            );
    51             dialog.setButtonIcons(new String[] {"save_as.png", "cancel.png"});
     51            dialog.setButtonIcons(new String[] {"save_as", "cancel"});
    5252            dialog.setContent(tr("File {0} exists. Overwrite?", f.getName()));
    5353            dialog.showDialog();
  • trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java

    r7578 r8061  
    190190            );
    191191            dialog.setContent(tr("File exists. Overwrite?"));
    192             dialog.setButtonIcons(new String[] {"save_as.png", "cancel.png"});
     192            dialog.setButtonIcons(new String[] {"save_as", "cancel"});
    193193            dialog.showDialog();
    194194            return (dialog.getValue() == 1);
  • trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java

    r7624 r8061  
    193193                tr("Status Report"),
    194194                new String[] {tr("Copy to clipboard and close"), tr("Report bug"), tr("Close") });
    195         ed.setButtonIcons(new String[] {"copy.png", "bug.png", "cancel.png" });
     195        ed.setButtonIcons(new String[] {"copy", "bug", "cancel" });
    196196        ed.setContent(sp, false);
    197197        ed.setMinimumSize(new Dimension(380, 200));
  • trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java

    r7937 r8061  
    9595     */
    9696    public ImproveWayAccuracyAction(MapFrame mapFrame) {
    97         super(tr("Improve Way Accuracy"), "improvewayaccuracy.png",
     97        super(tr("Improve Way Accuracy"), "improvewayaccuracy",
    9898                tr("Improve Way Accuracy mode"),
    9999                Shortcut.registerShortcut("mapmode:ImproveWayAccuracy",
  • trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

    r7668 r8061  
    822822                    tr("Move elements"),
    823823                    new String[]{tr("Move them"), tr("Undo move")});
    824             ed.setButtonIcons(new String[]{"reorder.png", "cancel.png"});
     824            ed.setButtonIcons(new String[]{"reorder", "cancel"});
    825825            ed.setContent(
    826826                    /* for correct i18n of plural forms - see #9110 */
  • trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

    r7005 r8061  
    306306            }
    307307        };
    308         dialog.setButtonIcons(new String[] {"dialogs/search.png", "cancel.png"});
     308        dialog.setButtonIcons(new String[] {"dialogs/search", "cancel"});
    309309        dialog.configureContextsensitiveHelp("/Action/Search", true /* show help button */);
    310310        dialog.setContent(p);
  • trunk/src/org/openstreetmap/josm/gui/MainApplication.java

    r8030 r8061  
    581581                        Main.parent, title,
    582582                        new String[]{tr("Change proxy settings"), tr("Cancel")});
    583                 ed.setButtonIcons(new String[]{"dialogs/settings.png", "cancel.png"}).setCancelButton(2);
     583                ed.setButtonIcons(new String[]{"dialogs/settings", "cancel"}).setCancelButton(2);
    584584                ed.setMinimumSize(new Dimension(460, 260));
    585585                ed.setIcon(JOptionPane.WARNING_MESSAGE);
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java

    r7005 r8061  
    8787     */
    8888    protected final void loadIcons() {
    89         mergeComplete = ImageProvider.get("dialogs", "valid.png" );
    90         mergeIncomplete = ImageProvider.get("dialogs/conflict", "mergeincomplete.png" );
     89        mergeComplete = ImageProvider.get("dialogs", "valid" );
     90        mergeIncomplete = ImageProvider.get("dialogs/conflict", "mergeincomplete" );
    9191    }
    9292
  • trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java

    r7958 r8061  
    5757    public static final int ICON_LARGE_SIZE = 24;
    5858    /** 24x24 icon for unresolved notes */
    59     public static final ImageIcon ICON_OPEN = ImageProvider.get("dialogs/notes", "note_open.png");
     59    public static final ImageIcon ICON_OPEN = ImageProvider.get("dialogs/notes", "note_open");
    6060    /** 16x16 icon for unresolved notes */
    6161    public static final ImageIcon ICON_OPEN_SMALL =
    6262            new ImageIcon(ICON_OPEN.getImage().getScaledInstance(ICON_SMALL_SIZE, ICON_SMALL_SIZE, Image.SCALE_SMOOTH));
    6363    /** 24x24 icon for resolved notes */
    64     public static final ImageIcon ICON_CLOSED = ImageProvider.get("dialogs/notes", "note_closed.png");
     64    public static final ImageIcon ICON_CLOSED = ImageProvider.get("dialogs/notes", "note_closed");
    6565    /** 16x16 icon for resolved notes */
    6666    public static final ImageIcon ICON_CLOSED_SMALL =
    6767            new ImageIcon(ICON_CLOSED.getImage().getScaledInstance(ICON_SMALL_SIZE, ICON_SMALL_SIZE, Image.SCALE_SMOOTH));
    6868    /** 24x24 icon for new notes */
    69     public static final ImageIcon ICON_NEW = ImageProvider.get("dialogs/notes", "note_new.png");
     69    public static final ImageIcon ICON_NEW = ImageProvider.get("dialogs/notes", "note_new");
    7070    /** 16x16 icon for new notes */
    7171    public static final ImageIcon ICON_NEW_SMALL =
    7272            new ImageIcon(ICON_NEW.getImage().getScaledInstance(ICON_SMALL_SIZE, ICON_SMALL_SIZE, Image.SCALE_SMOOTH));
    7373    /** Icon for note comments */
    74     public static final ImageIcon ICON_COMMENT = ImageProvider.get("dialogs/notes", "note_comment.png");
     74    public static final ImageIcon ICON_COMMENT = ImageProvider.get("dialogs/notes", "note_comment");
    7575
    7676    private NoteTableModel model;
     
    8787    /** Creates a new toggle dialog for notes */
    8888    public NotesDialog() {
    89         super("Notes", "notes/note_open.png", "List of notes", null, 150);
     89        super("Notes", "notes/note_open", "List of notes", null, 150);
    9090        addCommentAction = new AddCommentAction();
    9191        closeAction = new CloseAction();
  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

    r7862 r8061  
    947947                    tr("Change relation"),
    948948                    new String[] {tr("Delete from relation"), tr("Cancel")});
    949             ed.setButtonIcons(new String[] {"dialogs/delete.png", "cancel.png"});
     949            ed.setButtonIcons(new String[] {"dialogs/delete", "cancel"});
    950950            ed.setContent(tr("Really delete selection from relation {0}?", cur.getDisplayName(DefaultNameFormatter.getInstance())));
    951951            ed.toggleEnable(DELETE_FROM_RELATION_PREF);
  • trunk/src/org/openstreetmap/josm/gui/download/DownloadObjectDialog.java

    r7937 r8061  
    4242        super(parent, tr("Download object"), new String[]{tr("Download object"), tr("Cancel")});
    4343        init();
    44         setButtonIcons(new String[]{"download.png", "cancel.png"});
     44        setButtonIcons(new String[]{"download", "cancel"});
    4545        setToolTipTexts(new String[]{
    4646                tr("Start downloading"),
  • trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java

    r6990 r8061  
    106106        lblWarning = new JLabel("");
    107107        lblWarning.setVisible(false);
    108         lblWarning.setIcon(ImageProvider.get("warning-small.png"));
     108        lblWarning.setIcon(ImageProvider.get("warning-small"));
    109109        lblWarning.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
    110110        JPanel pnl = new JPanel(new BorderLayout());
  • trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

    r7684 r8061  
    890890                    );
    891891                    dialog.setContent(tr("The document contains no data."));
    892                     dialog.setButtonIcons(new String[] {"save.png", "cancel.png"});
     892                    dialog.setButtonIcons(new String[] {"save", "cancel"});
    893893                    return dialog.showDialog().getValue();
    894894                }
     
    910910                    );
    911911                    dialog.setContent(tr("There are unresolved conflicts. Conflicts will not be saved and handled as if you rejected all. Continue?"));
    912                     dialog.setButtonIcons(new String[] {"save.png", "cancel.png"});
     912                    dialog.setButtonIcons(new String[] {"save", "cancel"});
    913913                    return dialog.showDialog().getValue();
    914914                }
  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

    r7935 r8061  
    659659        );
    660660        syncDialog.setContent(panelTf, false);
    661         syncDialog.setButtonIcons(new String[] { "ok.png", "cancel.png" });
     661        syncDialog.setButtonIcons(new String[] { "ok", "cancel" });
    662662        syncDialog.setupDialog();
    663663        outerPanel.add(syncDialog.getContentPane(), BorderLayout.PAGE_START);
     
    699699                            new String[] { tr("OK"), tr("Try Again") }).
    700700                            setContent(tr("No images could be matched!")).
    701                             setButtonIcons(new String[] { "ok.png", "dialogs/refresh.png"}).
     701                            setButtonIcons(new String[] { "ok", "dialogs/refresh"}).
    702702                            showDialog().getValue() == 2)
    703703                    return AGAIN;
     
    982982                    tr("Adjust timezone and offset"),
    983983                    new String[] { tr("Close")}).
    984                     setContent(p).setButtonIcons(new String[] {"ok.png"}).showDialog();
     984                    setContent(p).setButtonIcons(new String[] {"ok"}).showDialog();
    985985        }
    986986    }
  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

    r8041 r8061  
    788788                    tr("Delete image file from disk"),
    789789                    new String[] {tr("Cancel"), tr("Delete")})
    790             .setButtonIcons(new String[] {"cancel.png", "dialogs/delete.png"})
     790            .setButtonIcons(new String[] {"cancel", "dialogs/delete"})
    791791            .setContent(new JLabel(tr("<html><h3>Delete the file {0} from disk?<p>The image file will be permanently lost!</h3></html>"
    792792                    ,toDelete.getFile().getName()), ImageProvider.get("dialogs/geoimage/deletefromdisk"),SwingConstants.LEFT))
  • trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

    r7797 r8061  
    128128     */
    129129    public static ImageIcon getNoIcon_Icon(StyleSource source) {
    130         return new ImageProvider("misc/no_icon.png")
     130        return new ImageProvider("misc/no_icon")
    131131                .setDirs(getIconSourceDirs(source))
    132132                .setId("mappaint."+source.getPrefName())
  • trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

    r7693 r8061  
    338338            contentInsets = new Insets(10,5,0,5);
    339339            if (showNewRelation) {
    340                 setButtonIcons(new String[] {"ok.png", "dialogs/addrelation.png", "cancel.png" });
     340                setButtonIcons(new String[] {"ok", "dialogs/addrelation", "cancel" });
    341341            } else {
    342                 setButtonIcons(new String[] {"ok.png", "cancel.png" });
     342                setButtonIcons(new String[] {"ok", "cancel" });
    343343            }
    344344            setContent(content);
  • trunk/src/org/openstreetmap/josm/io/GpxExporter.java

    r7834 r8061  
    126126                tr("Export options"),
    127127                new String[] { tr("Export and Save"), tr("Cancel") });
    128         ed.setButtonIcons(new String[] { "exportgpx.png", "cancel.png" });
     128        ed.setButtonIcons(new String[] { "exportgpx", "cancel" });
    129129        ed.setContent(p);
    130130        ed.showDialog();
  • trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java

    r8017 r8061  
    111111            );
    112112            dialog.setContent(tr("JOSM version {0} required for plugin {1}.", pi.mainversion, pi.name));
    113             dialog.setButtonIcons(new String[] { "download.png", "cancel.png" });
     113            dialog.setButtonIcons(new String[] { "download", "cancel" });
    114114            dialog.showDialog();
    115115            int answer = dialog.getValue();
  • trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

    r8015 r8061  
    389389                // Check if the dialog has not already been permanently hidden by user
    390390                if (!ed.toggleEnable("askUpdateJava8").toggleCheckState()) {
    391                     ed.setButtonIcons(new String[]{"java.png", "cancel.png"}).setCancelButton(2);
     391                    ed.setButtonIcons(new String[]{"java", "cancel"}).setCancelButton(2);
    392392                    ed.setMinimumSize(new Dimension(480, 300));
    393393                    ed.setIcon(JOptionPane.WARNING_MESSAGE);
  • trunk/src/org/openstreetmap/josm/tools/TextTagParser.java

    r7937 r8061  
    271271                    tr("Do you want to paste these tags?"),
    272272                    new String[]{tr("Ok"), tr("Cancel"), tr("Clear buffer"), tr("Ignore warnings")});
    273         ed.setButtonIcons(new String[]{"ok.png", "cancel.png", "dialogs/delete.png", "pastetags.png"});
     273        ed.setButtonIcons(new String[]{"ok", "cancel", "dialogs/delete", "pastetags"});
    274274        ed.setContent("<html><b>"+text + "</b><br/><br/><div width=\"300px\">"+XmlWriter.encode(data,true)+"</html>");
    275275        ed.setDefaultButton(2);
     
    305305                    new String[]{tr("Ok"), tr("Clear buffer")});
    306306
    307         ed.setButtonIcons(new String[]{"ok.png", "dialogs/delete.png"});
     307        ed.setButtonIcons(new String[]{"ok", "dialogs/delete"});
    308308
    309309        ed.setContent(p);
Note: See TracChangeset for help on using the changeset viewer.