Index: trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 8061)
@@ -62,5 +62,5 @@
tr("Change directions?"),
new String[] {tr("Reverse and Combine"), tr("Cancel")});
- ed.setButtonIcons(new String[] {"wayflip.png", "cancel.png"});
+ ed.setButtonIcons(new String[] {"wayflip", "cancel"});
ed.setContent(tr("The ways can not be combined in their current directions. "
+ "Do you want to reverse some of them?"));
Index: trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java (revision 8061)
@@ -59,5 +59,5 @@
public HistoryObjectIDDialog() {
super(Main.parent, tr("Show history"), new String[]{tr("Show history"), tr("Cancel")});
- setButtonIcons(new String[]{"dialogs/history.png", "cancel.png"});
+ setButtonIcons(new String[]{"dialogs/history", "cancel"});
init();
}
Index: trunk/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java (revision 8061)
@@ -165,5 +165,5 @@
new String[] {tr("Add Rectified Image"), tr("Cancel")});
diag.setContent(panel);
- diag.setButtonIcons(new String[] {"OLmarker.png", "cancel.png"});
+ diag.setButtonIcons(new String[] {"OLmarker", "cancel"});
// This repeatedly shows the dialog in case there has been an error.
Index: trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java (revision 8061)
@@ -118,5 +118,5 @@
);
dialog.setContent(all, false /* don't embedded content in JScrollpane */);
- dialog.setButtonIcons(new String[] {"download.png", "cancel.png"});
+ dialog.setButtonIcons(new String[] {"download", "cancel"});
dialog.setToolTipTexts(new String[] {
tr("Start downloading data"),
Index: trunk/src/org/openstreetmap/josm/actions/PasteAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/PasteAction.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/actions/PasteAction.java (revision 8061)
@@ -180,5 +180,5 @@
tr("Delete incomplete members?"),
new String[] {tr("Paste without incomplete members"), tr("Cancel")});
- ed.setButtonIcons(new String[] {"dialogs/relation/deletemembers.png", "cancel.png"});
+ ed.setButtonIcons(new String[] {"dialogs/relation/deletemembers", "cancel"});
ed.setContent(tr("The copied data contains incomplete objects. "
+ "When pasting the incomplete objects are removed. "
Index: trunk/src/org/openstreetmap/josm/actions/ReportBugAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ReportBugAction.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/actions/ReportBugAction.java (revision 8061)
@@ -22,5 +22,5 @@
*/
public ReportBugAction() {
- super(tr("Report bug"), "bug.png", tr("Report a ticket to JOSM bugtracker"),
+ super(tr("Report bug"), "bug", tr("Report a ticket to JOSM bugtracker"),
Shortcut.registerShortcut("reportbug", tr("Report a ticket to JOSM bugtracker"),
KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), true);
Index: trunk/src/org/openstreetmap/josm/actions/SaveAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SaveAction.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/actions/SaveAction.java (revision 8061)
@@ -49,5 +49,5 @@
new String[] {tr("Overwrite"), tr("Cancel")}
);
- dialog.setButtonIcons(new String[] {"save_as.png", "cancel.png"});
+ dialog.setButtonIcons(new String[] {"save_as", "cancel"});
dialog.setContent(tr("File {0} exists. Overwrite?", f.getName()));
dialog.showDialog();
Index: trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (revision 8061)
@@ -190,5 +190,5 @@
);
dialog.setContent(tr("File exists. Overwrite?"));
- dialog.setButtonIcons(new String[] {"save_as.png", "cancel.png"});
+ dialog.setButtonIcons(new String[] {"save_as", "cancel"});
dialog.showDialog();
return (dialog.getValue() == 1);
Index: trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (revision 8061)
@@ -193,5 +193,5 @@
tr("Status Report"),
new String[] {tr("Copy to clipboard and close"), tr("Report bug"), tr("Close") });
- ed.setButtonIcons(new String[] {"copy.png", "bug.png", "cancel.png" });
+ ed.setButtonIcons(new String[] {"copy", "bug", "cancel" });
ed.setContent(sp, false);
ed.setMinimumSize(new Dimension(380, 200));
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java (revision 8061)
@@ -95,5 +95,5 @@
*/
public ImproveWayAccuracyAction(MapFrame mapFrame) {
- super(tr("Improve Way Accuracy"), "improvewayaccuracy.png",
+ super(tr("Improve Way Accuracy"), "improvewayaccuracy",
tr("Improve Way Accuracy mode"),
Shortcut.registerShortcut("mapmode:ImproveWayAccuracy",
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 8061)
@@ -822,5 +822,5 @@
tr("Move elements"),
new String[]{tr("Move them"), tr("Undo move")});
- ed.setButtonIcons(new String[]{"reorder.png", "cancel.png"});
+ ed.setButtonIcons(new String[]{"reorder", "cancel"});
ed.setContent(
/* for correct i18n of plural forms - see #9110 */
Index: trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 8061)
@@ -306,5 +306,5 @@
}
};
- dialog.setButtonIcons(new String[] {"dialogs/search.png", "cancel.png"});
+ dialog.setButtonIcons(new String[] {"dialogs/search", "cancel"});
dialog.configureContextsensitiveHelp("/Action/Search", true /* show help button */);
dialog.setContent(p);
Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 8061)
@@ -581,5 +581,5 @@
Main.parent, title,
new String[]{tr("Change proxy settings"), tr("Cancel")});
- ed.setButtonIcons(new String[]{"dialogs/settings.png", "cancel.png"}).setCancelButton(2);
+ ed.setButtonIcons(new String[]{"dialogs/settings", "cancel"}).setCancelButton(2);
ed.setMinimumSize(new Dimension(460, 260));
ed.setIcon(JOptionPane.WARNING_MESSAGE);
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (revision 8061)
@@ -87,6 +87,6 @@
*/
protected final void loadIcons() {
- mergeComplete = ImageProvider.get("dialogs", "valid.png" );
- mergeIncomplete = ImageProvider.get("dialogs/conflict", "mergeincomplete.png" );
+ mergeComplete = ImageProvider.get("dialogs", "valid" );
+ mergeIncomplete = ImageProvider.get("dialogs/conflict", "mergeincomplete" );
}
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java (revision 8061)
@@ -57,20 +57,20 @@
public static final int ICON_LARGE_SIZE = 24;
/** 24x24 icon for unresolved notes */
- public static final ImageIcon ICON_OPEN = ImageProvider.get("dialogs/notes", "note_open.png");
+ public static final ImageIcon ICON_OPEN = ImageProvider.get("dialogs/notes", "note_open");
/** 16x16 icon for unresolved notes */
public static final ImageIcon ICON_OPEN_SMALL =
new ImageIcon(ICON_OPEN.getImage().getScaledInstance(ICON_SMALL_SIZE, ICON_SMALL_SIZE, Image.SCALE_SMOOTH));
/** 24x24 icon for resolved notes */
- public static final ImageIcon ICON_CLOSED = ImageProvider.get("dialogs/notes", "note_closed.png");
+ public static final ImageIcon ICON_CLOSED = ImageProvider.get("dialogs/notes", "note_closed");
/** 16x16 icon for resolved notes */
public static final ImageIcon ICON_CLOSED_SMALL =
new ImageIcon(ICON_CLOSED.getImage().getScaledInstance(ICON_SMALL_SIZE, ICON_SMALL_SIZE, Image.SCALE_SMOOTH));
/** 24x24 icon for new notes */
- public static final ImageIcon ICON_NEW = ImageProvider.get("dialogs/notes", "note_new.png");
+ public static final ImageIcon ICON_NEW = ImageProvider.get("dialogs/notes", "note_new");
/** 16x16 icon for new notes */
public static final ImageIcon ICON_NEW_SMALL =
new ImageIcon(ICON_NEW.getImage().getScaledInstance(ICON_SMALL_SIZE, ICON_SMALL_SIZE, Image.SCALE_SMOOTH));
/** Icon for note comments */
- public static final ImageIcon ICON_COMMENT = ImageProvider.get("dialogs/notes", "note_comment.png");
+ public static final ImageIcon ICON_COMMENT = ImageProvider.get("dialogs/notes", "note_comment");
private NoteTableModel model;
@@ -87,5 +87,5 @@
/** Creates a new toggle dialog for notes */
public NotesDialog() {
- super("Notes", "notes/note_open.png", "List of notes", null, 150);
+ super("Notes", "notes/note_open", "List of notes", null, 150);
addCommentAction = new AddCommentAction();
closeAction = new CloseAction();
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 8061)
@@ -947,5 +947,5 @@
tr("Change relation"),
new String[] {tr("Delete from relation"), tr("Cancel")});
- ed.setButtonIcons(new String[] {"dialogs/delete.png", "cancel.png"});
+ ed.setButtonIcons(new String[] {"dialogs/delete", "cancel"});
ed.setContent(tr("Really delete selection from relation {0}?", cur.getDisplayName(DefaultNameFormatter.getInstance())));
ed.toggleEnable(DELETE_FROM_RELATION_PREF);
Index: trunk/src/org/openstreetmap/josm/gui/download/DownloadObjectDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/DownloadObjectDialog.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/gui/download/DownloadObjectDialog.java (revision 8061)
@@ -42,5 +42,5 @@
super(parent, tr("Download object"), new String[]{tr("Download object"), tr("Cancel")});
init();
- setButtonIcons(new String[]{"download.png", "cancel.png"});
+ setButtonIcons(new String[]{"download", "cancel"});
setToolTipTexts(new String[]{
tr("Start downloading"),
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java (revision 8061)
@@ -106,5 +106,5 @@
lblWarning = new JLabel("");
lblWarning.setVisible(false);
- lblWarning.setIcon(ImageProvider.get("warning-small.png"));
+ lblWarning.setIcon(ImageProvider.get("warning-small"));
lblWarning.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
JPanel pnl = new JPanel(new BorderLayout());
Index: trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 8061)
@@ -890,5 +890,5 @@
);
dialog.setContent(tr("The document contains no data."));
- dialog.setButtonIcons(new String[] {"save.png", "cancel.png"});
+ dialog.setButtonIcons(new String[] {"save", "cancel"});
return dialog.showDialog().getValue();
}
@@ -910,5 +910,5 @@
);
dialog.setContent(tr("There are unresolved conflicts. Conflicts will not be saved and handled as if you rejected all. Continue?"));
- dialog.setButtonIcons(new String[] {"save.png", "cancel.png"});
+ dialog.setButtonIcons(new String[] {"save", "cancel"});
return dialog.showDialog().getValue();
}
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 8061)
@@ -659,5 +659,5 @@
);
syncDialog.setContent(panelTf, false);
- syncDialog.setButtonIcons(new String[] { "ok.png", "cancel.png" });
+ syncDialog.setButtonIcons(new String[] { "ok", "cancel" });
syncDialog.setupDialog();
outerPanel.add(syncDialog.getContentPane(), BorderLayout.PAGE_START);
@@ -699,5 +699,5 @@
new String[] { tr("OK"), tr("Try Again") }).
setContent(tr("No images could be matched!")).
- setButtonIcons(new String[] { "ok.png", "dialogs/refresh.png"}).
+ setButtonIcons(new String[] { "ok", "dialogs/refresh"}).
showDialog().getValue() == 2)
return AGAIN;
@@ -982,5 +982,5 @@
tr("Adjust timezone and offset"),
new String[] { tr("Close")}).
- setContent(p).setButtonIcons(new String[] {"ok.png"}).showDialog();
+ setContent(p).setButtonIcons(new String[] {"ok"}).showDialog();
}
}
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 8061)
@@ -788,5 +788,5 @@
tr("Delete image file from disk"),
new String[] {tr("Cancel"), tr("Delete")})
- .setButtonIcons(new String[] {"cancel.png", "dialogs/delete.png"})
+ .setButtonIcons(new String[] {"cancel", "dialogs/delete"})
.setContent(new JLabel(tr("Delete the file {0} from disk?
The image file will be permanently lost!"
,toDelete.getFile().getName()), ImageProvider.get("dialogs/geoimage/deletefromdisk"),SwingConstants.LEFT))
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java (revision 8061)
@@ -128,5 +128,5 @@
*/
public static ImageIcon getNoIcon_Icon(StyleSource source) {
- return new ImageProvider("misc/no_icon.png")
+ return new ImageProvider("misc/no_icon")
.setDirs(getIconSourceDirs(source))
.setId("mappaint."+source.getPrefName())
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (revision 8061)
@@ -338,7 +338,7 @@
contentInsets = new Insets(10,5,0,5);
if (showNewRelation) {
- setButtonIcons(new String[] {"ok.png", "dialogs/addrelation.png", "cancel.png" });
+ setButtonIcons(new String[] {"ok", "dialogs/addrelation", "cancel" });
} else {
- setButtonIcons(new String[] {"ok.png", "cancel.png" });
+ setButtonIcons(new String[] {"ok", "cancel" });
}
setContent(content);
Index: trunk/src/org/openstreetmap/josm/io/GpxExporter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/GpxExporter.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/io/GpxExporter.java (revision 8061)
@@ -126,5 +126,5 @@
tr("Export options"),
new String[] { tr("Export and Save"), tr("Cancel") });
- ed.setButtonIcons(new String[] { "exportgpx.png", "cancel.png" });
+ ed.setButtonIcons(new String[] { "exportgpx", "cancel" });
ed.setContent(p);
ed.showDialog();
Index: trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java (revision 8061)
@@ -111,5 +111,5 @@
);
dialog.setContent(tr("JOSM version {0} required for plugin {1}.", pi.mainversion, pi.name));
- dialog.setButtonIcons(new String[] { "download.png", "cancel.png" });
+ dialog.setButtonIcons(new String[] { "download", "cancel" });
dialog.showDialog();
int answer = dialog.getValue();
Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (revision 8061)
@@ -389,5 +389,5 @@
// Check if the dialog has not already been permanently hidden by user
if (!ed.toggleEnable("askUpdateJava8").toggleCheckState()) {
- ed.setButtonIcons(new String[]{"java.png", "cancel.png"}).setCancelButton(2);
+ ed.setButtonIcons(new String[]{"java", "cancel"}).setCancelButton(2);
ed.setMinimumSize(new Dimension(480, 300));
ed.setIcon(JOptionPane.WARNING_MESSAGE);
Index: trunk/src/org/openstreetmap/josm/tools/TextTagParser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/TextTagParser.java (revision 8056)
+++ trunk/src/org/openstreetmap/josm/tools/TextTagParser.java (revision 8061)
@@ -271,5 +271,5 @@
tr("Do you want to paste these tags?"),
new String[]{tr("Ok"), tr("Cancel"), tr("Clear buffer"), tr("Ignore warnings")});
- ed.setButtonIcons(new String[]{"ok.png", "cancel.png", "dialogs/delete.png", "pastetags.png"});
+ ed.setButtonIcons(new String[]{"ok", "cancel", "dialogs/delete", "pastetags"});
ed.setContent(""+text + "
"+XmlWriter.encode(data,true)+"");
ed.setDefaultButton(2);
@@ -305,5 +305,5 @@
new String[]{tr("Ok"), tr("Clear buffer")});
- ed.setButtonIcons(new String[]{"ok.png", "dialogs/delete.png"});
+ ed.setButtonIcons(new String[]{"ok", "dialogs/delete"});
ed.setContent(p);