IDEMPIERE-724 Zk: Make iDempiere theme more easily customizable. Use another approach to get client web logo image.
This commit is contained in:
parent
67e05752b8
commit
9d848f85c9
|
@ -13,10 +13,6 @@
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
package org.adempiere.webui.theme;
|
package org.adempiere.webui.theme;
|
||||||
|
|
||||||
import java.awt.Graphics2D;
|
|
||||||
import java.awt.Image;
|
|
||||||
import java.awt.image.BufferedImage;
|
|
||||||
import java.awt.image.RenderedImage;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
import org.adempiere.webui.AdempiereWebUI;
|
import org.adempiere.webui.AdempiereWebUI;
|
||||||
|
@ -25,7 +21,7 @@ import org.compiere.model.MImage;
|
||||||
import org.compiere.model.MSysConfig;
|
import org.compiere.model.MSysConfig;
|
||||||
import org.compiere.util.Env;
|
import org.compiere.util.Env;
|
||||||
import org.compiere.util.Util;
|
import org.compiere.util.Util;
|
||||||
import org.zkoss.image.Images;
|
import org.zkoss.image.AImage;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
@ -122,6 +118,9 @@ public final class ThemeManager {
|
||||||
MClientInfo cinfo = MClientInfo.get(Env.getCtx());
|
MClientInfo cinfo = MClientInfo.get(Env.getCtx());
|
||||||
if (cinfo.getLogoWeb_ID() > 0) {
|
if (cinfo.getLogoWeb_ID() > 0) {
|
||||||
MImage mImage = MImage.get(Env.getCtx(), cinfo.getLogoWeb_ID());
|
MImage mImage = MImage.get(Env.getCtx(), cinfo.getLogoWeb_ID());
|
||||||
|
return new AImage(mImage.getName(), mImage.getData());
|
||||||
|
|
||||||
|
/* Using different approach: ImageEncoder supports only PNG and JPEG
|
||||||
Image image = mImage.getImage();
|
Image image = mImage.getImage();
|
||||||
if (image instanceof RenderedImage) {
|
if (image instanceof RenderedImage) {
|
||||||
RenderedImage rImage = (RenderedImage)image;
|
RenderedImage rImage = (RenderedImage)image;
|
||||||
|
@ -139,6 +138,7 @@ public final class ThemeManager {
|
||||||
}
|
}
|
||||||
return Images.encode(name, rImage);
|
return Images.encode(name, rImage);
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
} else {
|
} else {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue