From: Mathieu Baudier Date: Fri, 20 May 2022 06:31:25 +0000 (+0200) Subject: Introduce CMS UX X-Git-Tag: v2.3.10~226 X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=596609d7076d57806adbe08db0f546a56ba868d1 Introduce CMS UX --- diff --git a/Makefile b/Makefile index 81140566b..d70823039 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,7 @@ org.argeo.api.acr \ org.argeo.api.cms \ org.argeo.cms \ org.argeo.cms.pgsql \ +org.argeo.cms.ux \ eclipse/org.argeo.cms.servlet \ eclipse/org.argeo.cms.swt \ eclipse/org.argeo.cms.e4 \ diff --git a/org.argeo.cms.ux/.classpath b/org.argeo.cms.ux/.classpath new file mode 100644 index 000000000..81fe078c2 --- /dev/null +++ b/org.argeo.cms.ux/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/org.argeo.cms.ux/.project b/org.argeo.cms.ux/.project new file mode 100644 index 000000000..a2f33e2c9 --- /dev/null +++ b/org.argeo.cms.ux/.project @@ -0,0 +1,28 @@ + + + org.argeo.cms.ux + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/org.argeo.cms.ux/bnd.bnd b/org.argeo.cms.ux/bnd.bnd new file mode 100644 index 000000000..e69de29bb diff --git a/org.argeo.cms.ux/build.properties b/org.argeo.cms.ux/build.properties new file mode 100644 index 000000000..34d2e4d2d --- /dev/null +++ b/org.argeo.cms.ux/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/org.argeo.cms.ux/src/org/argeo/cms/media/SvgToPng.java b/org.argeo.cms.ux/src/org/argeo/cms/media/SvgToPng.java new file mode 100644 index 000000000..eadefa593 --- /dev/null +++ b/org.argeo.cms.ux/src/org/argeo/cms/media/SvgToPng.java @@ -0,0 +1,64 @@ +package org.argeo.cms.media; + +import java.io.IOException; +import java.io.OutputStream; +import java.io.Reader; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; + +import org.apache.batik.transcoder.TranscoderException; +import org.apache.batik.transcoder.TranscoderInput; +import org.apache.batik.transcoder.TranscoderOutput; +import org.apache.batik.transcoder.image.ImageTranscoder; +import org.apache.batik.transcoder.image.PNGTranscoder; +import org.apache.commons.io.FilenameUtils; + +public class SvgToPng { + + public void convertSvgDir(Path sourceDir, Path targetDir, int width) { + System.out.println("##\n## " + width + "px - " + sourceDir+"\n##"); + try { + if (targetDir == null) + targetDir = sourceDir.getParent().resolve(Integer.toString(width)); + Files.createDirectories(targetDir); + + PNGTranscoder transcoder = new PNGTranscoder(); + // transcoder.addTranscodingHint(ImageTranscoder.KEY_BACKGROUND_COLOR, + // Color.WHITE); + transcoder.addTranscodingHint(PNGTranscoder.KEY_WIDTH, (float) width); + transcoder.addTranscodingHint(PNGTranscoder.KEY_HEIGHT, (float) width); + + for (Path source : Files.newDirectoryStream(sourceDir, "*.svg")) { + String baseName = FilenameUtils.getBaseName(source.toString()); + Path target = targetDir.resolve(baseName + ".png"); + convertSvgFile(transcoder, source, target); + } + } catch (IOException | TranscoderException e) { + throw new IllegalStateException("Cannot convert from " + sourceDir + " to " + targetDir, e); + } + + } + + protected void convertSvgFile(ImageTranscoder transcoder, Path source, Path target) + throws IOException, TranscoderException { + try (Reader reader = Files.newBufferedReader(source); OutputStream out = Files.newOutputStream(target);) { + TranscoderInput input = new TranscoderInput(reader); +// BufferedImage image = transcoder.createImage(32, 32); + TranscoderOutput output = new TranscoderOutput(out); + transcoder.transcode(input, output); + System.out.println(source.getFileName() + " -> " + target); + } + } + + public static void main(String[] args) throws Exception { + + Path path = Paths.get(args[0]); + + SvgToPng svgToPng = new SvgToPng(); + svgToPng.convertSvgDir(path, null, 16); + svgToPng.convertSvgDir(path, null, 32); + svgToPng.convertSvgDir(path, null, 64); + svgToPng.convertSvgDir(path, null, 96); + } +} diff --git a/org.argeo.cms/src/org/argeo/cms/media/SvgToPng.java b/org.argeo.cms/src/org/argeo/cms/media/SvgToPng.java deleted file mode 100644 index eadefa593..000000000 --- a/org.argeo.cms/src/org/argeo/cms/media/SvgToPng.java +++ /dev/null @@ -1,64 +0,0 @@ -package org.argeo.cms.media; - -import java.io.IOException; -import java.io.OutputStream; -import java.io.Reader; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; - -import org.apache.batik.transcoder.TranscoderException; -import org.apache.batik.transcoder.TranscoderInput; -import org.apache.batik.transcoder.TranscoderOutput; -import org.apache.batik.transcoder.image.ImageTranscoder; -import org.apache.batik.transcoder.image.PNGTranscoder; -import org.apache.commons.io.FilenameUtils; - -public class SvgToPng { - - public void convertSvgDir(Path sourceDir, Path targetDir, int width) { - System.out.println("##\n## " + width + "px - " + sourceDir+"\n##"); - try { - if (targetDir == null) - targetDir = sourceDir.getParent().resolve(Integer.toString(width)); - Files.createDirectories(targetDir); - - PNGTranscoder transcoder = new PNGTranscoder(); - // transcoder.addTranscodingHint(ImageTranscoder.KEY_BACKGROUND_COLOR, - // Color.WHITE); - transcoder.addTranscodingHint(PNGTranscoder.KEY_WIDTH, (float) width); - transcoder.addTranscodingHint(PNGTranscoder.KEY_HEIGHT, (float) width); - - for (Path source : Files.newDirectoryStream(sourceDir, "*.svg")) { - String baseName = FilenameUtils.getBaseName(source.toString()); - Path target = targetDir.resolve(baseName + ".png"); - convertSvgFile(transcoder, source, target); - } - } catch (IOException | TranscoderException e) { - throw new IllegalStateException("Cannot convert from " + sourceDir + " to " + targetDir, e); - } - - } - - protected void convertSvgFile(ImageTranscoder transcoder, Path source, Path target) - throws IOException, TranscoderException { - try (Reader reader = Files.newBufferedReader(source); OutputStream out = Files.newOutputStream(target);) { - TranscoderInput input = new TranscoderInput(reader); -// BufferedImage image = transcoder.createImage(32, 32); - TranscoderOutput output = new TranscoderOutput(out); - transcoder.transcode(input, output); - System.out.println(source.getFileName() + " -> " + target); - } - } - - public static void main(String[] args) throws Exception { - - Path path = Paths.get(args[0]); - - SvgToPng svgToPng = new SvgToPng(); - svgToPng.convertSvgDir(path, null, 16); - svgToPng.convertSvgDir(path, null, 32); - svgToPng.convertSvgDir(path, null, 64); - svgToPng.convertSvgDir(path, null, 96); - } -}