Index: trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (revision 7668) @@ -42,12 +42,12 @@ public static final Collection MODES = Collections.unmodifiableList(Arrays.asList( - marktr("data"), - marktr("layer"), - marktr("selection"), - marktr("conflict"), - marktr("download"), - marktr("problem"), - marktr("previous"), - marktr("next"))); + marktr(/* ICON(dialogs/autoscale/) */ "data"), + marktr(/* ICON(dialogs/autoscale/) */ "layer"), + marktr(/* ICON(dialogs/autoscale/) */ "selection"), + marktr(/* ICON(dialogs/autoscale/) */ "conflict"), + marktr(/* ICON(dialogs/autoscale/) */ "download"), + marktr(/* ICON(dialogs/autoscale/) */ "problem"), + marktr(/* ICON(dialogs/autoscale/) */ "previous"), + marktr(/* ICON(dialogs/autoscale/) */ "next"))); private final String mode; Index: trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (revision 7668) @@ -64,5 +64,5 @@ */ public CreateMultipolygonAction(final boolean update) { - super(getName(update), "multipoly_create", getName(update), + super(getName(update), /* ICON */ "multipoly_create", getName(update), /* atleast three lines for each shortcut or the server extractor fails */ update ? Shortcut.registerShortcut("tools:multipoly_update", Index: trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java (revision 7668) @@ -54,5 +54,5 @@ public static JoinNodeWayAction createJoinNodeToWayAction() { JoinNodeWayAction action = new JoinNodeWayAction(false, - tr("Join Node to Way"), "joinnodeway", tr("Include a node into the nearest way segments"), + tr("Join Node to Way"), /* ICON */ "joinnodeway", tr("Include a node into the nearest way segments"), Shortcut.registerShortcut("tools:joinnodeway", tr("Tool: {0}", tr("Join Node to Way")), KeyEvent.VK_J, Shortcut.DIRECT), true); action.putValue("help", ht("/Action/JoinNodeWay")); @@ -66,5 +66,5 @@ public static JoinNodeWayAction createMoveNodeOntoWayAction() { JoinNodeWayAction action = new JoinNodeWayAction(true, - tr("Move Node onto Way"), "movenodeontoway", tr("Move the node onto the nearest way segments and include it"), + tr("Move Node onto Way"), /* ICON*/ "movenodeontoway", tr("Move the node onto the nearest way segments and include it"), Shortcut.registerShortcut("tools:movenodeontoway", tr("Tool: {0}", tr("Move Node onto Way")), KeyEvent.VK_N, Shortcut.DIRECT), true); return action; Index: trunk/src/org/openstreetmap/josm/actions/LassoModeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/LassoModeAction.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/actions/LassoModeAction.java (revision 7668) @@ -13,5 +13,5 @@ public LassoModeAction() { super(tr("Lasso Mode"), - "rope", + /* ICON(mapmode/) */ "rope", tr("Lasso selection mode: select objects within a hand-drawn region"), null, Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 7668) @@ -62,11 +62,11 @@ private enum DeleteMode { - none("delete"), - segment("delete_segment"), - node("delete_node"), - node_with_references("delete_node"), - way("delete_way_only"), - way_with_references("delete_way_normal"), - way_with_nodes("delete_way_node_only"); + none(/* ICON(cursor/modifier/) */ "delete"), + segment(/* ICON(cursor/modifier/) */ "delete_segment"), + node(/* ICON(cursor/modifier/) */ "delete_node"), + node_with_references(/* ICON(cursor/modifier/) */ "delete_node"), + way(/* ICON(cursor/modifier/) */ "delete_way_only"), + way_with_references(/* ICON(cursor/modifier/) */ "delete_way_normal"), + way_with_nodes(/* ICON(cursor/modifier/) */ "delete_way_node_only"); private final Cursor c; Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 7668) @@ -1740,5 +1740,5 @@ private class SnapChangeAction extends JosmAction { public SnapChangeAction() { - super(tr("Angle snapping"), "anglesnap", + super(tr("Angle snapping"), /* ICON() */ "anglesnap", tr("Switch angle snapping mode while drawing"), null, false); putValue("help", ht("/Action/Draw/AngleSnap")); Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 7668) @@ -188,5 +188,5 @@ private class DualAlignChangeAction extends JosmAction { public DualAlignChangeAction() { - super(tr("Dual alignment"), "mapmode/extrude/dualalign", + super(tr("Dual alignment"), /* ICON() */ "mapmode/extrude/dualalign", tr("Switch dual alignment mode while extruding"), null, false); putValue("help", ht("/Action/Extrude#DualAlign")); @@ -204,5 +204,5 @@ */ public ExtrudeAction(MapFrame mapFrame) { - super(tr("Extrude"), "extrude/extrude", tr("Create areas"), + super(tr("Extrude"), /* ICON(mapmode/) */ "extrude/extrude", tr("Create areas"), Shortcut.registerShortcut("mapmode:extrude", tr("Mode: {0}", tr("Extrude")), KeyEvent.VK_X, Shortcut.DIRECT), mapFrame, Index: trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 7668) @@ -85,19 +85,19 @@ // contains all possible cases the cursor can be in the SelectAction private static enum SelectActionCursor { - rect("normal", "selection"), - rect_add("normal", "select_add"), - rect_rm("normal", "select_remove"), - way("normal", "select_way"), - way_add("normal", "select_way_add"), - way_rm("normal", "select_way_remove"), - node("normal", "select_node"), - node_add("normal", "select_node_add"), - node_rm("normal", "select_node_remove"), - virtual_node("normal", "addnode"), - scale("scale", null), - rotate("rotate", null), - merge("crosshair", null), - lasso("normal", "rope"), - merge_to_node("crosshair", "joinnode"), + rect("normal", /* ICON(cursor/modifier/) */ "selection"), + rect_add("normal", /* ICON(cursor/modifier/) */ "select_add"), + rect_rm("normal", /* ICON(cursor/modifier/) */ "select_remove"), + way("normal", /* ICON(cursor/modifier/) */ "select_way"), + way_add("normal", /* ICON(cursor/modifier/) */ "select_way_add"), + way_rm("normal", /* ICON(cursor/modifier/) */ "select_way_remove"), + node("normal", /* ICON(cursor/modifier/) */ "select_node"), + node_add("normal", /* ICON(cursor/modifier/) */ "select_node_add"), + node_rm("normal", /* ICON(cursor/modifier/) */ "select_node_remove"), + virtual_node("normal", /* ICON(cursor/modifier/) */ "addnode"), + scale(/* ICON(cursor/) */ "scale", null), + rotate(/* ICON(cursor/) */ "rotate", null), + merge(/* ICON(cursor/) */ "crosshair", null), + lasso("normal", /* ICON(cursor/modifier/) */ "rope"), + merge_to_node("crosshair", /* ICON(cursor/modifier/) */ "joinnode"), move(Cursor.MOVE_CURSOR); Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 7668) @@ -418,5 +418,5 @@ protected CopyAction(String icon_name, String action_name, String short_description) { - ImageIcon icon = ImageProvider.get("dialogs/conflict", icon_name+".png"); + ImageIcon icon = ImageProvider.get("dialogs/conflict", icon_name); putValue(Action.SMALL_ICON, icon); if (icon == null) { @@ -435,5 +435,6 @@ public CopyStartLeftAction() { - super("copystartleft", tr("> top"), tr("Copy my selected nodes to the start of the merged node list")); + super(/* ICON(dialogs/conflict/)*/ "copystartleft", tr("> top"), + tr("Copy my selected nodes to the start of the merged node list")); } @@ -456,5 +457,6 @@ public CopyEndLeftAction() { - super("copyendleft", tr("> bottom"), tr("Copy my selected elements to the end of the list of merged elements.")); + super(/* ICON(dialogs/conflict/)*/ "copyendleft", tr("> bottom"), + tr("Copy my selected elements to the end of the list of merged elements.")); } @@ -477,5 +479,5 @@ public CopyBeforeCurrentLeftAction() { - super("copybeforecurrentleft", tr("> before"), + super(/* ICON(dialogs/conflict/)*/ "copybeforecurrentleft", tr("> before"), tr("Copy my selected elements before the first selected element in the list of merged elements.")); } @@ -507,5 +509,5 @@ public CopyAfterCurrentLeftAction() { - super("copyaftercurrentleft", tr("> after"), + super(/* ICON(dialogs/conflict/)*/ "copyaftercurrentleft", tr("> after"), tr("Copy my selected elements after the first selected element in the list of merged elements.")); } @@ -533,5 +535,6 @@ public CopyStartRightAction() { - super("copystartright", tr("< top"), tr("Copy their selected element to the start of the list of merged elements.")); + super(/* ICON(dialogs/conflict/)*/ "copystartright", tr("< top"), + tr("Copy their selected element to the start of the list of merged elements.")); } @@ -550,5 +553,6 @@ public CopyEndRightAction() { - super("copyendright", tr("< bottom"), tr("Copy their selected elements to the end of the list of merged elements.")); + super(/* ICON(dialogs/conflict/)*/ "copyendright", tr("< bottom"), + tr("Copy their selected elements to the end of the list of merged elements.")); } @@ -567,5 +571,5 @@ public CopyBeforeCurrentRightAction() { - super("copybeforecurrentright", tr("< before"), + super(/* ICON(dialogs/conflict/)*/ "copybeforecurrentright", tr("< before"), tr("Copy their selected elements before the first selected element in the list of merged elements.")); } @@ -593,5 +597,5 @@ public CopyAfterCurrentRightAction() { - super("copyaftercurrentright", tr("< after"), + super(/* ICON(dialogs/conflict/)*/ "copyaftercurrentright", tr("< after"), tr("Copy their selected element after the first selected element in the list of merged elements")); } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java (revision 7668) @@ -97,5 +97,5 @@ public static final JosmAction PREFERENCE_ACTION = PreferencesAction.forPreferenceSubTab( - tr("Map paint preferences"), null, MapPaintPreference.class, "dialogs/mappaintpreference"); + tr("Map paint preferences"), null, MapPaintPreference.class, /* ICON */ "dialogs/mappaintpreference"); /** Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (revision 7668) @@ -522,5 +522,6 @@ add(lblTitle_weak, GBC.std().fill(GBC.HORIZONTAL)); - buttonsHide = new JButton(ImageProvider.get("misc", buttonHiding != ButtonHidingType.ALWAYS_SHOWN ? "buttonhide" : "buttonshow")); + buttonsHide = new JButton(ImageProvider.get("misc", buttonHiding != ButtonHidingType.ALWAYS_SHOWN + ? /* ICON(misc/)*/ "buttonhide" : /* ICON(misc/)*/ "buttonshow")); buttonsHide.setToolTipText(tr("Toggle dynamic buttons")); buttonsHide.setBorder(BorderFactory.createEmptyBorder()); @@ -941,5 +942,6 @@ private void refreshHidingButtons() { - titleBar.buttonsHide.setIcon(ImageProvider.get("misc", buttonHiding != ButtonHidingType.ALWAYS_SHOWN ? "buttonhide" : "buttonshow")); + titleBar.buttonsHide.setIcon(ImageProvider.get("misc", buttonHiding != ButtonHidingType.ALWAYS_SHOWN + ? /* ICON(misc/)*/ "buttonhide" : /* ICON(misc/)*/ "buttonshow")); titleBar.buttonsHide.setEnabled(buttonHiding != ButtonHidingType.ALWAYS_HIDDEN); if (buttonsPanel != null) { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 7668) @@ -891,5 +891,5 @@ public DeleteAction() { - super(tr("Delete"), "dialogs/delete", tr("Delete the selected key in all objects"), + super(tr("Delete"), /* ICON() */ "dialogs/delete", tr("Delete the selected key in all objects"), Shortcut.registerShortcut("properties:delete", tr("Delete Tags"), KeyEvent.VK_D, Shortcut.ALT_CTRL_SHIFT), false); @@ -999,5 +999,5 @@ class AddAction extends JosmAction { public AddAction() { - super(tr("Add"), "dialogs/add", tr("Add a new key/value pair to all objects"), + super(tr("Add"), /* ICON() */ "dialogs/add", tr("Add a new key/value pair to all objects"), Shortcut.registerShortcut("properties:add", tr("Add Tag"), KeyEvent.VK_A, Shortcut.ALT), false); @@ -1016,5 +1016,5 @@ class EditAction extends JosmAction implements ListSelectionListener { public EditAction() { - super(tr("Edit"), "dialogs/edit", tr("Edit the value of the selected key for all objects"), + super(tr("Edit"), /* ICON() */ "dialogs/edit", tr("Edit the value of the selected key for all objects"), Shortcut.registerShortcut("properties:edit", tr("Edit Tags"), KeyEvent.VK_S, Shortcut.ALT), false); Index: trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (revision 7668) @@ -570,5 +570,5 @@ public Settings(DefaultMutableTreeNode rootActionsNode) { - super("toolbar", tr("Toolbar customization"), tr("Customize the elements on the toolbar.")); + super(/* ICON(preferences/) */ "toolbar", tr("Toolbar customization"), tr("Customize the elements on the toolbar.")); actionsTreeModel = new DefaultTreeModel(rootActionsNode); actionsTree = new JTree(actionsTreeModel); Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java (revision 7668) @@ -66,5 +66,5 @@ private AdvancedPreference() { - super("advanced", tr("Advanced Preferences"), tr("Setting Preference entries directly. Use with caution!")); + super(/* ICON(preferences/) */ "advanced", tr("Advanced Preferences"), tr("Setting Preference entries directly. Use with caution!")); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/audio/AudioPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/audio/AudioPreference.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/gui/preferences/audio/AudioPreference.java (revision 7668) @@ -35,5 +35,5 @@ private AudioPreference() { - super("audio", tr("Audio Settings"), tr("Settings for the audio player and audio markers.")); + super(/* ICON(preferences/) */ "audio", tr("Audio Settings"), tr("Settings for the audio player and audio markers.")); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java (revision 7668) @@ -29,5 +29,5 @@ private DisplayPreference() { - super("display", tr("Display Settings"), tr("Various settings that influence the visual representation of the whole program."), false, new JTabbedPane()); + super(/* ICON(preferences/) */ "display", tr("Display Settings"), tr("Various settings that influence the visual representation of the whole program."), false, new JTabbedPane()); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 7668) @@ -83,5 +83,5 @@ private ImageryPreference() { - super("imagery", tr("Imagery Preferences"), tr("Modify list of imagery layers displayed in the Imagery menu"), false, new JTabbedPane()); + super(/* ICON(preferences/) */ "imagery", tr("Imagery Preferences"), tr("Modify list of imagery layers displayed in the Imagery menu"), false, new JTabbedPane()); } @@ -453,6 +453,10 @@ putValue(NAME, type.toString()); putValue(SHORT_DESCRIPTION, tr("Add a new {0} entry by entering the URL", type.toString())); - putValue(SMALL_ICON, ImageProvider.get("dialogs", - "add" + (ImageryInfo.ImageryType.WMS.equals(type) ? "_wms" : ImageryInfo.ImageryType.TMS.equals(type) ? "_tms" : ""))); + String icon = /* ICON(dialogs/) */ "add"; + if(ImageryInfo.ImageryType.WMS.equals(type)) + icon = /* ICON(dialogs/) */ "add_wms"; + else if(ImageryInfo.ImageryType.TMS.equals(type)) + icon = /* ICON(dialogs/) */ "add_tms"; + putValue(SMALL_ICON, ImageProvider.get("dialogs", icon)); this.type = type; } Index: trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java (revision 7668) @@ -28,5 +28,5 @@ private MapPreference() { - super("map", tr("Map Settings"), tr("Settings for the map projection and data interpretation."), false, new JTabbedPane()); + super(/* ICON(preferences/) */ "map", tr("Map Settings"), tr("Settings for the map projection and data interpretation."), false, new JTabbedPane()); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java (revision 7668) @@ -76,5 +76,5 @@ private PluginPreference() { - super("plugin", tr("Plugins"), tr("Configure available plugins."), false, new JTabbedPane()); + super(/* ICON(preferences/) */ "plugin", tr("Plugins"), tr("Configure available plugins."), false, new JTabbedPane()); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java (revision 7668) @@ -40,5 +40,5 @@ */ public CodeProjectionChoice() { - super(tr("By Code (EPSG)"), "core:code"); + super(tr("By Code (EPSG)"), /* NO-ICON */ "core:code"); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java (revision 7668) @@ -46,5 +46,5 @@ */ public CustomProjectionChoice() { - super(tr("Custom Projection"), "core:custom"); + super(tr("Custom Projection"), /* NO-ICON */ "core:custom"); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java (revision 7668) @@ -17,5 +17,5 @@ */ public GaussKruegerProjectionChoice() { - super(tr("Gau\u00DF-Kr\u00FCger"), "core:gauss-krueger", zones, tr("GK Zone")); + super(tr("Gau\u00DF-Kr\u00FCger"), /* NO-ICON */ "core:gauss-krueger", zones, tr("GK Zone")); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java (revision 7668) @@ -33,5 +33,5 @@ */ public LambertCC9ZonesProjectionChoice() { - super(tr("Lambert CC9 Zone (France)"), "core:lambertcc9", lambert9zones, tr("Lambert CC Zone")); + super(tr("Lambert CC9 Zone (France)"), /* NO-ICON */ "core:lambertcc9", lambert9zones, tr("Lambert CC Zone")); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java (revision 7668) @@ -28,5 +28,5 @@ */ public LambertProjectionChoice() { - super(tr("Lambert 4 Zones (France)"), "core:lambert", lambert4zones, tr("Lambert CC Zone")); + super(tr("Lambert 4 Zones (France)"), /* NO-ICON */ "core:lambert", lambert4zones, tr("Lambert CC Zone")); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/PuwgProjectionChoice.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/projection/PuwgProjectionChoice.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/PuwgProjectionChoice.java (revision 7668) @@ -31,5 +31,5 @@ */ public PuwgProjectionChoice() { - super(tr("PUWG (Poland)"), "core:puwg", NAMES, tr("PUWG Zone")); + super(tr("PUWG (Poland)"), /* NO-ICON */ "core:puwg", NAMES, tr("PUWG Zone")); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/SwissGridProjectionChoice.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/projection/SwissGridProjectionChoice.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/SwissGridProjectionChoice.java (revision 7668) @@ -19,5 +19,5 @@ */ public SwissGridProjectionChoice() { - super(tr("Swiss Grid (Switzerland)"), "core:swissgrid", "EPSG:21781"); + super(tr("Swiss Grid (Switzerland)"), /* NO-ICON */ "core:swissgrid", "EPSG:21781"); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMFranceDOMProjectionChoice.java (revision 7668) @@ -29,5 +29,5 @@ */ public UTMFranceDOMProjectionChoice() { - super(tr("UTM France (DOM)"), "core:utmfrancedom", utmGeodesicsNames, tr("UTM Geodesic system")); + super(tr("UTM France (DOM)"), /* NO-ICON */ "core:utmfrancedom", utmGeodesicsNames, tr("UTM Geodesic system")); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java (revision 7668) @@ -44,5 +44,5 @@ */ public UTMProjectionChoice() { - super(tr("UTM"), "core:utm", cbEntries.toArray(new String[0]), tr("UTM Zone")); + super(tr("UTM"), /* NO-ICON */ "core:utm", cbEntries.toArray(new String[0]), tr("UTM Zone")); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java (revision 7668) @@ -60,5 +60,5 @@ private RemoteControlPreference() { - super("remotecontrol", tr("Remote Control"), tr("Settings for the remote control feature.")); + super(/* ICON(preferences/) */ "remotecontrol", tr("Remote Control"), tr("Settings for the remote control feature.")); for (PermissionPrefWithDefault p : PermissionPrefWithDefault.getPermissionPrefs()) { JCheckBox cb = new JCheckBox(p.preferenceText); Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/ServerAccessPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/server/ServerAccessPreference.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/gui/preferences/server/ServerAccessPreference.java (revision 7668) @@ -35,5 +35,5 @@ private ServerAccessPreference() { - super("connection", tr("Connection Settings"), tr("Connection Settings for the OSM server."), false, new JTabbedPane()); + super(/* ICON(preferences/) */ "connection", tr("Connection Settings"), tr("Connection Settings for the OSM server."), false, new JTabbedPane()); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/ShortcutPreference.java (revision 7668) @@ -31,5 +31,5 @@ private ShortcutPreference() { - super("shortcuts", tr("Keyboard Shortcuts"), tr("Changing keyboard shortcuts manually.")); + super(/* ICON(preferences/) */ "shortcuts", tr("Keyboard Shortcuts"), tr("Changing keyboard shortcuts manually.")); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorPreference.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorPreference.java (revision 7668) @@ -31,5 +31,5 @@ private ValidatorPreference() { - super("validator", tr("Data validator"), + super(/* ICON(preferences/) */ "validator", tr("Data validator"), tr("An OSM data validator that checks for common errors made by users and editor programs."), false, new JTabbedPane()); Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetType.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetType.java (revision 7666) +++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetType.java (revision 7668) @@ -10,5 +10,8 @@ */ public enum TaggingPresetType { - NODE("Mf_node", "node"), WAY("Mf_way", "way"), RELATION("Mf_relation", "relation"), CLOSEDWAY("Mf_closedway", "closedway"); + NODE(/* ICON */ "Mf_node", "node"), + WAY(/* ICON */ "Mf_way", "way"), + RELATION(/* ICON */ "Mf_relation", "relation"), + CLOSEDWAY(/* ICON */ "Mf_closedway", "closedway"); private final String iconName; private final String name;