Author: alevkovsky Date: 2008-11-18 11:54:35 -0500 (Tue, 18 Nov 2008) New Revision: 11224 Added: trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/html/ trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/html/images/ trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/html/images/EdtorAdvancedThemeIcons.java trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/html/images/EdtorIcons.java trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/html/images/EdtorSimpleThemeIcons.java Removed: trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/richfaces/img/ trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/skins/richfaces/img/ Modified: trunk/sandbox/ui/editor/src/main/config/resources/resources-config.xml trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/richfaces/ui.xcss trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/skins/richfaces/ui.xcss Log: Editor: Implement skinnable icons drawing Modified: trunk/sandbox/ui/editor/src/main/config/resources/resources-config.xml =================================================================== --- trunk/sandbox/ui/editor/src/main/config/resources/resources-config.xml 2008-11-18 16:51:25 UTC (rev 11223) +++ trunk/sandbox/ui/editor/src/main/config/resources/resources-config.xml 2008-11-18 16:54:35 UTC (rev 11224) @@ -4738,9 +4738,8 @@ <name>scripts/tiny_mce/themes/advanced/skins/richfaces/ui.xcss</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/richfaces/ui.xcss</path> </resource> - <resource> - <name>scripts/tiny_mce/themes/advanced/skins/richfaces/img/button_bg.png</name> - <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/richfaces/img/button_bg.png</path> + <resource class="org.richfaces.renderkit.html.images.EdtorAdvancedThemeIcons"> + <name>org.richfaces.renderkit.html.images.EdtorAdvancedThemeIcons</name> </resource> <resource> <name>scripts/tiny_mce/themes/advanced/source_editor.htm</name> @@ -5039,9 +5038,8 @@ <name>scripts/tiny_mce/themes/simple/skins/richfaces/ui.xcss</name> <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/skins/richfaces/ui.xcss</path> </resource> - <resource> - <name>scripts/tiny_mce/themes/simple/skins/richfaces/img/button_bg.png</name> - <path>org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/skins/richfaces/img/button_bg.png</path> + <resource class="org.richfaces.renderkit.html.images.EdtorSimpleThemeIcons"> + <name>org.richfaces.renderkit.html.images.EdtorSimpleThemeIcons</name> </resource> <resource> <name>scripts/tiny_mce/tiny_mce.js</name> Added: trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/html/images/EdtorAdvancedThemeIcons.java =================================================================== --- trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/html/images/EdtorAdvancedThemeIcons.java (rev 0) +++ trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/html/images/EdtorAdvancedThemeIcons.java 2008-11-18 16:54:35 UTC (rev 11224) @@ -0,0 +1,96 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.richfaces.renderkit.html.images; + +import java.awt.Dimension; +import java.awt.Graphics2D; +import java.awt.RenderingHints; +import java.awt.image.BufferedImage; +import java.util.Date; + +import javax.faces.context.FacesContext; + +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.PngRenderer; +import org.ajax4jsf.resource.ResourceContext; + +/** + * @author Alexandr Levkovsky + * + */ +public class EdtorAdvancedThemeIcons extends EdtorIcons{ + + private Dimension dimension = new Dimension(88, 66); + + + public EdtorAdvancedThemeIcons() { + super(); + + setRenderer(new PngRenderer()); + setLastModified(new Date(InternetResourceBuilder.getInstance() + .getStartTime())); + } + + public Dimension getDimensions(FacesContext facesContext, Object data) { + return dimension; + } + + protected Dimension getDimensions(ResourceContext resourceContext) { + return dimension; + } + + /** + * + */ + @Override + public void paint(ResourceContext context, Graphics2D graphics) { + Object[] stored = (Object[]) restoreData(context); + if (stored != null) { + BufferedImage block1 = paintMainBlock(stored, false); + BufferedImage separator = paintSeparatorBlock(stored); + BufferedImage block2 = paintMainBlock(stored, true); + BufferedImage block3 = paintMainBlock(stored, true); + + BufferedImage firstTriangle1 = paintFirstTriangleBlock(stored, false); + BufferedImage firstTriangle2 = paintFirstTriangleBlock(stored, true); + BufferedImage firstTriangle3 = paintFirstTriangleBlock(stored, true); + + BufferedImage secondTriangle1 = paintSecondTriangleBlock(stored, false); + BufferedImage secondTriangle2 = paintSecondTriangleBlock(stored, true); + + graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC); + graphics.drawImage(block1, 0, 0, 22, 22, null); + graphics.drawImage(separator, 22, 0, 5, 22, null); + graphics.drawImage(block2, 0, 22, 22, 22, null); + graphics.drawImage(block3, 0, 44, 22, 22, null); + + graphics.drawImage(firstTriangle1, 44, 0, 11, 22, null); + graphics.drawImage(firstTriangle2, 44, 22, 11, 22, null); + graphics.drawImage(firstTriangle3, 44, 44, 11, 22, null); + + graphics.drawImage(secondTriangle1, 66, 0, 14, 22, null); + graphics.drawImage(secondTriangle2, 66, 22, 14, 22, null); + } + + } + +} Property changes on: trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/html/images/EdtorAdvancedThemeIcons.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/html/images/EdtorIcons.java =================================================================== --- trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/html/images/EdtorIcons.java (rev 0) +++ trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/html/images/EdtorIcons.java 2008-11-18 16:54:35 UTC (rev 11224) @@ -0,0 +1,312 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.richfaces.renderkit.html.images; + +import java.awt.BasicStroke; +import java.awt.Color; +import java.awt.GradientPaint; +import java.awt.Graphics2D; +import java.awt.Paint; +import java.awt.RenderingHints; +import java.awt.geom.Rectangle2D; +import java.awt.image.BufferedImage; +import java.util.Date; + +import javax.faces.context.FacesContext; + +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.Java2Dresource; +import org.ajax4jsf.resource.PngRenderer; +import org.ajax4jsf.util.HtmlColor; +import org.ajax4jsf.util.Zipper2; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; + +/** + * @author Alexandr Levkovsky + * + */ +public abstract class EdtorIcons extends Java2Dresource { + + private final String ADDITIONAL_BACKGROUND_COLOR = "additionalBackgroundColor"; + private final String SELECT_CONTROL_COLOR = "selectControlColor"; + private final String PANEL_BORDER_COLOR = "panelBorderColor"; + private final String GENERAL_TEXT_COLOR = "generalTextColor"; + + private final int SUB_BORDER_TRANSPARENCY = 100; + + public EdtorIcons() { + super(); + + setRenderer(new PngRenderer()); + setLastModified(new Date(InternetResourceBuilder.getInstance() + .getStartTime())); + } + + protected Object getDataToStore(FacesContext context, Object data) { + String additionalBackgroundColor = getSkinParameter(context, + ADDITIONAL_BACKGROUND_COLOR); + String selectControlColor = getSkinParameter(context, + SELECT_CONTROL_COLOR); + String panelBorderColor = getSkinParameter(context, PANEL_BORDER_COLOR); + String generalTextColor = getSkinParameter(context, GENERAL_TEXT_COLOR); + + byte[] ret = new byte[12]; + Zipper2 zipper2 = new Zipper2(ret); + zipper2.addColor(HtmlColor.decode(additionalBackgroundColor).getRGB()); + zipper2.addColor(HtmlColor.decode(selectControlColor).getRGB()); + zipper2.addColor(HtmlColor.decode(panelBorderColor).getRGB()); + zipper2.addColor(HtmlColor.decode(generalTextColor).getRGB()); + + return ret; + } + + protected Object deserializeData(byte[] objectArray) { + if (objectArray == null) { + return null; + } + + Object[] colors = new Object[5]; + Zipper2 z = new Zipper2(objectArray); + colors[0] = z.nextColor(); + colors[1] = z.nextColor(); + colors[2] = z.nextColor(); + colors[3] = z.nextColor(); + + return colors; + } + + private String getSkinParameter(FacesContext context, String parameterName) { + Skin skin = SkinFactory.getInstance().getSkin(context); + Skin defaultSkin = SkinFactory.getInstance().getDefaultSkin(context); + String value = (String) skin.getParameter(context, parameterName); + if (null == value || "".equals(value)) { + value = (String) defaultSkin.getParameter(context, parameterName); + } + return value; + + } + + protected BufferedImage paintMainBlock(Object[] colors, boolean selected) { + + int w = 22; + int h = 22; + + BufferedImage image = new BufferedImage(w, h, + BufferedImage.TYPE_INT_ARGB); + + Graphics2D g2d = prepareImage(image); + + Color additionalBackgroundColor = (Color) colors[0]; + Color selectControlColor = (Color) colors[1]; + Color panelBorderColor = (Color) colors[2]; + Color subBorderColorWithAlpha = new Color(255, 255, 255, + SUB_BORDER_TRANSPARENCY); + + // Draw body + Color contentColor; + if (selected) { + contentColor = selectControlColor; + } else { + contentColor = additionalBackgroundColor; + } + Paint gradient1 = new GradientPaint(w, h - 1, contentColor, 0, 1, + Color.white); + g2d.setPaint(gradient1); + Rectangle2D border = new Rectangle2D.Double(0, 1, w, h - 1); + g2d.fill(border); + + // Draw Border + g2d.setColor(panelBorderColor); + g2d.drawLine(0, 0, w, 0); + g2d.drawLine(0, h - 1, w, h - 1); + + // Draw subBorder + g2d.setColor(subBorderColorWithAlpha); + g2d.drawLine(0, 1, 0, h - 2); + g2d.drawLine(0, 1, w - 1, 1); + g2d.drawLine(w - 1, 1, w - 1, h - 2); + g2d.drawLine(0, h - 2, w - 1, h - 2); + + g2d.dispose(); + + return image; + } + + protected BufferedImage paintSeparatorBlock(Object[] colors) { + + int w = 5; + int h = 22; + + BufferedImage image = new BufferedImage(w, h, + BufferedImage.TYPE_INT_ARGB); + + Graphics2D g2d = prepareImage(image); + + Color additionalBackgroundColor = (Color) colors[0]; + Color panelBorderColor = (Color) colors[2]; + + // Draw body + g2d.setColor(additionalBackgroundColor); + Rectangle2D border = new Rectangle2D.Double(0, 0, w, h); + g2d.fill(border); + + // Draw Border + g2d.setColor(panelBorderColor); + g2d.drawLine(0, 1, 0, h - 2); + g2d.drawLine(w - 1, 1, w - 1, h - 2); + + return image; + } + + protected BufferedImage paintFirstTriangleBlock(Object[] colors, + boolean selected) { + + int w = 11; + int h = 22; + + BufferedImage image = new BufferedImage(w, h, + BufferedImage.TYPE_INT_ARGB); + + Graphics2D g2d = prepareImage(image); + + Color additionalBackgroundColor = (Color) colors[0]; + Color selectControlColor = (Color) colors[1]; + Color panelBorderColor = (Color) colors[2]; + Color generalTextColor = (Color) colors[3]; + Color subBorderColorWithAlpha = new Color(255, 255, 255, + SUB_BORDER_TRANSPARENCY); + + // Draw body + Color contentColor; + if (selected) { + contentColor = selectControlColor; + } else { + contentColor = additionalBackgroundColor; + } + Paint gradient1 = new GradientPaint(w, h - 1, contentColor, 0, 1, + Color.white); + g2d.setPaint(gradient1); + Rectangle2D border = new Rectangle2D.Double(0, 1, w, h - 1); + g2d.fill(border); + + // Draw Border + g2d.setColor(panelBorderColor); + g2d.drawLine(0, 0, w, 0); + g2d.drawLine(0, h - 1, w, h - 1); + + // Draw body + g2d.setColor(subBorderColorWithAlpha); + g2d.drawLine(0, 1, 0, h - 2); + g2d.drawLine(0, 1, w - 1, 1); + g2d.drawLine(w - 1, 1, w - 1, h - 2); + g2d.drawLine(0, h - 2, w - 1, h - 2); + + paintTriangle(g2d, 3, 10, generalTextColor, Color.WHITE, true); + + return image; + } + + private void paintTriangle(Graphics2D g2d, int x, int y, Color main, + Color shadow, boolean shadowNeeded) { + int w = 4; + if (shadowNeeded) { + g2d.setColor(shadow); + g2d.drawLine(x, y + 1, x + w, y + 1); + g2d.drawLine(x + 1, y + 2, x + w - 1, y + 2); + g2d.drawLine(x + 2, y + 3, x + 2, y + 3); + } + g2d.setColor(main); + g2d.drawLine(x, y, x + w, y); + g2d.drawLine(x + 1, y + 1, x + w - 1, y + 1); + g2d.drawLine(x + 2, y + 2, x + 2, y + 2); + + } + + protected BufferedImage paintSecondTriangleBlock(Object[] colors, + boolean selected) { + + int w = 14; + int h = 22; + + BufferedImage image = new BufferedImage(w, h, + BufferedImage.TYPE_INT_ARGB); + + Graphics2D g2d = prepareImage(image); + + Color additionalBackgroundColor = (Color) colors[0]; + Color selectControlColor = (Color) colors[1]; + Color panelBorderColor = (Color) colors[2]; + Color generalTextColor = (Color) colors[3]; + Color subBorderColorWithAlpha = new Color(255, 255, 255, + SUB_BORDER_TRANSPARENCY); + + // Draw body + Paint gradient1; + Color contentColor; + if (selected) { + contentColor = selectControlColor; + gradient1 = new GradientPaint(w - 2, h - 2, contentColor, 2, 2, + Color.white); + } else { + contentColor = additionalBackgroundColor; + gradient1 = new GradientPaint(w, h - 1, contentColor, 0, 1, + Color.white); + } + + g2d.setPaint(gradient1); + Rectangle2D border = new Rectangle2D.Double(1, 1, w - 1, h - 1); + g2d.fill(border); + + // Draw Border + g2d.setColor(panelBorderColor); + g2d.drawLine(0, 0, w, 0); + g2d.drawLine(0, h - 1, w, h - 1); + g2d.drawLine(0, 0, 0, h); + g2d.drawLine(w - 1, 0, w - 1, h); + + // Draw subBorder + g2d.setColor(subBorderColorWithAlpha); + g2d.drawLine(1, 1, 1, h - 2); + g2d.drawLine(1, 1, w - 2, 1); + g2d.drawLine(w - 2, 1, w - 2, h - 2); + g2d.drawLine(1, h - 2, w - 2, h - 2); + + paintTriangle(g2d, 4, 10, generalTextColor, Color.WHITE, true); + + return image; + } + + private Graphics2D prepareImage(BufferedImage image) { + + Graphics2D g2d = image.createGraphics(); + + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, + RenderingHints.VALUE_ANTIALIAS_ON); + g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, + RenderingHints.VALUE_COLOR_RENDER_QUALITY); + + g2d.setStroke(new BasicStroke(1)); + + return g2d; + } + +} Property changes on: trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/html/images/EdtorIcons.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Added: trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/html/images/EdtorSimpleThemeIcons.java =================================================================== --- trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/html/images/EdtorSimpleThemeIcons.java (rev 0) +++ trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/html/images/EdtorSimpleThemeIcons.java 2008-11-18 16:54:35 UTC (rev 11224) @@ -0,0 +1,82 @@ +/** + * License Agreement. + * + * JBoss RichFaces - Ajax4jsf Component Library + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +package org.richfaces.renderkit.html.images; + +import java.awt.Dimension; +import java.awt.Graphics2D; +import java.awt.RenderingHints; +import java.awt.image.BufferedImage; +import java.util.Date; + +import javax.faces.context.FacesContext; + +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.PngRenderer; +import org.ajax4jsf.resource.ResourceContext; + +/** + * @author Alexandr Levkovsky + * + */ +public class EdtorSimpleThemeIcons extends EdtorIcons{ + + private Dimension dimension = new Dimension(40, 66); + + + public EdtorSimpleThemeIcons() { + super(); + + setRenderer(new PngRenderer()); + setLastModified(new Date(InternetResourceBuilder.getInstance() + .getStartTime())); + } + + public Dimension getDimensions(FacesContext facesContext, Object data) { + return dimension; + } + + protected Dimension getDimensions(ResourceContext resourceContext) { + return dimension; + } + + /** + * + */ + @Override + public void paint(ResourceContext context, Graphics2D graphics) { + Object[] stored = (Object[]) restoreData(context); + if (stored != null) { + BufferedImage block1 = paintMainBlock(stored, false); + BufferedImage separator = paintSeparatorBlock(stored); + BufferedImage block2 = paintMainBlock(stored, true); + BufferedImage block3 = paintMainBlock(stored, true); + + graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC); + graphics.drawImage(block1, 0, 0, 22, 22, null); + graphics.drawImage(separator, 22, 0, 5, 22, null); + graphics.drawImage(block2, 0, 22, 22, 22, null); + graphics.drawImage(block3, 0, 44, 22, 22, null); + } + + } + +} Property changes on: trunk/sandbox/ui/editor/src/main/java/org/richfaces/renderkit/html/images/EdtorSimpleThemeIcons.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Modified: trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/richfaces/ui.xcss =================================================================== --- trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/richfaces/ui.xcss 2008-11-18 16:51:25 UTC (rev 11223) +++ trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/richfaces/ui.xcss 2008-11-18 16:54:35 UTC (rev 11224) @@ -205,14 +205,14 @@ <u:selector name=".richfacesSkin .mceToolbar .mceToolbarStart span"> <u:style name="background-image"> - <f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png"/> + <f:resource f:key="org.richfaces.renderkit.html.images.EdtorAdvancedThemeIcons"/> </u:style> <u:style name="background-position" value="-22px 0"/> </u:selector> <u:selector name=".richfacesSkin .mceToolbar .mceToolbarEnd span"> <u:style name="background-image"> - <f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png"/> + <f:resource f:key="org.richfaces.renderkit.html.images.EdtorAdvancedThemeIcons"/> </u:style> <u:style name="background-position" value="-22px 0"/> </u:selector> @@ -227,7 +227,7 @@ <u:selector name=".richfacesSkin .mceButton"> <u:style name="background-image"> - <f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png"/> + <f:resource f:key="org.richfaces.renderkit.html.images.EdtorAdvancedThemeIcons"/> </u:style> </u:selector> @@ -241,7 +241,7 @@ <u:selector name=".richfacesSkin .mceSeparator"> <u:style name="background-image"> - <f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png"/> + <f:resource f:key="org.richfaces.renderkit.html.images.EdtorAdvancedThemeIcons"/> </u:style> <u:style name="background-position" value="-22px 0"/> </u:selector> @@ -257,7 +257,7 @@ <u:selector name=".richfacesSkin .mceListBox .mceOpen"> <u:style name="background-image"> - <f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png"/> + <f:resource f:key="org.richfaces.renderkit.html.images.EdtorAdvancedThemeIcons"/> </u:style> <u:style name="background-position" value="-66px 0"/> </u:selector> @@ -280,7 +280,7 @@ <u:selector name=".richfacesSkin .mceSplitButton"> <u:style name="background-image"> - <f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png"/> + <f:resource f:key="org.richfaces.renderkit.html.images.EdtorAdvancedThemeIcons"/> </u:style> </u:selector> @@ -293,14 +293,14 @@ <u:selector name=".richfacesSkin .mceSplitButton span.mceOpen"> <u:style name="background-image"> - <f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png"/> + <f:resource f:key="org.richfaces.renderkit.html.images.EdtorAdvancedThemeIcons"/> </u:style> <u:style name="background-position" value="-44px 0"/> </u:selector> <u:selector name=".richfacesSkin table.mceSplitButtonEnabled:hover a.mceAction, .richfacesSkin .mceSplitButtonHover a.mceAction, .richfacesSkin .mceSplitButtonSelected"> <u:style name="background-image"> - <f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png"/> + <f:resource f:key="org.richfaces.renderkit.html.images.EdtorAdvancedThemeIcons"/> </u:style> <u:style name="background-position" value="0 -22px"/> </u:selector> Modified: trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/skins/richfaces/ui.xcss =================================================================== --- trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/skins/richfaces/ui.xcss 2008-11-18 16:51:25 UTC (rev 11223) +++ trunk/sandbox/ui/editor/src/main/resources/org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/skins/richfaces/ui.xcss 2008-11-18 16:54:35 UTC (rev 11224) @@ -48,7 +48,7 @@ <u:selector name=".richfacesSimpleSkin .mceToolbar .mceToolbarStart span"> <u:style name="background-image"> - <f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png"/> + <f:resource f:key="org.richfaces.renderkit.html.images.EdtorSimpleThemeIcons"/> </u:style> <u:style name="background-position" value="-22px 0"/> </u:selector> @@ -61,7 +61,7 @@ <u:selector name=".richfacesSimpleSkin .mceToolbar .mceToolbarEnd span"> <u:style name="background-image"> - <f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png"/> + <f:resource f:key="org.richfaces.renderkit.html.images.EdtorSimpleThemeIcons"/> </u:style> <u:style name="background-position" value="-22px 0"/> </u:selector> @@ -90,7 +90,7 @@ <u:selector name=".richfacesSimpleSkin .mceButton"> <u:style name="background-image"> - <f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png"/> + <f:resource f:key="org.richfaces.renderkit.html.images.EdtorSimpleThemeIcons"/> </u:style> </u:selector> @@ -117,7 +117,7 @@ <u:selector name=".richfacesSimpleSkin .mceSeparator"> <u:style name="background-image"> - <f:resource f:key="/org/richfaces/renderkit/html/scripts/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png"/> + <f:resource f:key="org.richfaces.renderkit.html.images.EdtorSimpleThemeIcons"/> </u:style> <u:style name="background-position" value="-22px 0"/> </u:selector>