diff --git a/swingx-core/src/main/java/org/jdesktop/swingx/plaf/SearchFieldAddon.java b/swingx-core/src/main/java/org/jdesktop/swingx/plaf/SearchFieldAddon.java index 5018ad30e..64258f45f 100644 --- a/swingx-core/src/main/java/org/jdesktop/swingx/plaf/SearchFieldAddon.java +++ b/swingx-core/src/main/java/org/jdesktop/swingx/plaf/SearchFieldAddon.java @@ -14,10 +14,20 @@ import org.jdesktop.swingx.icon.RadianceIcon; import org.jdesktop.swingx.icon.SearchIcon; +/** + * use from svg generated {@link RadianceIcon}s, + * + * + * see Examples with screenshots + * + * @author homeb + * + */ public class SearchFieldAddon extends AbstractComponentAddon { public static final String SEARCH_FIELD_SOURCE = "searchField"; public static final String BUTTON_SOURCE = "button"; + private static final int ICON_SIZE = RadianceIcon.SMALL_ICON; public SearchFieldAddon() { super("JXSearchField"); @@ -29,41 +39,28 @@ protected void addBasicDefaults(LookAndFeelAddons addon, DefaultsList defaults) defaults.add("SearchField.layoutStyle", LayoutStyle.MAC); -/* SwingLabs origin (some gif files not exist): - defaults.add("SearchField.icon", getIcon("basic/resources/search.gif")); // Lupe / magnifying glass - defaults.add("SearchField.rolloverIcon", getIcon("basic/resources/search_rollover.gif")); - defaults.add("SearchField.pressedIcon", getIcon("basic/resources/search.gif")); - defaults.add("SearchField.popupIcon", getIcon("basic/resources/search_popup.gif")); - defaults.add("SearchField.popupRolloverIcon", getIcon("basic/resources/search_popup_rollover.gif")); - defaults.add("SearchField.clearIcon", getIcon("basic/resources/clear.gif")); - defaults.add("SearchField.clearRolloverIcon", getIcon("basic/resources/clear_rollover.gif")); - defaults.add("SearchField.clearPressedIcon", getIcon("basic/resources/clear_pressed.gif")); - */ // Icons from svg: - RadianceIcon searchIcon = SearchIcon.of(RadianceIcon.ACTION_ICON, RadianceIcon.ACTION_ICON); - RadianceIcon searchIconRollover = SearchIcon.of(RadianceIcon.ACTION_ICON,RadianceIcon.ACTION_ICON); + RadianceIcon searchIcon = SearchIcon.of(ICON_SIZE, ICON_SIZE); + RadianceIcon searchIconRollover = SearchIcon.of(ICON_SIZE, ICON_SIZE); searchIconRollover.setReflection(false, true); // vertical mirror - RadianceIcon searchIconpPessed = SearchIcon.of(RadianceIcon.ACTION_ICON,RadianceIcon.ACTION_ICON); + RadianceIcon searchIconpPessed = SearchIcon.of(ICON_SIZE, ICON_SIZE); searchIconpPessed.setReflection(false, true); // vertical mirror searchIconpPessed.setColorFilter(color -> Color.RED); - RadianceIcon deleteIcon = DeleteIcon.of(RadianceIcon.ACTION_ICON, RadianceIcon.ACTION_ICON); - RadianceIcon deleteIconRollover = DeleteIcon.of(RadianceIcon.ACTION_ICON, RadianceIcon.ACTION_ICON); + RadianceIcon deleteIcon = DeleteIcon.of(ICON_SIZE, ICON_SIZE); + RadianceIcon deleteIconRollover = DeleteIcon.of(ICON_SIZE, ICON_SIZE); deleteIconRollover.setColorFilter(color -> Color.RED); - RadianceIcon deletedIcon = DeletedIcon.of(RadianceIcon.ACTION_ICON, RadianceIcon.ACTION_ICON); + RadianceIcon deletedIcon = DeletedIcon.of(ICON_SIZE, ICON_SIZE); deletedIcon.setColorFilter(color -> Color.RED); - RadianceIcon popupIcon = ChevronIcon.of(RadianceIcon.XS,RadianceIcon.XS); - RadianceIcon popupIconRollover = ChevronIcon.of(RadianceIcon.XS,RadianceIcon.XS); + RadianceIcon popupIcon = ChevronIcon.of(RadianceIcon.XS, RadianceIcon.XS); + RadianceIcon popupIconRollover = ChevronIcon.of(RadianceIcon.XS, RadianceIcon.XS); popupIconRollover.setRotation(RadianceIcon.SOUTH); defaults.add("SearchField.icon", new IconUIResource(searchIcon)); defaults.add("SearchField.rolloverIcon", new IconUIResource(searchIconRollover)); defaults.add("SearchField.pressedIcon", new IconUIResource(searchIconpPessed)); -// defaults.add("SearchField.popupIcon", getIcon("basic/resources/search_popup.gif")); -// defaults.add("SearchField.popupRolloverIcon", getIcon("basic/resources/search.gif")); - // override: defaults.add("SearchField.popupIcon", new IconUIResource(popupIcon)); defaults.add("SearchField.popupRolloverIcon", new IconUIResource(popupIconRollover)); @@ -76,7 +73,6 @@ protected void addBasicDefaults(LookAndFeelAddons addon, DefaultsList defaults) //webstart fix UIManagerExt.addResourceBundle("org.jdesktop.swingx.plaf.basic.resources.SearchField"); -// UIManager.getDefaults().addResourceBundle("org.jdesktop.swingx.plaf.basic.resources.SearchField"); } @Override @@ -92,15 +88,6 @@ protected void addWindowsDefaults(LookAndFeelAddons addon, DefaultsList defaults defaults.add("SearchField.promptFontStyle", Font.ITALIC); defaults.add("SearchField.layoutStyle", LayoutStyle.VISTA); -// defaults.add("SearchField.icon", getIcon("windows/resources/search.gif")); -// defaults.add("SearchField.rolloverIcon", getIcon("windows/resources/search_rollover.gif")); -// defaults.add("SearchField.pressedIcon", getIcon("windows/resources/search_pressed.gif")); -// defaults.add("SearchField.popupIcon", getIcon("windows/resources/search_popup.gif")); -// defaults.add("SearchField.popupRolloverIcon", getIcon("windows/resources/search_popup_rollover.gif")); -// defaults.add("SearchField.popupPressedIcon", getIcon("windows/resources/search_popup_pressed.gif")); -// defaults.add("SearchField.clearIcon", getIcon("windows/resources/clear.gif")); -// defaults.add("SearchField.clearRolloverIcon", getIcon("windows/resources/clear_rollover.gif")); -// defaults.add("SearchField.clearPressedIcon", getIcon("windows/resources/clear_pressed.gif")); defaults.add("SearchField.useSeperatePopupButton", Boolean.TRUE); defaults.add("SearchField.popupOffset", -1); @@ -114,34 +101,10 @@ protected void addWindowsDefaults(LookAndFeelAddons addon, DefaultsList defaults } } - @Override - protected void addMotifDefaults(LookAndFeelAddons addon, DefaultsList defaults) { - super.addMotifDefaults(addon, defaults); - -// defaults.add("SearchField.icon", getIcon("macosx/resources/search.png")); -// defaults.add("SearchField.rolloverIcon", getIcon("macosx/resources/search.png")); -// defaults.add("SearchField.pressedIcon", getIcon("macosx/resources/search.png")); -// defaults.add("SearchField.popupIcon", getIcon("macosx/resources/search_popup.png")); -// defaults.add("SearchField.popupRolloverIcon", getIcon("macosx/resources/search_popup.png")); -// defaults.add("SearchField.popupPressedIcon", getIcon("macosx/resources/search_popup.png")); -// defaults.add("SearchField.clearIcon", getIcon("macosx/resources/clear.png")); -// defaults.add("SearchField.clearRolloverIcon", getIcon("macosx/resources/clear_rollover.png")); -// defaults.add("SearchField.clearPressedIcon", getIcon("macosx/resources/clear_pressed.png")); - } - @Override protected void addMacDefaults(LookAndFeelAddons addon, DefaultsList defaults) { super.addMacDefaults(addon, defaults); -// defaults.add("SearchField.icon", getIcon("macosx/resources/search.png")); -// defaults.add("SearchField.rolloverIcon", getIcon("macosx/resources/search.png")); -// defaults.add("SearchField.pressedIcon", getIcon("macosx/resources/search.png")); -// defaults.add("SearchField.popupIcon", getIcon("macosx/resources/search_popup.png")); -// defaults.add("SearchField.popupRolloverIcon", getIcon("macosx/resources/search_popup.png")); -// defaults.add("SearchField.popupPressedIcon", getIcon("macosx/resources/search_popup.png")); -// defaults.add("SearchField.clearIcon", getIcon("macosx/resources/clear.png")); -// defaults.add("SearchField.clearRolloverIcon", getIcon("macosx/resources/clear_rollover.png")); -// defaults.add("SearchField.clearPressedIcon", getIcon("macosx/resources/clear_pressed.png")); defaults.add("SearchField.buttonMargin", new InsetsUIResource(0, 0, 0, 0)); defaults.add("SearchField.popupSource", SEARCH_FIELD_SOURCE); } @@ -154,12 +117,4 @@ protected boolean isWindows(LookAndFeelAddons addon) { || UIManager.getLookAndFeel().getClass().getName().indexOf("PlasticXP") != -1; } -// private IconUIResource getIcon(String resourceName) { -// URL url = getClass().getResource(resourceName); -// if (url == null) { -// return null; -// } else { -// return new IconUIResource(new ImageIcon(url)); -// } -// } }