Author: solomax
Date: Wed Mar 29 10:16:42 2017
New Revision: 1789322
URL: http://svn.apache.org/viewvc?rev=1789322&view=rev
Log:
[OPENMEETINGS-551] basic work on office document support
Removed:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateSWF.java
openmeetings/application/trunk/openmeetings-web/src/main/webapp/upload/library.xml
openmeetings/application/trunk/openmeetings-web/src/main/webapp/upload/library.xsd
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboards.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/installation.xml
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/DownloadMenuItem.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js
openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
Wed Mar 29 10:16:42 2017
@@ -55,6 +55,7 @@ import org.springframework.beans.factory
public abstract class BaseConverter {
private static final Logger log =
Red5LoggerFactory.getLogger(BaseConverter.class, webAppRootKey);
private static final Pattern p = Pattern.compile("\\d{2,5}(x)\\d{2,5}");
+ public final static String EXEC_EXT =
System.getProperty("os.name").toUpperCase().indexOf("WINDOWS") < 0 ? "" :
".exe";
@Autowired
private ConfigurationDao configurationDao;
@@ -91,11 +92,11 @@ public abstract class BaseConverter {
}
protected String getPathToConvert() {
- return getPath(CONFIG_IMAGEMAGIC_PATH, "convert") +
GenerateSWF.execExt;
+ return getPath(CONFIG_IMAGEMAGIC_PATH, "convert") + EXEC_EXT;
}
protected String getPathToIdentify() {
- return getPath(CONFIG_IMAGEMAGIC_PATH, "identify") +
GenerateSWF.execExt;
+ return getPath(CONFIG_IMAGEMAGIC_PATH, "identify") + EXEC_EXT;
}
protected File getStreamFolder(Recording recording) {
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java
Wed Mar 29 10:16:42 2017
@@ -18,14 +18,13 @@
*/
package org.apache.openmeetings.core.converter;
-import static
org.apache.openmeetings.core.documents.CreateLibraryPresentation.generateXMLDocument;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_PDF;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.File;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
-import org.apache.openmeetings.db.entity.file.FileExplorerItem;
+import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.openmeetings.util.process.ConverterProcessResult;
import org.apache.openmeetings.util.process.ConverterProcessResultList;
import org.apache.wicket.util.string.Strings;
@@ -41,14 +40,12 @@ public class DocumentConverter {
private static final Logger log =
Red5LoggerFactory.getLogger(DocumentConverter.class, webAppRootKey);
@Autowired
- private GenerateSWF generateSWF;
- @Autowired
private ConfigurationDao configurationDao;
@Autowired
private ImageConverter imageConverter;
- public ConverterProcessResultList convertPDF(FileExplorerItem f, String
ext) throws Exception {
- ConverterProcessResultList errors = new
ConverterProcessResultList();
+ public ConverterProcessResultList convertPDF(FileItem f, String ext)
throws Exception {
+ ConverterProcessResultList list = new
ConverterProcessResultList();
boolean fullProcessing = !EXTENSION_PDF.equals(ext);
File original = f.getFile(ext);
@@ -56,16 +53,11 @@ public class DocumentConverter {
log.debug("fullProcessing: " + fullProcessing);
if (fullProcessing) {
log.debug("-- running JOD --");
- errors.addItem("processOpenOffice",
doJodConvert(original, pdf));
+ list.addItem("processOpenOffice",
doJodConvert(original, pdf));
}
- log.debug("-- generateBatchThumb --");
- errors.addItem("processThumb",
imageConverter.generateBatchThumb(pdf, pdf.getParentFile(), 80, "thumb"));
- File swf = f.getFile();
- errors.addItem("processSWF", generateSWF.generateSwf(pdf, swf));
-
- errors.addItem("processXML", generateXMLDocument(original,
fullProcessing ? pdf : null, swf));
- return errors;
+ log.debug("-- generate page images --");
+ return imageConverter.convertDocument(list, f, pdf);
}
/**
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
Wed Mar 29 10:16:42 2017
@@ -29,22 +29,16 @@ import java.nio.file.StandardCopyOption;
import java.util.ArrayList;
import java.util.List;
-import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
import org.apache.openmeetings.db.entity.file.FileItem.Type;
import org.apache.openmeetings.util.process.ConverterProcessResult;
import org.apache.openmeetings.util.process.ProcessHelper;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
public class FlvExplorerConverter extends BaseConverter {
private static final Logger log =
Red5LoggerFactory.getLogger(FlvExplorerConverter.class, webAppRootKey);
- // Spring loaded Beans
- @Autowired
- private FileExplorerItemDao fileDao;
-
public List<ConverterProcessResult> convertToMP4(FileExplorerItem f,
String ext) {
List<ConverterProcessResult> logs = new ArrayList<>();
try {
@@ -65,7 +59,7 @@ public class FlvExplorerConverter extend
, "-c:a", "libfdk_aac" //
, "-pix_fmt", "yuv420p" //
, mp4.getCanonicalPath() };
- ConverterProcessResult res =
ProcessHelper.executeScript("uploadVideo ID :: " + f.getId(), args);
+ ConverterProcessResult res =
ProcessHelper.executeScript("uploadVideo ID :: " + f.getHash(), args);
logs.add(res);
if (sameExt && tmp != null) {
if (res.isOk()) {
@@ -86,9 +80,7 @@ public class FlvExplorerConverter extend
"-f", "rawvideo", "-s", dim.width + "x"
+ dim.height,
jpeg.getCanonicalPath() };
- logs.add(ProcessHelper.executeScript("previewUpload ID
:: " + f.getId(), args));
-
- fileDao.update(f);
+ logs.add(ProcessHelper.executeScript("previewUpload ID
:: " + f.getHash(), args));
} catch (Exception err) {
log.error("[convertToFLV]", err);
logs.add(new ConverterProcessResult("convertToMP4",
err.getMessage(), err));
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
Wed Mar 29 10:16:42 2017
@@ -18,9 +18,13 @@
*/
package org.apache.openmeetings.core.converter;
+import static org.apache.openmeetings.util.OmFileHelper.DOC_PAGE_PREFIX;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
+import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_PNG;
import static
org.apache.openmeetings.util.OmFileHelper.getUploadProfilesUserDir;
import static org.apache.openmeetings.util.OmFileHelper.profileFileName;
+import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DOCUMENT_DPI;
+import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DOCUMENT_QUALITY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.File;
@@ -28,6 +32,7 @@ import java.io.FileFilter;
import java.io.IOException;
import org.apache.commons.io.FileUtils;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.openmeetings.db.entity.user.User;
@@ -41,9 +46,12 @@ import org.springframework.beans.factory
public class ImageConverter extends BaseConverter {
private static final Logger log =
Red5LoggerFactory.getLogger(ImageConverter.class, webAppRootKey);
+ private static final String PAGE_TMPLT = DOC_PAGE_PREFIX + "-%04d." +
EXTENSION_PNG;
@Autowired
private UserDao userDao;
+ @Autowired
+ private ConfigurationDao cfgDao;
public ConverterProcessResultList convertImage(FileItem f, String ext)
throws IOException {
ConverterProcessResultList returnMap = new
ConverterProcessResultList();
@@ -55,12 +63,7 @@ public class ImageConverter extends Base
log.debug("##### convertImage destinationFile: " + jpg);
returnMap.addItem("processJPG", convertSingleJpg(img,
jpg));
}
- ConverterProcessResult res = ProcessHelper.executeScript("get
image dimensions :: " + f.getId()
- , new String[] {getPathToIdentify(), "-format",
"%wx%h", jpg.getCanonicalPath()});
- returnMap.addItem("get JPG dimensions", res);
- Dimension dim = getDimension(res.getOut());
- f.setWidth(dim.width);
- f.setHeight(dim.height);
+ returnMap.addItem("get JPG dimensions", initSize(f, jpg));
return returnMap;
}
@@ -104,8 +107,35 @@ public class ImageConverter extends Base
return returnMap;
}
+ private String getDpi() {
+ return cfgDao.getConfValue(CONFIG_DOCUMENT_DPI, String.class,
"150"); //TODO constant
+ }
+
+ private String getQuality() {
+ return cfgDao.getConfValue(CONFIG_DOCUMENT_QUALITY,
String.class, "90"); //TODO constant
+ }
+
/**
- * -density 150 -resize 800
+ * This method determines and set image size
+ *
+ * @param f - file item to set size
+ * @param img - image file used to determine size
+ * @return result of the operation
+ * @throws IOException in case exception is occured
+ */
+ public ConverterProcessResult initSize(FileItem f, File img) throws
IOException {
+ ConverterProcessResult res = ProcessHelper.executeScript("get
image dimensions :: " + f.getId()
+ , new String[] {getPathToIdentify(), "-format",
"%wx%h", img.getCanonicalPath()});
+ Dimension dim = getDimension(res.getOut());
+ f.setWidth(dim.width);
+ f.setHeight(dim.height);
+ return res;
+ }
+
+ /**
+ * @param in - input file
+ * @param out - output file
+ * @return - conversion result
* @throws IOException
*
*/
@@ -120,26 +150,41 @@ public class ImageConverter extends Base
, "-resize", (width == null ? "" : width) +
(height == null ? "" : "x" + height)
, in.getCanonicalPath(), out.getCanonicalPath()
};
- return ProcessHelper.executeScript("GenerateImage::resize",
argv);
- }
-
- public ConverterProcessResult decodePDF(String inputfile, String
outputfile) {
- log.debug("decodePDF");
- String[] argv = new String[] { getPathToConvert(), inputfile,
outputfile };
-
- return ProcessHelper.executeScript("generateBatchThumbByWidth",
argv);
+ return ProcessHelper.executeScript("resize", argv);
}
- public ConverterProcessResult generateBatchThumb(File in, File outDir,
Integer thumbSize, String pre) throws IOException {
- log.debug("generateBatchThumbByWidth");
+ /**
+ * Converts PDF document to the series of images
+ *
+ * @param pdf - input PDF document
+ * @return - result of conversion
+ * @throws IOException in case IO exception occured
+ */
+ public ConverterProcessResultList
convertDocument(ConverterProcessResultList list, FileItem f, File pdf) throws
IOException {
+ log.debug("convertDocument");
String[] argv = new String[] {
getPathToConvert()
- , "-thumbnail" // FIXME
- , "" + thumbSize
- , in.getCanonicalPath()
- , new File(outDir, "_" + pre +
"_page-%04d.jpg").getCanonicalPath()
+ , "-density", getDpi()
+ , pdf.getCanonicalPath()
+ , "-quality", getQuality()
+ , new File(pdf.getParentFile(),
PAGE_TMPLT).getCanonicalPath()
};
-
- return ProcessHelper.executeScript("generateBatchThumbByWidth",
argv);
+ ConverterProcessResult res =
ProcessHelper.executeScript("convertDocument", argv);
+ list.addItem("convert PDF to images", res);
+ if (res.isOk()) {
+ File[] pages = pdf.getParentFile().listFiles(new
FileFilter() {
+ @Override
+ public boolean accept(File f) {
+ return f.isFile() &&
f.getName().startsWith(DOC_PAGE_PREFIX) && f.getName().endsWith(EXTENSION_PNG);
+ }
+ });
+ if (pages == null || pages.length == 0) {
+ f.setCount(0);
+ } else {
+ f.setCount(pages.length);
+ }
+ list.addItem("get PNG page dimensions", initSize(f,
pages[0]));
+ }
+ return list;
}
}
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
Wed Mar 29 10:16:42 2017
@@ -94,9 +94,6 @@ public class FileProcessor {
}
f.setHash(hash);
- f = fileDao.update(f);
- log.debug("fileId: " + f.getId());
-
File file = f.getFile(ext);
log.debug("writing file to: " + file);
if (!file.getParentFile().exists() &&
!file.getParentFile().mkdirs()) {
@@ -108,7 +105,7 @@ public class FileProcessor {
log.debug("canBeConverted: " + canBeConverted);
if (canBeConverted || isPdf) {
- // convert to pdf, thumbs, swf and xml-description
+ // convert to pdf and images
returnError = generatePDF.convertPDF(f, ext);
} else if (isChart) {
log.debug("uploaded chart file");
@@ -124,6 +121,8 @@ public class FileProcessor {
returnError.addItem("processVideo " + i++,
returnMap);
}
}
+ f = fileDao.update(f);
+ log.debug("fileId: " + f.getId());
// has to happen at the end, otherwise it will be overwritten
//cause the variable is new initialized
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileExplorerItemDao.java
Wed Mar 29 10:16:42 2017
@@ -18,8 +18,6 @@
*/
package org.apache.openmeetings.db.dao.file;
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
-import static org.apache.openmeetings.util.OmFileHelper.thumbImagePrefix;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.File;
@@ -302,26 +300,19 @@ public class FileExplorerItemDao {
try {
if (f.exists()) {
File base = OmFileHelper.getUploadFilesDir();
- if (Type.Image == f.getType()) {
- size += f.getFile().length();
- File thumbFile = new File(base,
String.format("%s%s.%s", thumbImagePrefix, f.getHash(), EXTENSION_JPG));
- if (thumbFile.exists()) {
- size += thumbFile.length();
- }
- }
- if (Type.Presentation == f.getType()) {
- File tFolder = new File(base,
f.getHash());
-
- if (tFolder.exists()) {
- size +=
OmFileHelper.getSize(tFolder);
- }
- }
- if (Type.Video == f.getType()) {
- size += f.getFile().length();
- File thumb = f.getFile(EXTENSION_JPG);
- if (thumb.exists()) {
- size += thumb.length();
- }
+ switch (f.getType()) {
+ case Image:
+ case Presentation:
+ case Video:
+ File tFolder = new File(base,
f.getHash());
+
+ if (tFolder.exists()) {
+ size +=
OmFileHelper.getSize(tFolder);
+ }
+ break;
+ default:
+ // TODO check other types
+ break;
}
}
if (Type.Folder == f.getType()) {
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboards.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboards.java?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboards.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboards.java
Wed Mar 29 10:16:42 2017
@@ -28,6 +28,7 @@ public class Whiteboards {
private final String uid = UUID.randomUUID().toString();
private Map<Long, Whiteboard> whiteboards = new ConcurrentHashMap<>();
private volatile AtomicLong whiteboardId = new AtomicLong(0);
+ private volatile AtomicLong activeWb = new AtomicLong(0);
public Whiteboards() {}
@@ -68,4 +69,12 @@ public class Whiteboards {
public String getUid() {
return uid;
}
+
+ public long getActiveWb() {
+ return activeWb.get();
+ }
+
+ public void setActiveWb(long wbId) {
+ activeWb.set(wbId);
+ }
}
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
Wed Mar 29 10:16:42 2017
@@ -18,9 +18,10 @@
*/
package org.apache.openmeetings.db.entity.file;
+import static org.apache.openmeetings.util.OmFileHelper.DOC_PAGE_PREFIX;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_SWF;
+import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_PNG;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_WML;
import static org.apache.openmeetings.util.OmFileHelper.getStreamsHibernateDir;
import static org.apache.openmeetings.util.OmFileHelper.getUploadFilesDir;
@@ -88,11 +89,11 @@ public abstract class FileItem implement
@Element(data = true)
private boolean deleted;
- @Column(name = "flv_width")
+ @Column(name = "width")
@Element(data = true, required = false)
private Integer width;
- @Column(name = "flv_height")
+ @Column(name = "height")
@Element(data = true, required = false)
private Integer height;
@@ -105,6 +106,10 @@ public abstract class FileItem implement
@Element(data = true, required = false)
private Long groupId;
+ @Column(name = "page_count", nullable = false)
+ @Element(data = true, required = false)
+ private int count = 1;
+
// Not Mapped
@Transient
private List<FileItemLog> log;
@@ -232,6 +237,14 @@ public abstract class FileItem implement
this.groupId = groupId;
}
+ public int getCount() {
+ return count;
+ }
+
+ public void setCount(int count) {
+ this.count = count;
+ }
+
public boolean isReadOnly() {
return readOnly;
}
@@ -258,7 +271,14 @@ public abstract class FileItem implement
f = new File(d, String.format("%s.%s",
getHash(), ext == null ? EXTENSION_MP4 : ext));
break;
case Presentation:
- f = new File(d, String.format("%s.%s",
getHash(), ext == null ? EXTENSION_SWF : ext));
+ int slide = 0;
+ try {
+ slide = Integer.parseInt(ext);
+ } catch (Exception e) {
+ //no-op
+ }
+ //ext is used for slide here
+ f = new File(d,
String.format("%1$s-%2$04d.%3$s", DOC_PAGE_PREFIX, slide, EXTENSION_PNG));
break;
case PollChart:
case Folder:
Modified:
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
(original)
+++
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
Wed Mar 29 10:16:42 2017
@@ -32,6 +32,8 @@ import static org.apache.openmeetings.ut
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANDING_ZONE;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG_KEY;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LDAP_ID;
+import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DOCUMENT_DPI;
+import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DOCUMENT_QUALITY;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FRONTEND_REGISTER_KEY;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_GOOGLE_ANALYTICS_CODE;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_IGNORE_BAD_SSL;
@@ -236,13 +238,11 @@ public class ImportInitvalues {
// "1" == "EN"
cfgDao.add(CONFIG_DEFAULT_LANG_KEY, cfg.defaultLangId, null,
"Default System Language ID see languages.xml");
- cfgDao.add("swftools_zoom", "" + cfg.swfZoom, null,
- "dpi for conversion of PDF to SWF (should be an
integer between 50 and 600 with a default value of 100 dpi)");
+ cfgDao.add(CONFIG_DOCUMENT_DPI, "" + cfg.docDpi, null,
+ "dpi for conversion of PDF to images (should be
an integer between 50 and 600 with a default value of 150 dpi)");
- cfgDao.add("swftools_jpegquality", "" + cfg.swfJpegQuality,
null,
- "compression quality for conversion of PDF to
SWF (should be an integer between 1 and 100, with a default value of 85)");
-
- cfgDao.add("swftools_path", cfg.swfPath, null, "Path To
SWF-Tools");
+ cfgDao.add(CONFIG_DOCUMENT_QUALITY, "" + cfg.docQuality, null,
+ "compression quality for conversion of PDF to
images (should be an integer between 1 and 100, with a default value of 90)");
cfgDao.add(CONFIG_IMAGEMAGIC_PATH, cfg.imageMagicPath, null,
"Path to ImageMagick tools");
Modified:
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java
(original)
+++
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java
Wed Mar 29 10:16:42 2017
@@ -46,9 +46,8 @@ public class InstallationConfig implemen
public String mailReferer = "[email protected]";
public String mailUseTls = "0";
//paths
- public Integer swfZoom = 100;
- public Integer swfJpegQuality = 85;
- public String swfPath = "";
+ public Integer docDpi = 150;
+ public Integer docQuality = 90;
public String imageMagicPath = "";
public String ffmpegPath = "";
public String soxPath = "";
@@ -82,8 +81,8 @@ public class InstallationConfig implemen
+ ", smtpPort=" + smtpPort + ", smtpServer=" +
smtpServer
+ ", mailAuthName=" + mailAuthName + ",
mailAuthPass="
+ mailAuthPass + ", mailReferer=" + mailReferer
- + ", mailUseTls=" + mailUseTls + ", swfZoom=" +
swfZoom
- + ", swfJpegQuality=" + swfJpegQuality + ",
swfPath=" + swfPath
+ + ", mailUseTls=" + mailUseTls + ", docDpi=" +
docDpi
+ + ", docQuality=" + docQuality
+ ", imageMagicPath=" + imageMagicPath + ",
ffmpegPath="
+ ffmpegPath + ", soxPath=" + soxPath
+ ", defaultLangId=" + defaultLangId + ",
sendEmailAtRegister="
@@ -94,7 +93,7 @@ public class InstallationConfig implemen
+ red5SipEnable + ", red5SipRoomPrefix=" +
red5SipRoomPrefix
+ ", red5SipExtenContext=" + red5SipExtenContext
+ ", replyToOrganizer=" + replyToOrganizer
- + ", ical_timeZone=" + ical_timeZone
+ + ", ical_timeZone=" + ical_timeZone
+ "]";
}
}
Modified:
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml
(original)
+++
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/GeneralConfiguration.xml
Wed Mar 29 10:16:42 2017
@@ -200,16 +200,16 @@
<td> 2.1.x </td>
</tr>
<tr>
- <td> swftools_zoom </td>
- <td> 100 </td>
- <td> DPI for conversion of PDF to SWF
(should be an integer between 50 and 600 with a default value of 100 DPI) </td>
- <td> 2.0.x </td>
+ <td> document.dpi </td>
+ <td> 150 </td>
+ <td> DPI for conversion of PDF to
images (should be an integer between 50 and 600 with a default value of 150
DPI) </td>
+ <td> 4.0.x </td>
</tr>
<tr>
- <td> swftools_jpegquality </td>
- <td> 85 </td>
- <td> Compression quality for conversion
of PDF to SWF (should be an integer between 1 and 100, with a default value of
85) </td>
- <td> 2.0.x </td>
+ <td> document.quality </td>
+ <td> 90 </td>
+ <td> Compression quality for conversion
of PDF to images (should be an integer between 1 and 100, with a default value
of 90) </td>
+ <td> 4.0.x </td>
</tr>
<tr>
<td> sendEmailAtRegister </td>
Modified:
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/installation.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/xdoc/installation.xml?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/installation.xml
(original)
+++
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/installation.xml
Wed Mar 29 10:16:42 2017
@@ -101,25 +101,6 @@
your
favorite
package managers (apt-get it).
</li>
- <li>
- Install
- <b>SWFTools</b>
- on the server,
you can get more information
- on
- <a
href="http://www.swftools.org/"; target="_blank"
rel="nofollow">http://www.swftools.org/
- </a>
- regarding
installation. Some of the
- Linux
distributions already
- have it in
there package manager (see
- <a
href="http://packages.debian.org/unstable/utils/swftools";
-
target="_blank"
rel="nofollow">http://packages.debian.org/unstable/utils/swftools
- </a>
- ), the
- recommended
version of SWFTools is 0.9 as prior version
- have a
- bug that does
lead to wrong object dimensions at
- whiteboard
- </li>
</ul>
</div>
</li>
@@ -267,7 +248,7 @@
</li>
<li>If you have Problems with conversion-jobs
check your openmeetings log
output (available at
<tt>$RED5_HOME/log/openmeetings.log</tt>). There will be error Messages which
help you. You must
- install OpenOffice, ImageMagick,
GhostScript and SWFTools to run
+ install OpenOffice, ImageMagick and
GhostScript to run
all conversion-Jobs correctly.
</li>
<li>
Modified:
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
(original)
+++
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
Wed Mar 29 10:16:42 2017
@@ -59,13 +59,14 @@ public class OmFileHelper {
public static final String recordingFileName = "flvRecording_";
public static final String profileImagePrefix = "_profile_";
public static final String thumbImagePrefix = "_thumb_";
+ public static final String DOC_PAGE_PREFIX = "page";
public static final String TEST_SETUP_PREFIX = "TEST_SETUP_";
public static final String dashboardFile = "dashboard.xml";
public static final String EXTENSION_WML = "wml";
public static final String EXTENSION_FLV = "flv";
public static final String EXTENSION_MP4 = "mp4";
public static final String EXTENSION_JPG = "jpg";
- public static final String EXTENSION_SWF = "swf";
+ public static final String EXTENSION_PNG = "png";
public static final String EXTENSION_PDF = "pdf";
public static final String WB_VIDEO_FILE_PREFIX = "UPLOADFLV_";
public static final String MP4_MIME_TYPE = "video/" + EXTENSION_MP4;
Modified:
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
(original)
+++
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
Wed Mar 29 10:16:42 2017
@@ -49,6 +49,8 @@ public class OpenmeetingsVariables {
public static final String CONFIG_GOOGLE_ANALYTICS_CODE =
"google.analytics.code";
public static final String CONFIG_SYSTEM_EMAIL = "system_email_addr";
public static final String CONFIG_IMAGEMAGIC_PATH = "imagemagick_path";
+ public static final String CONFIG_DOCUMENT_DPI = "document.dpi";
+ public static final String CONFIG_DOCUMENT_QUALITY = "document.quality";
public static final String MENU_ROOMS_NAME = "Conference Rooms";
public static final int RECENT_ROOMS_COUNT = 5;
public static final int LEVEL_USER = 1;
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
Wed Mar 29 10:16:42 2017
@@ -22,7 +22,6 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.web.app.Application.getBean;
import java.io.File;
-import java.nio.file.Path;
import java.text.DecimalFormat;
import java.util.Date;
@@ -34,11 +33,11 @@ import org.apache.openmeetings.util.Cale
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.web.admin.AdminPanel;
import org.apache.openmeetings.web.app.Application;
+import org.apache.openmeetings.web.util.AjaxDownload;
import org.apache.openmeetings.web.util.upload.BootstrapFileUploadBehavior;
import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;
-import org.apache.wicket.extensions.ajax.AjaxDownload;
import
org.apache.wicket.extensions.ajax.markup.html.form.upload.UploadProgressBar;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.CheckBox;
@@ -46,8 +45,8 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.upload.FileUpload;
import org.apache.wicket.markup.html.form.upload.FileUploadField;
import org.apache.wicket.model.Model;
-import org.apache.wicket.resource.FileSystemResource;
import org.apache.wicket.util.lang.Bytes;
+import org.apache.wicket.util.resource.FileResourceStream;
import org.apache.wicket.util.time.Duration;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -107,14 +106,7 @@ public class BackupPanel extends AdminPa
setMaxSize(Bytes.bytes(maxBytes));
// Add a component to download a file without page
refresh
- final AjaxDownload download = new AjaxDownload(new
FileSystemResource() {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected ResourceResponse
createResourceResponse(Path path) {
- return
super.createResourceResponse(backupFile.toPath());
- }
- });
+ final AjaxDownload download = new AjaxDownload();
add(download);
// add an download button
add(new AjaxButton("download", this) {
@@ -174,6 +166,8 @@ public class BackupPanel extends AdminPa
timer.stop(target);
target.add(progressBar.setVisible(false));
+
download.setFileName(backupFile.getName());
+ download.setResourceStream(new
FileResourceStream(backupFile));
download.initiate(target);
}
}).setVisible(false).setOutputMarkupPlaceholderTag(true));
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
Wed Mar 29 10:16:42 2017
@@ -1629,17 +1629,6 @@
found there, however on most linux
systems you can get it via your
favorite package managers (apt-get it).
</li>
- <li>Install <strong>SWFTools</strong> on the
server, you can get
- more information on <a target="_blank"
- href="http://www.swftools.org/";
rel="nofollow">http://www.swftools.org/</a>
- regarding installation. Some of the
Linux distributions already have
- it in there package manager see <a
target="_blank"
-
href="http://packages.debian.org/unstable/utils/swftools";
-
rel="nofollow">http://packages.debian.org/unstable/utils/swftools</a>),
- the recommended version of
<strong>SWFTools</strong> is 0.9 as prior
- version have a bug that does lead to
wrong object dimensions in the
- Whiteboard
- </li>
</ul>
</li>
</ol>
@@ -1740,15 +1729,12 @@
<entry key="install.wizard.params.step3.converters">Converters</entry>
<entry key="install.wizard.params.step3.seeAlso"> see also</entry>
<entry
key="install.wizard.params.step3.installation">Installation</entry>
- <entry key="install.wizard.params.step3.swfZoom">SWFTools Zoom</entry>
- <entry key="install.wizard.params.step3.swfZoom.title">Enter the dpi
that swftools will use for PDF to SWF conversion</entry>
- <entry key="install.wizard.params.step3.swfZoom.text">DPI that swftools
will use for PDF to SWF conversion (default is 100)</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality">SWFTools JPEG
Quality</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.title">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
- <entry key="install.wizard.params.step3.swfPath">SWFTools Path</entry>
- <entry key="install.wizard.params.step3.swfPath.title">Enter the path
to swftools for example C:/swftools (Windows) or leave blank if swftools is a
known to your system path</entry>
- <entry key="install.wizard.params.step3.swfPath.text">You can test if
swftools is installed into system path by opening a shell or cmd-prompt and
type pdf2swf If this shows a list of options leave this field blank otherwise
you have to specify the path to pdf2swf on your system</entry>
+ <entry key="install.wizard.params.step3.docDpi">Document conversion
DPI</entry>
+ <entry key="install.wizard.params.step3.docDpi.title">Enter the dpi
that ImageMagic will use for PDF to image conversion</entry>
+ <entry key="install.wizard.params.step3.docDpi.text">DPI that
ImageMagic will use for PDF to image conversion (default is 150)</entry>
+ <entry key="install.wizard.params.step3.docQuality">Document conversion
JPEG Quality</entry>
+ <entry key="install.wizard.params.step3.docQuality.title">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:90)</entry>
+ <entry key="install.wizard.params.step3.docQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:90)</entry>
<entry key="install.wizard.params.step3.imageMagicPath">ImageMagick
Path</entry>
<entry key="install.wizard.params.step3.imageMagicPath.title">Enter the
path to ImageMagick, leave blank if ImageMagick is successfully installed to
system-path</entry>
<entry
key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install
ImageMagick on the server, you can get more information on
http://www.imagemagick.org regarding installation. The instructions for
installation can be found there
http://www.imagemagick.org/script/binary-releases.php, however on most linux
systems you can get it via your favorite package managers (apt-get
it)]]></entry>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
Wed Mar 29 10:16:42 2017
@@ -1629,17 +1629,6 @@
found there, however on most linux
systems you can get it via your
favorite package managers (apt-get it).
</li>
- <li>Install <strong>SWFTools</strong> on the
server, you can get
- more information on <a target="_blank"
- href="http://www.swftools.org/";
rel="nofollow">http://www.swftools.org/</a>
- regarding installation. Some of the
Linux distributions already have
- it in there package manager see <a
target="_blank"
-
href="http://packages.debian.org/unstable/utils/swftools";
-
rel="nofollow">http://packages.debian.org/unstable/utils/swftools</a>),
- the recommended version of
<strong>SWFTools</strong> is 0.9 as prior
- version have a bug that does lead to
wrong object dimensions in the
- Whiteboard
- </li>
</ul>
</li>
</ol>
@@ -1740,15 +1729,12 @@
<entry key="install.wizard.params.step3.converters">Converters</entry>
<entry key="install.wizard.params.step3.seeAlso"> see also</entry>
<entry
key="install.wizard.params.step3.installation">Installation</entry>
- <entry key="install.wizard.params.step3.swfZoom">SWFTools Zoom</entry>
- <entry key="install.wizard.params.step3.swfZoom.title">Enter the dpi
that swftools will use for PDF to SWF conversion</entry>
- <entry key="install.wizard.params.step3.swfZoom.text">DPI that swftools
will use for PDF to SWF conversion (default is 100)</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality">SWFTools JPEG
Quality</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.title">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
- <entry key="install.wizard.params.step3.swfPath">SWFTools Path</entry>
- <entry key="install.wizard.params.step3.swfPath.title">Enter the path
to swftools for example C:/swftools (Windows) or leave blank if swftools is a
known to your system path</entry>
- <entry key="install.wizard.params.step3.swfPath.text">You can test if
swftools is installed into system path by opening a shell or cmd-prompt and
type pdf2swf If this shows a list of options leave this field blank otherwise
you have to specify the path to pdf2swf on your system</entry>
+ <entry key="install.wizard.params.step3.docDpi">Document conversion
DPI</entry>
+ <entry key="install.wizard.params.step3.docDpi.title">Enter the dpi
that ImageMagic will use for PDF to image conversion</entry>
+ <entry key="install.wizard.params.step3.docDpi.text">DPI that
ImageMagic will use for PDF to image conversion (default is 150)</entry>
+ <entry key="install.wizard.params.step3.docQuality">Document conversion
JPEG Quality</entry>
+ <entry key="install.wizard.params.step3.docQuality.title">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:90)</entry>
+ <entry key="install.wizard.params.step3.docQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:90)</entry>
<entry key="install.wizard.params.step3.imageMagicPath">ImageMagick
Path</entry>
<entry key="install.wizard.params.step3.imageMagicPath.title">Enter the
path to ImageMagick, leave blank if ImageMagick is successfully installed to
system-path</entry>
<entry
key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install
ImageMagick on the server, you can get more information on
http://www.imagemagick.org regarding installation. The instructions for
installation can be found there
http://www.imagemagick.org/script/binary-releases.php, however on most linux
systems you can get it via your favorite package managers (apt-get
it)]]></entry>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
Wed Mar 29 10:16:42 2017
@@ -1629,17 +1629,6 @@
found there, however on most linux
systems you can get it via your
favorite package managers (apt-get it).
</li>
- <li>Install <strong>SWFTools</strong> on the
server, you can get
- more information on <a target="_blank"
- href="http://www.swftools.org/";
rel="nofollow">http://www.swftools.org/</a>
- regarding installation. Some of the
Linux distributions already have
- it in there package manager see <a
target="_blank"
-
href="http://packages.debian.org/unstable/utils/swftools";
-
rel="nofollow">http://packages.debian.org/unstable/utils/swftools</a>),
- the recommended version of
<strong>SWFTools</strong> is 0.9 as prior
- version have a bug that does lead to
wrong object dimensions in the
- Whiteboard
- </li>
</ul>
</li>
</ol>
@@ -1740,15 +1729,12 @@
<entry key="install.wizard.params.step3.converters">Converters</entry>
<entry key="install.wizard.params.step3.seeAlso"> see also</entry>
<entry
key="install.wizard.params.step3.installation">Installation</entry>
- <entry key="install.wizard.params.step3.swfZoom">SWFTools Zoom</entry>
- <entry key="install.wizard.params.step3.swfZoom.title">Enter the dpi
that swftools will use for PDF to SWF conversion</entry>
- <entry key="install.wizard.params.step3.swfZoom.text">DPI that swftools
will use for PDF to SWF conversion (default is 100)</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality">SWFTools JPEG
Quality</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.title">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
- <entry key="install.wizard.params.step3.swfPath">SWFTools Path</entry>
- <entry key="install.wizard.params.step3.swfPath.title">Enter the path
to swftools for example C:/swftools (Windows) or leave blank if swftools is a
known to your system path</entry>
- <entry key="install.wizard.params.step3.swfPath.text">You can test if
swftools is installed into system path by opening a shell or cmd-prompt and
type pdf2swf If this shows a list of options leave this field blank otherwise
you have to specify the path to pdf2swf on your system</entry>
+ <entry key="install.wizard.params.step3.docDpi">Document conversion
DPI</entry>
+ <entry key="install.wizard.params.step3.docDpi.title">Enter the dpi
that ImageMagic will use for PDF to image conversion</entry>
+ <entry key="install.wizard.params.step3.docDpi.text">DPI that
ImageMagic will use for PDF to image conversion (default is 150)</entry>
+ <entry key="install.wizard.params.step3.docQuality">Document conversion
JPEG Quality</entry>
+ <entry key="install.wizard.params.step3.docQuality.title">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:90)</entry>
+ <entry key="install.wizard.params.step3.docQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:90)</entry>
<entry key="install.wizard.params.step3.imageMagicPath">ImageMagick
Path</entry>
<entry key="install.wizard.params.step3.imageMagicPath.title">Enter the
path to ImageMagick, leave blank if ImageMagick is successfully installed to
system-path</entry>
<entry
key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install
ImageMagick on the server, you can get more information on
http://www.imagemagick.org regarding installation. The instructions for
installation can be found there
http://www.imagemagick.org/script/binary-releases.php, however on most linux
systems you can get it via your favorite package managers (apt-get
it)]]></entry>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
Wed Mar 29 10:16:42 2017
@@ -1629,17 +1629,6 @@
found there, however on most linux
systems you can get it via your
favorite package managers (apt-get it).
</li>
- <li>Install <strong>SWFTools</strong> on the
server, you can get
- more information on <a target="_blank"
- href="http://www.swftools.org/";
rel="nofollow">http://www.swftools.org/</a>
- regarding installation. Some of the
Linux distributions already have
- it in there package manager see <a
target="_blank"
-
href="http://packages.debian.org/unstable/utils/swftools";
-
rel="nofollow">http://packages.debian.org/unstable/utils/swftools</a>),
- the recommended version of
<strong>SWFTools</strong> is 0.9 as prior
- version have a bug that does lead to
wrong object dimensions in the
- Whiteboard
- </li>
</ul>
</li>
</ol>
@@ -1740,15 +1729,12 @@
<entry key="install.wizard.params.step3.converters">Converters</entry>
<entry key="install.wizard.params.step3.seeAlso"> see also</entry>
<entry
key="install.wizard.params.step3.installation">Installation</entry>
- <entry key="install.wizard.params.step3.swfZoom">SWFTools Zoom</entry>
- <entry key="install.wizard.params.step3.swfZoom.title">Enter the dpi
that swftools will use for PDF to SWF conversion</entry>
- <entry key="install.wizard.params.step3.swfZoom.text">DPI that swftools
will use for PDF to SWF conversion (default is 100)</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality">SWFTools JPEG
Quality</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.title">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
- <entry key="install.wizard.params.step3.swfPath">SWFTools Path</entry>
- <entry key="install.wizard.params.step3.swfPath.title">Enter the path
to swftools for example C:/swftools (Windows) or leave blank if swftools is a
known to your system path</entry>
- <entry key="install.wizard.params.step3.swfPath.text">You can test if
swftools is installed into system path by opening a shell or cmd-prompt and
type pdf2swf If this shows a list of options leave this field blank otherwise
you have to specify the path to pdf2swf on your system</entry>
+ <entry key="install.wizard.params.step3.docDpi">Document conversion
DPI</entry>
+ <entry key="install.wizard.params.step3.docDpi.title">Enter the dpi
that ImageMagic will use for PDF to image conversion</entry>
+ <entry key="install.wizard.params.step3.docDpi.text">DPI that
ImageMagic will use for PDF to image conversion (default is 150)</entry>
+ <entry key="install.wizard.params.step3.docQuality">Document conversion
JPEG Quality</entry>
+ <entry key="install.wizard.params.step3.docQuality.title">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:90)</entry>
+ <entry key="install.wizard.params.step3.docQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:90)</entry>
<entry key="install.wizard.params.step3.imageMagicPath">ImageMagick
Path</entry>
<entry key="install.wizard.params.step3.imageMagicPath.title">Enter the
path to ImageMagick, leave blank if ImageMagick is successfully installed to
system-path</entry>
<entry
key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install
ImageMagick on the server, you can get more information on
http://www.imagemagick.org regarding installation. The instructions for
installation can be found there
http://www.imagemagick.org/script/binary-releases.php, however on most linux
systems you can get it via your favorite package managers (apt-get
it)]]></entry>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
Wed Mar 29 10:16:42 2017
@@ -1629,17 +1629,6 @@
found there, however on most linux
systems you can get it via your
favorite package managers (apt-get it).
</li>
- <li>Install <strong>SWFTools</strong> on the
server, you can get
- more information on <a target="_blank"
- href="http://www.swftools.org/";
rel="nofollow">http://www.swftools.org/</a>
- regarding installation. Some of the
Linux distributions already have
- it in there package manager see <a
target="_blank"
-
href="http://packages.debian.org/unstable/utils/swftools";
-
rel="nofollow">http://packages.debian.org/unstable/utils/swftools</a>),
- the recommended version of
<strong>SWFTools</strong> is 0.9 as prior
- version have a bug that does lead to
wrong object dimensions in the
- Whiteboard
- </li>
</ul>
</li>
</ol>
@@ -1740,15 +1729,12 @@
<entry key="install.wizard.params.step3.converters">Converters</entry>
<entry key="install.wizard.params.step3.seeAlso"> see also</entry>
<entry
key="install.wizard.params.step3.installation">Installation</entry>
- <entry key="install.wizard.params.step3.swfZoom">SWFTools Zoom</entry>
- <entry key="install.wizard.params.step3.swfZoom.title">Enter the dpi
that swftools will use for PDF to SWF conversion</entry>
- <entry key="install.wizard.params.step3.swfZoom.text">DPI that swftools
will use for PDF to SWF conversion (default is 100)</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality">SWFTools JPEG
Quality</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.title">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
- <entry key="install.wizard.params.step3.swfPath">SWFTools Path</entry>
- <entry key="install.wizard.params.step3.swfPath.title">Enter the path
to swftools for example C:/swftools (Windows) or leave blank if swftools is a
known to your system path</entry>
- <entry key="install.wizard.params.step3.swfPath.text">You can test if
swftools is installed into system path by opening a shell or cmd-prompt and
type pdf2swf If this shows a list of options leave this field blank otherwise
you have to specify the path to pdf2swf on your system</entry>
+ <entry key="install.wizard.params.step3.docDpi">Document conversion
DPI</entry>
+ <entry key="install.wizard.params.step3.docDpi.title">Enter the dpi
that ImageMagic will use for PDF to image conversion</entry>
+ <entry key="install.wizard.params.step3.docDpi.text">DPI that
ImageMagic will use for PDF to image conversion (default is 150)</entry>
+ <entry key="install.wizard.params.step3.docQuality">Document conversion
JPEG Quality</entry>
+ <entry key="install.wizard.params.step3.docQuality.title">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:90)</entry>
+ <entry key="install.wizard.params.step3.docQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:90)</entry>
<entry key="install.wizard.params.step3.imageMagicPath">ImageMagick
Path</entry>
<entry key="install.wizard.params.step3.imageMagicPath.title">Enter the
path to ImageMagick, leave blank if ImageMagick is successfully installed to
system-path</entry>
<entry
key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install
ImageMagick on the server, you can get more information on
http://www.imagemagick.org regarding installation. The instructions for
installation can be found there
http://www.imagemagick.org/script/binary-releases.php, however on most linux
systems you can get it via your favorite package managers (apt-get
it)]]></entry>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
Wed Mar 29 10:16:42 2017
@@ -1629,17 +1629,6 @@
found there, however on most linux
systems you can get it via your
favorite package managers (apt-get it).
</li>
- <li>Install <strong>SWFTools</strong> on the
server, you can get
- more information on <a target="_blank"
- href="http://www.swftools.org/";
rel="nofollow">http://www.swftools.org/</a>
- regarding installation. Some of the
Linux distributions already have
- it in there package manager see <a
target="_blank"
-
href="http://packages.debian.org/unstable/utils/swftools";
-
rel="nofollow">http://packages.debian.org/unstable/utils/swftools</a>),
- the recommended version of
<strong>SWFTools</strong> is 0.9 as prior
- version have a bug that does lead to
wrong object dimensions in the
- Whiteboard
- </li>
</ul>
</li>
</ol>
@@ -1740,15 +1729,12 @@
<entry key="install.wizard.params.step3.converters">Converters</entry>
<entry key="install.wizard.params.step3.seeAlso"> see also</entry>
<entry
key="install.wizard.params.step3.installation">Installation</entry>
- <entry key="install.wizard.params.step3.swfZoom">SWFTools Zoom</entry>
- <entry key="install.wizard.params.step3.swfZoom.title">Enter the dpi
that swftools will use for PDF to SWF conversion</entry>
- <entry key="install.wizard.params.step3.swfZoom.text">DPI that swftools
will use for PDF to SWF conversion (default is 100)</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality">SWFTools JPEG
Quality</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.title">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
- <entry key="install.wizard.params.step3.swfPath">SWFTools Path</entry>
- <entry key="install.wizard.params.step3.swfPath.title">Enter the path
to swftools for example C:/swftools (Windows) or leave blank if swftools is a
known to your system path</entry>
- <entry key="install.wizard.params.step3.swfPath.text">You can test if
swftools is installed into system path by opening a shell or cmd-prompt and
type pdf2swf If this shows a list of options leave this field blank otherwise
you have to specify the path to pdf2swf on your system</entry>
+ <entry key="install.wizard.params.step3.docDpi">Document conversion
DPI</entry>
+ <entry key="install.wizard.params.step3.docDpi.title">Enter the dpi
that ImageMagic will use for PDF to image conversion</entry>
+ <entry key="install.wizard.params.step3.docDpi.text">DPI that
ImageMagic will use for PDF to image conversion (default is 150)</entry>
+ <entry key="install.wizard.params.step3.docQuality">Document conversion
JPEG Quality</entry>
+ <entry key="install.wizard.params.step3.docQuality.title">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:90)</entry>
+ <entry key="install.wizard.params.step3.docQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:90)</entry>
<entry key="install.wizard.params.step3.imageMagicPath">ImageMagick
Path</entry>
<entry key="install.wizard.params.step3.imageMagicPath.title">Enter the
path to ImageMagick, leave blank if ImageMagick is successfully installed to
system-path</entry>
<entry
key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install
ImageMagick on the server, you can get more information on
http://www.imagemagick.org regarding installation. The instructions for
installation can be found there
http://www.imagemagick.org/script/binary-releases.php, however on most linux
systems you can get it via your favorite package managers (apt-get
it)]]></entry>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
Wed Mar 29 10:16:42 2017
@@ -1628,17 +1628,6 @@
In den meisten Linux-Distributionen
lässt es sich bequem per Paketmanager
(z.B. apt-get) installieren.
</li>
- <li>Installieren Sie <strong>SWFTools</strong>
auf dem Server. Weitere
- Informationen (Installationsanleitungen
etc.) finden Sie unter <a target="_blank"
- href="http://www.swftools.org/";
rel="nofollow">http://www.swftools.org/</a>.
- Einige Linux-Distributionen haben es
bereits in ihre Paketquellen aufgenommen (siehe
- <a target="_blank"
-
href="http://packages.debian.org/unstable/utils/swftools";
-
rel="nofollow">http://packages.debian.org/unstable/utils/swftools</a>).
- Die empfohlene Version von
<strong>SWFTools</strong> ist 0.9 - frühere Versionen
- enthalten einen Bug, welcher zu
falschen Objektausdehnungen auf dem Whiteboard
- führt.
- </li>
</ul>
</li>
</ol>
@@ -1742,31 +1731,12 @@
<entry key="install.wizard.params.step3.converters">Konverter</entry>
<entry key="install.wizard.params.step3.seeAlso"> Siehe</entry>
<entry
key="install.wizard.params.step3.installation">Installation</entry>
- <entry key="install.wizard.params.step3.swfZoom">SWFTools Zoom</entry>
- <entry key="install.wizard.params.step3.swfZoom.title"><![CDATA[Geben
Sie an, wieviel dpi swftools für die 'PDF zu SWF'-Konvertierung nutzen
soll.]]></entry>
- <entry key="install.wizard.params.step3.swfZoom.text"><![CDATA[Sie
können überprüfen, ob swftools im Systempfad
- installiert ist, indem Sie eine Shell oder einen cmd-Prompt
öffnen
- und pdf2swf eingeben.
- Geben Sie an, wieviel dpi swftools für die 'PDF zu
SWF'-Konvertierung nutzen soll.
- Voreingestellter Wert ist 100 dpi.]]></entry>
- <entry
key="install.wizard.params.step3.swfJpegQuality"><![CDATA[SWFTools
JPEG-Qualität]]></entry>
- <entry
key="install.wizard.params.step3.swfJpegQuality.title"><![CDATA[Geben Sie an,
welche Qualitätsstufe für eingebettete JPEG-Bilder verwendet werden
soll.]]></entry>
- <entry
key="install.wizard.params.step3.swfJpegQuality.text"><![CDATA[Sie können
überprüfen, ob swftools im Systempfad
- installiert ist, indem Sie eine Shell oder einen cmd-Prompt
öffnen
- und pdf2swf eingeben.
- Geben Sie an, welche Qualitätsstufe für eingebettete
JPEG-Bilder
- verwendet werden soll. 0 bedeutet schlechteste Qualität
(kleinste
- Dateigröße), 100 bedeutet beste Qualität
(größte
- Dateigröße) (Voreinstellung: 85)]]></entry>
- <entry key="install.wizard.params.step3.swfPath">SWFTools-Pfad</entry>
- <entry key="install.wizard.params.step3.swfPath.title">Geben Sie den
Pfad zu swftools an, z.B. C:/swftools (Windows), falls es sich nicht im
Systempfad befindet.</entry>
- <entry key="install.wizard.params.step3.swfPath.text"><![CDATA[
- Sie können überprüfen, ob swftools im Systempfad
- installiert ist, indem Sie eine Shell oder einen cmd-Prompt
öffnen
- und pdf2swf eingeben. Wenn daraufhin eine Liste mit Optionen
angezeigt wird,
- könen Sie dieses Feld leer lassen. Ansonsten müssen
Sie den Pfad
- zu pdf2swf hier eintragen.
- ]]></entry>
+ <entry key="install.wizard.params.step3.docDpi">Document conversion
DPI</entry>
+ <entry key="install.wizard.params.step3.docDpi.title">Enter the dpi
that ImageMagic will use for PDF to image conversion</entry>
+ <entry key="install.wizard.params.step3.docDpi.text">DPI that
ImageMagic will use for PDF to image conversion (default is 150)</entry>
+ <entry key="install.wizard.params.step3.docQuality">Document conversion
JPEG Quality</entry>
+ <entry key="install.wizard.params.step3.docQuality.title">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:90)</entry>
+ <entry key="install.wizard.params.step3.docQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:90)</entry>
<entry
key="install.wizard.params.step3.imageMagicPath">ImageMagick-Pfad</entry>
<entry key="install.wizard.params.step3.imageMagicPath.title">Geben Sie
den Pfad zu ImageMagick an, falls es sich nicht im Systempfad befindet.</entry>
<entry
key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Installieren Sie
ImageMagick auf dem Server. Weitere Informationen unter
http://www.imagemagick.org. Anleitungen für die Installation finden Sie
unter http://www.imagemagick.org/script/binary-releases.php, in den meisten
Linux-Distributionen lässt es sich jedoch bequem per Paketmanager (z.B.
apt-get) installieren.]]></entry>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
Wed Mar 29 10:16:42 2017
@@ -1629,17 +1629,6 @@
found there, however on most linux
systems you can get it via your
favorite package managers (apt-get it).
</li>
- <li>Install <strong>SWFTools</strong> on the
server, you can get
- more information on <a target="_blank"
- href="http://www.swftools.org/";
rel="nofollow">http://www.swftools.org/</a>
- regarding installation. Some of the
Linux distributions already have
- it in there package manager see <a
target="_blank"
-
href="http://packages.debian.org/unstable/utils/swftools";
-
rel="nofollow">http://packages.debian.org/unstable/utils/swftools</a>),
- the recommended version of
<strong>SWFTools</strong> is 0.9 as prior
- version have a bug that does lead to
wrong object dimensions in the
- Whiteboard
- </li>
</ul>
</li>
</ol>
@@ -1740,15 +1729,12 @@
<entry key="install.wizard.params.step3.converters">Converters</entry>
<entry key="install.wizard.params.step3.seeAlso"> see also</entry>
<entry
key="install.wizard.params.step3.installation">Installation</entry>
- <entry key="install.wizard.params.step3.swfZoom">SWFTools Zoom</entry>
- <entry key="install.wizard.params.step3.swfZoom.title">Enter the dpi
that swftools will use for PDF to SWF conversion</entry>
- <entry key="install.wizard.params.step3.swfZoom.text">DPI that swftools
will use for PDF to SWF conversion (default is 100)</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality">SWFTools JPEG
Quality</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.title">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
- <entry key="install.wizard.params.step3.swfPath">SWFTools Path</entry>
- <entry key="install.wizard.params.step3.swfPath.title">Enter the path
to swftools for example C:/swftools (Windows) or leave blank if swftools is a
known to your system path</entry>
- <entry key="install.wizard.params.step3.swfPath.text">You can test if
swftools is installed into system path by opening a shell or cmd-prompt and
type pdf2swf If this shows a list of options leave this field blank otherwise
you have to specify the path to pdf2swf on your system</entry>
+ <entry key="install.wizard.params.step3.docDpi">Document conversion
DPI</entry>
+ <entry key="install.wizard.params.step3.docDpi.title">Enter the dpi
that ImageMagic will use for PDF to image conversion</entry>
+ <entry key="install.wizard.params.step3.docDpi.text">DPI that
ImageMagic will use for PDF to image conversion (default is 150)</entry>
+ <entry key="install.wizard.params.step3.docQuality">Document conversion
JPEG Quality</entry>
+ <entry key="install.wizard.params.step3.docQuality.title">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:90)</entry>
+ <entry key="install.wizard.params.step3.docQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:90)</entry>
<entry key="install.wizard.params.step3.imageMagicPath">ImageMagick
Path</entry>
<entry key="install.wizard.params.step3.imageMagicPath.title">Enter the
path to ImageMagick, leave blank if ImageMagick is successfully installed to
system-path</entry>
<entry
key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install
ImageMagick on the server, you can get more information on
http://www.imagemagick.org regarding installation. The instructions for
installation can be found there
http://www.imagemagick.org/script/binary-releases.php, however on most linux
systems you can get it via your favorite package managers (apt-get
it)]]></entry>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
Wed Mar 29 10:16:42 2017
@@ -1628,17 +1628,6 @@
de todos modos en la mayorÃa de los
sistemas linux puede conseguirlo
via su paquete favorito de
administración (apt-get it)
</li>
- <li>Instale <strong>SWFTools</strong> en el
servidor, puede tener
- más información en <a target="_blank"
- href="http://www.swftools.org/";
rel="nofollow">http://www.swftools.org/</a>
- mire en instalación. Algunas de las
distribuciones Linux ya lo tienen en el
- administrador de paquetes, vea <a
target="_blank"
-
href="http://packages.debian.org/unstable/utils/swftools";
-
rel="nofollow">http://packages.debian.org/unstable/utils/swftools</a>),
- la versión recomendada de
<strong>SWFTools</strong> es 0.9 porque las
- anteriores tienen un bug que hace
llevar unas dimensiones erróneas al objeto
- en la Pizarra.
- </li>
</ul>
</li>
</ol>
@@ -1740,15 +1729,12 @@
<entry
key="install.wizard.params.step3.converters">Convertidores</entry>
<entry key="install.wizard.params.step3.seeAlso"> consulte</entry>
<entry
key="install.wizard.params.step3.installation">Instalación</entry>
- <entry key="install.wizard.params.step3.swfZoom">Zoom SWFTools</entry>
- <entry key="install.wizard.params.step3.swfZoom.title">Introduzca el
dpi que swftools empleará para convertir PDF a SWF</entry>
- <entry key="install.wizard.params.step3.swfZoom.text">Puede comprobar
si la ruta a la instalación de swftools es la correcta abriendo una shell o
cmd-prompt y escribir pdf2swf Introduzca la dpi que swftools empleará para
convertir PDF a SWF. Preconfigurada es 100 dpi</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality">Calidad de JPEG
en SWFTools</entry>
- <entry
key="install.wizard.params.step3.swfJpegQuality.title">Introduzca la calidad
embebida de las imágenes jpeg. 0 es la menor (pesa menos), 100 es la mejor
(pesa más). (por omisión:85)</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.text">Puede
comprobar si la ruta a la instalación de swftools es la correcta abriendo una
shell o cmd-prompt y escribir pdf2swf Introduzca la calidad de las imagenes
jpeg embebidas. 0 es la menor (pequeña), 100 es la mejor (grande).
(preconfigurada:85)</entry>
- <entry key="install.wizard.params.step3.swfPath">SWFTools Path
(Ruta)</entry>
- <entry key="install.wizard.params.step3.swfPath.title">Introduzca la
ruta a swftools, por ejemplo C:/swftools (Windows) o déjelo en blanco si
swftools está registrado en el path del sistema</entry>
- <entry key="install.wizard.params.step3.swfPath.text">Puede comprobar
si la ruta a la instalación de swftools es la correcta abriendo una shell o
cmd-prompt y escribir pdf2swf Si muestra una lista de opciones, deje este
campo en blanco, si no debe especificar la ruta a pdf2swf en su sistema</entry>
+ <entry key="install.wizard.params.step3.docDpi">Document conversion
DPI</entry>
+ <entry key="install.wizard.params.step3.docDpi.title">Enter the dpi
that ImageMagic will use for PDF to image conversion</entry>
+ <entry key="install.wizard.params.step3.docDpi.text">DPI that
ImageMagic will use for PDF to image conversion (default is 150)</entry>
+ <entry key="install.wizard.params.step3.docQuality">Document conversion
JPEG Quality</entry>
+ <entry key="install.wizard.params.step3.docQuality.title">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:90)</entry>
+ <entry key="install.wizard.params.step3.docQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:90)</entry>
<entry key="install.wizard.params.step3.imageMagicPath">ImageMagick
Path (Ruta)</entry>
<entry
key="install.wizard.params.step3.imageMagicPath.title">Introduzca la ruta a
ImageMagick, o déjelo en blanco si ImageMagick está registrado en el path del
sistema</entry>
<entry
key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Instalar
ImageMagick en el servidor, puede obtener más información en
http://www.imagemagick.org observando instalación. Las instrucciones para la
misma puede encontrarlas aquÃ
http://www.imagemagick.org/script/binary-releases.php, de todos modos en la
mayorÃa de los sistemas linux puede conseguirlo via su paquete favorito de
administración (apt-get it).]]></entry>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
Wed Mar 29 10:16:42 2017
@@ -1629,17 +1629,6 @@
found there, however on most linux
systems you can get it via your
favorite package managers (apt-get it).
</li>
- <li>Install <strong>SWFTools</strong> on the
server, you can get
- more information on <a target="_blank"
- href="http://www.swftools.org/";
rel="nofollow">http://www.swftools.org/</a>
- regarding installation. Some of the
Linux distributions already have
- it in there package manager see <a
target="_blank"
-
href="http://packages.debian.org/unstable/utils/swftools";
-
rel="nofollow">http://packages.debian.org/unstable/utils/swftools</a>),
- the recommended version of
<strong>SWFTools</strong> is 0.9 as prior
- version have a bug that does lead to
wrong object dimensions in the
- Whiteboard
- </li>
</ul>
</li>
</ol>
@@ -1740,15 +1729,12 @@
<entry key="install.wizard.params.step3.converters">Converters</entry>
<entry key="install.wizard.params.step3.seeAlso"> see also</entry>
<entry
key="install.wizard.params.step3.installation">Installation</entry>
- <entry key="install.wizard.params.step3.swfZoom">SWFTools Zoom</entry>
- <entry key="install.wizard.params.step3.swfZoom.title">Enter the dpi
that swftools will use for PDF to SWF conversion</entry>
- <entry key="install.wizard.params.step3.swfZoom.text">DPI that swftools
will use for PDF to SWF conversion (default is 100)</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality">SWFTools JPEG
Quality</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.title">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
- <entry key="install.wizard.params.step3.swfPath">SWFTools Path</entry>
- <entry key="install.wizard.params.step3.swfPath.title">Enter the path
to swftools for example C:/swftools (Windows) or leave blank if swftools is a
known to your system path</entry>
- <entry key="install.wizard.params.step3.swfPath.text">You can test if
swftools is installed into system path by opening a shell or cmd-prompt and
type pdf2swf If this shows a list of options leave this field blank otherwise
you have to specify the path to pdf2swf on your system</entry>
+ <entry key="install.wizard.params.step3.docDpi">Document conversion
DPI</entry>
+ <entry key="install.wizard.params.step3.docDpi.title">Enter the dpi
that ImageMagic will use for PDF to image conversion</entry>
+ <entry key="install.wizard.params.step3.docDpi.text">DPI that
ImageMagic will use for PDF to image conversion (default is 150)</entry>
+ <entry key="install.wizard.params.step3.docQuality">Document conversion
JPEG Quality</entry>
+ <entry key="install.wizard.params.step3.docQuality.title">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:90)</entry>
+ <entry key="install.wizard.params.step3.docQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:90)</entry>
<entry key="install.wizard.params.step3.imageMagicPath">ImageMagick
Path</entry>
<entry key="install.wizard.params.step3.imageMagicPath.title">Enter the
path to ImageMagick, leave blank if ImageMagick is successfully installed to
system-path</entry>
<entry
key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install
ImageMagick on the server, you can get more information on
http://www.imagemagick.org regarding installation. The instructions for
installation can be found there
http://www.imagemagick.org/script/binary-releases.php, however on most linux
systems you can get it via your favorite package managers (apt-get
it)]]></entry>
