You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/03/29 10:16:43 UTC
svn commit: r1789322 [3/3] - in /openmeetings/application/trunk:
openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/
openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/
openmeetings-db/src/main/java/org/apache/op...
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml Wed Mar 29 10:16:42 2017
@@ -1631,16 +1631,6 @@
менеджер пакетов (apt-get it).
</li>
<li>Установите <strong>SWFTools</strong> на Ваш сервер, более подробную информацию
- можно найти на сайте <a target="_blank"
- href="http://www.swftools.org/" rel="nofollow">http://www.swftools.org/</a>
- Некоторые дистрибутивы Линукс уже включают его
- в свои менеджеры пакетов, посмотреть можно здесь <a target="_blank"
- href="http://packages.debian.org/unstable/utils/swftools"
- rel="nofollow">http://packages.debian.org/unstable/utils/swftools</a>),
- для установки рекомендуется <strong>SWFTools</strong> версии 0.9 так как
- предыдущая версия содержит баг который приводил к ошибке отображения размеров объекта
- на доске
- </li>
</ul>
</li>
@@ -1741,15 +1731,12 @@
<entry key="install.wizard.params.step3.converters">Конвертери</entry>
<entry key="install.wizard.params.step3.seeAlso"> дивіться також</entry>
<entry key="install.wizard.params.step3.installation">Установка</entry>
- <entry key="install.wizard.params.step3.swfZoom">SWFTools масштабування</entry>
- <entry key="install.wizard.params.step3.swfZoom.title">Вкажіть дозвіл (dpi), яке ви будете використовувати для конвертації PDF в SWF</entry>
- <entry key="install.wizard.params.step3.swfZoom.text">DPI яке swftools буде використовувати для конвертації PDF в SWF. За замовчуванням 100 dpi.</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality">SWFTools JPEG Якість</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.title">Вкажіть якість вбудованого jpeg зображення. 0 погане (маленьке), 100 висока (велике). (за замовчуванням:85)</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.text">Якість вбудованого jpeg зображення. 0 погане (маленьке), 100 висока (велике). (за замовчуванням:85)</entry>
- <entry key="install.wizard.params.step3.swfPath">SWFTools Шлях</entry>
- <entry key="install.wizard.params.step3.swfPath.title">Вкажіть шлях до swftools наприклад C:/swftools (Windows) або не заповнюйте це поле якщо шлях до swftools задано в системних шляхах</entry>
- <entry key="install.wizard.params.step3.swfPath.text">Ви можете перевірити, чи налаштований запуск swftools на Вашій системі з допомогою командного рядка або shell або cmd-prompt набравши команду pdf2swf. Якщо буде показаний список опцій залиште це поле порожнім, в іншому випадку ви повинні вказати шлях до pdf2swf на Вашій системі</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 Шлях</entry>
<entry key="install.wizard.params.step3.imageMagicPath.title">Вкажіть шлях до ImageMagick, або не заповнюйте це поле якщо ImageMagick встановлений в шляхах Вашої системи</entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Установите ImageMagick на Ваш сервер, более подробную информацию касающуюся установки можно посмотреть тут http://www.imagemagick.org Инструкцию по установке Вы можете найти здесь http://www.imagemagick.org/script/binary-releases.php, однако в большинстве систем Линукс Вы можете установить его через Ваш менеджер пакетов (apt-get it)]]></en
try>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml Wed Mar 29 10:16:42 2017
@@ -1625,13 +1625,6 @@
href="http://pages.cs.wisc.edu/%7Eghost/" rel="nofollow">http://pages.cs.wisc.edu/~ghost/</a>
关于安装. 安装的说明可以在这里找到, 然而，在大多数linux系统中，您可以通过您最喜爱的软件包管理器来获得它 (apt-get it).
</li>
- <li>安装 <strong>SWFTools</strong> 在服务器上, 你可以得到更多的信息在 <a target="_blank"
- href="http://www.swftools.org/" rel="nofollow">http://www.swftools.org/</a>
- 关于安装. 一些Linux在软件包管理器中已经包含了 <a target="_blank"
- href="http://packages.debian.org/unstable/utils/swftools"
- rel="nofollow">http://packages.debian.org/unstable/utils/swftools</a>),
- 推荐的版本 <strong>SWFTools</strong> 是 0.9 因为之前的版本有一个错误，导致在白板上显示错误的对象尺寸
- </li>
</ul>
</li>
</ol>
@@ -1729,15 +1722,12 @@
<entry key="install.wizard.params.step3.converters">转换器</entry>
<entry key="install.wizard.params.step3.seeAlso"> 见</entry>
<entry key="install.wizard.params.step3.installation">安装</entry>
- <entry key="install.wizard.params.step3.swfZoom">swftools变焦</entry>
- <entry key="install.wizard.params.step3.swfZoom.title">输入DPI，swftools将SWF转换为PDF</entry>
- <entry key="install.wizard.params.step3.swfZoom.text">DPI，swftools将SWF转换为PDF (默认是 100)</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality">swftools JPEG质量</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.title">输入嵌入的JPEG图片的质量。0是最坏的（小），100是最好的（大）。（默认：85）</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.text">输入嵌入的JPEG图片的质量。0是最坏的（小），100是最好的（大）。（默认：85）</entry>
- <entry key="install.wizard.params.step3.swfPath">SWFTools 路径</entry>
- <entry key="install.wizard.params.step3.swfPath.title">输入swftools例如C:/swftools（Windows）或留有空白，如果swftools是已知的系统路径</entry>
- <entry key="install.wizard.params.step3.swfPath.text">你可以测试是否将swftools安装到系统路径，打开shell或者cmd提示符下输入Pdf2swf，如果出现了一个列表，上有一些选项，就不用填写这个字段，否则否则你必须指定Pdf2swf在您的系统上的路径</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 路径</entry>
<entry key="install.wizard.params.step3.imageMagicPath.title">输入ImageMagick的路径, 如果ImageMagick成功安装到系统路径，就不用填写这个字段</entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[安装 ImageMagick 在服务器上，你可以得到更多的信息在 http://www.imagemagick.org 关于安装. 安装的说明可以在这里找到 http://www.imagemagick.org/script/binary-releases.php, 然而，在大多数linux系统中，您可以通过您最喜爱的软件包管理器来获得它(apt-get it)]]></entry>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.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/common/tree/DownloadMenuItem.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/DownloadMenuItem.java?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/DownloadMenuItem.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/DownloadMenuItem.java Wed Mar 29 10:16:42 2017
@@ -20,7 +20,6 @@ package org.apache.openmeetings.web.comm
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_PDF;
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_SWF;
import java.io.File;
import java.io.FileFilter;
@@ -82,7 +81,6 @@ public class DownloadMenuItem extends Me
exclusions.add(EXTENSION_JPG);
if (Type.Presentation == fi.getType()) {
exclusions.add(EXTENSION_PDF);
- exclusions.add(EXTENSION_SWF);
}
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard%24ParamsStep3.html?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html Wed Mar 29 10:16:42 2017
@@ -23,22 +23,15 @@
<fieldset class="ui-widget-content" id="userConf1">
<legend class="ui-widget-header"><wicket:message key="install.wizard.params.step3.converters"/></legend>
<ul class="paramList">
- <li><label wicket:for="swfZoom"><wicket:message key="install.wizard.params.step3.swfZoom"/>
- <span class="info-title" wicket:message="title:install.wizard.params.step3.swfZoom.text,alt:install.wizard.params.step3.swfZoom.text"></span>
+ <li><label wicket:for="docDpi"><wicket:message key="install.wizard.params.step3.docDpi"/>
+ <span class="info-title" wicket:message="title:install.wizard.params.step3.docDpi.text,alt:install.wizard.params.step3.docDpi.text"></span>
</label>
- <input wicket:id="swfZoom" wicket:message="title:install.wizard.params.step3.swfZoom.title" type="text" />
+ <input wicket:id="docDpi" wicket:message="title:install.wizard.params.step3.docDpi.title" type="text" />
</li>
- <li><label wicket:for="swfJpegQuality"><wicket:message key="install.wizard.params.step3.swfJpegQuality"/>
- <span class="info-title" wicket:message="title:install.wizard.params.step3.swfJpegQuality.text,alt:install.wizard.params.step3.swfJpegQuality.text"></span>
+ <li><label wicket:for="docQuality"><wicket:message key="install.wizard.params.step3.docQuality"/>
+ <span class="info-title" wicket:message="title:install.wizard.params.step3.docQuality.text,alt:install.wizard.params.step3.docQuality.text"></span>
</label>
- <input wicket:id="swfJpegQuality" wicket:message="title:install.wizard.params.step3.swfJpegQuality.title" type="text" />
- </li>
- <li>
- <label wicket:for="swfPath"><wicket:message key="install.wizard.params.step3.swfPath"/>
- <span class="info-title" wicket:message="title:install.wizard.params.step3.swfPath.text,alt:install.wizard.params.step3.swfPath.text"></span>
- </label>
- <input wicket:id="swfPath" type="text" />
- <button class="formelement" wicket:id="validateSwf"><wicket:message key="install.wizard.db.step.check"/></button>
+ <input wicket:id="docQuality" wicket:message="title:install.wizard.params.step3.docQuality.title" type="text" />
</li>
<li><label wicket:for="imageMagicPath"><wicket:message key="install.wizard.params.step3.imageMagicPath"/>
<span class="info-title" wicket:message="title:install.wizard.params.step3.imageMagicPath.text,alt:install.wizard.params.step3.imageMagicPath.text"></span>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java Wed Mar 29 10:16:42 2017
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.pages.install;
+import static org.apache.openmeetings.core.converter.BaseConverter.EXEC_EXT;
import static org.apache.openmeetings.util.OpenmeetingsVariables.USER_LOGIN_MINIMUM_LENGTH;
import static org.apache.openmeetings.util.OpenmeetingsVariables.USER_PASSWORD_MINIMUM_LENGTH;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -40,7 +41,6 @@ import java.util.Locale;
import java.util.Map;
import org.apache.openmeetings.cli.ConnectionPropertiesPatcher;
-import org.apache.openmeetings.core.converter.GenerateSWF;
import org.apache.openmeetings.db.dao.label.LabelDao;
import org.apache.openmeetings.installation.ImportInitvalues;
import org.apache.openmeetings.installation.InstallationConfig;
@@ -491,30 +491,20 @@ public class InstallWizard extends Abstr
private final TextField<String> ffmpegPath;
private final TextField<String> imageMagicPath;
private final TextField<String> soxPath;
- private final TextField<String> swfPath;
private final TextField<String> officePath;
private final String regex = "\\r\\n|\\r|\\n";
private boolean isAllChecked = false;
public ParamsStep3() {
super(paramsStep2);
- add(new TextField<Integer>("swfZoom").setRequired(true).add(range(50, 600)));
- add(new TextField<Integer>("swfJpegQuality").setRequired(true).add(range(1, 100)));
- add(swfPath = new TextField<>("swfPath"));
- add(new AjaxButton("validateSwf") {
- private static final long serialVersionUID = 1L;
- @Override
- protected void onSubmit(AjaxRequestTarget target) {
- checkToolPath(swfPath, new String[] {InstallWizard.getPath(swfPath.getValue(), "pdf2swf" + GenerateSWF.execExt), "--version"});
- target.add(getFeedbackPanel());
- }
- });
+ add(new TextField<Integer>("docDpi").setRequired(true).add(range(50, 600)));
+ add(new TextField<Integer>("docQuality").setRequired(true).add(range(1, 100)));
add(imageMagicPath = new TextField<>("imageMagicPath"));
add(new AjaxButton("validateImageMagic") {
private static final long serialVersionUID = 1L;
@Override
protected void onSubmit(AjaxRequestTarget target) {
- checkToolPath(imageMagicPath, new String[] {InstallWizard.getPath(imageMagicPath.getValue(), "convert" + GenerateSWF.execExt), "-version"});
+ checkToolPath(imageMagicPath, new String[] {InstallWizard.getPath(imageMagicPath.getValue(), "convert" + EXEC_EXT), "-version"});
target.add(getFeedbackPanel());
}
});
@@ -523,7 +513,7 @@ public class InstallWizard extends Abstr
private static final long serialVersionUID = 1L;
@Override
protected void onSubmit(AjaxRequestTarget target) {
- checkToolPath(ffmpegPath, new String[] {InstallWizard.getPath(ffmpegPath.getValue(), "ffmpeg" + GenerateSWF.execExt), "-version"});
+ checkToolPath(ffmpegPath, new String[] {InstallWizard.getPath(ffmpegPath.getValue(), "ffmpeg" + EXEC_EXT), "-version"});
target.add(getFeedbackPanel());
}
});
@@ -532,7 +522,7 @@ public class InstallWizard extends Abstr
private static final long serialVersionUID = 1L;
@Override
protected void onSubmit(AjaxRequestTarget target) {
- checkToolPath(soxPath, new String[] {InstallWizard.getPath(soxPath.getValue(), "sox" + GenerateSWF.execExt), "--version"});
+ checkToolPath(soxPath, new String[] {InstallWizard.getPath(soxPath.getValue(), "sox" + EXEC_EXT), "--version"});
target.add(getFeedbackPanel());
}
});
@@ -580,10 +570,9 @@ public class InstallWizard extends Abstr
}
private boolean checkAllPath() {
- boolean result = checkToolPath(swfPath, new String[] {InstallWizard.getPath(swfPath.getValue(), "pdf2swf" + GenerateSWF.execExt), "--version"});
- result = checkToolPath(imageMagicPath, new String[] {InstallWizard.getPath(imageMagicPath.getValue(), "convert" + GenerateSWF.execExt), "-version"}) && result;
- result = checkToolPath(ffmpegPath, new String[] {InstallWizard.getPath(ffmpegPath.getValue(), "ffmpeg" + GenerateSWF.execExt), "-version"}) && result;
- result = checkToolPath(soxPath, new String[] {InstallWizard.getPath(soxPath.getValue(), "sox" + GenerateSWF.execExt), "--version"}) && result;
+ boolean result = checkToolPath(imageMagicPath, new String[] {InstallWizard.getPath(imageMagicPath.getValue(), "convert" + EXEC_EXT), "-version"});
+ result = checkToolPath(ffmpegPath, new String[] {InstallWizard.getPath(ffmpegPath.getValue(), "ffmpeg" + EXEC_EXT), "-version"}) && result;
+ result = checkToolPath(soxPath, new String[] {InstallWizard.getPath(soxPath.getValue(), "sox" + EXEC_EXT), "--version"}) && result;
result = checkOfficePath() && result;
isAllChecked = true;
return result;
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java Wed Mar 29 10:16:42 2017
@@ -19,9 +19,9 @@
package org.apache.openmeetings.web.room;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_SWF;
import static org.apache.openmeetings.util.OmFileHelper.JPG_MIME_TYPE;
import static org.apache.openmeetings.util.OmFileHelper.MP4_MIME_TYPE;
+import static org.apache.openmeetings.util.OmFileHelper.PNG_MIME_TYPE;
import static org.apache.openmeetings.util.OmFileHelper.getOmHome;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.Application.getOnlineClient;
@@ -38,7 +38,6 @@ import org.apache.openmeetings.db.dto.ro
import org.apache.openmeetings.db.dto.room.Whiteboards;
import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.db.entity.file.FileExplorerItem;
-import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.openmeetings.db.entity.file.FileItem.Type;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.util.FileItemResourceReference;
@@ -72,7 +71,7 @@ public class RoomResourceReference exten
mime = JPG_MIME_TYPE;
break;
case Presentation:
- mime = "application/x-shockwave-flash";
+ mime = PNG_MIME_TYPE;
break;
case Video:
mime = preview ? JPG_MIME_TYPE : MP4_MIME_TYPE;
@@ -122,8 +121,7 @@ public class RoomResourceReference exten
protected File getFile(FileExplorerItem f, String ext) {
File file = f.getFile(ext);
if (file == null || !file.exists()) {
- file = new File(new File(getOmHome(), "default"), String.format("deleted.%s"
- , FileItem.Type.Image == f.getType() ? EXTENSION_JPG : EXTENSION_SWF));
+ file = new File(new File(getOmHome(), "default"), String.format("deleted.%s", EXTENSION_JPG));
}
return file;
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java Wed Mar 29 10:16:42 2017
@@ -45,6 +45,8 @@ import org.apache.openmeetings.web.user.
import org.apache.openmeetings.web.user.record.Mp4RecordingResourceReference;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes.Method;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -80,6 +82,7 @@ public class WbPanel extends Panel {
private enum Action {
createWb
, removeWb
+ , activeWb
, createObj
, modifyObj
, deleteObj
@@ -88,6 +91,11 @@ public class WbPanel extends Panel {
private static final long serialVersionUID = 1L;
@Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ attributes.setMethod(Method.POST);
+ }
+
+ @Override
protected void respond(AjaxRequestTarget target) {
try {
Action a = Action.valueOf(getRequest().getRequestParameters().getParameterValue(PARAM_ACTION).toString());
@@ -117,6 +125,16 @@ public class WbPanel extends Panel {
sendWbAll("WbArea.remove", new JSONObject().put("id", id));
}
break;
+ case activeWb:
+ {
+ long _id = obj.optLong("id", -1);
+ if (_id > -1) {
+ Whiteboards wbs = getBean(WhiteboardCache.class).get(roomId);
+ wbs.setActiveWb(_id);
+ sendWbAll("WbArea.activate", new JSONObject().put("id", _id));
+ }
+ }
+ break;
case createObj:
{
Whiteboard wb = getBean(WhiteboardCache.class).get(roomId).get(obj.getLong("wbId"));
@@ -331,7 +349,7 @@ public class WbPanel extends Panel {
//FIXME TODO WmlFile/Chart special handling
Whiteboards wbs = getBean(WhiteboardCache.class).get(roomId);
String wuid = UUID.randomUUID().toString();
- Whiteboard wb = wbs.getWhiteboards().values().iterator().next(); //TODO active
+ Whiteboard wb = wbs.get(wbs.getActiveWb());
//FIXME TODO various types
JSONObject file = new JSONObject()
.put("fileId", fi.getId())
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js Wed Mar 29 10:16:42 2017
@@ -755,11 +755,15 @@ var WbArea = (function() {
function _createHandler(canvas, _o) {
if ('Video' === _o.fileType || 'Recording' === _o.fileType) {
var vid = $('<video>').hide().attr('id', 'video-' + _o.uid).attr('poster', _o._poster + '&preview=true')
+ .attr("width", _o.width).attr("height", _o.height)
.append($('<source>').attr('type', 'video/mp4').attr('src', _o._src))
$('#wb-tab-' + canvas.wbId).append(vid);
- //canvas.add(new fabric.Image(vid[0], _o));
- canvas.add(new fabric.Image(vid[0], {}));
- //vid.toJSON(['uid', 'fileId', 'fileType']);
+ var vImg = new fabric.Image(vid[0], {
+ left: _o.left
+ , top: _o.top
+ });
+ canvas.add(vImg);
+ //console.log(vImg.toJSON(['uid', 'fileId', 'fileType']));
} else {
canvas.add(_o);
}
@@ -789,8 +793,21 @@ var WbArea = (function() {
canvas.renderAll();
});
}
+ function _activateTab(wbId) {
+ container.find('.wb-tabbar li').each(function(idx) {
+ if (wbId == 1 * $(this).data('wb-id')) {
+ tabs.tabs("option", "active", idx);
+ return false;
+ }
+ });
+ }
self.init = function() {
- tabs = $('.room.wb.area .tabs').tabs();
+ container = $(".room.wb.area");
+ tabs = container.find('.tabs').tabs({
+ activate: function(event, ui) {
+ wbAction('activeWb', JSON.stringify({id: ui.newTab.data('wb-id')}));
+ }
+ });
scroll = tabs.find('.scroll-container');
tabs.find(".ui-tabs-nav").sortable({
axis: "x"
@@ -807,7 +824,6 @@ var WbArea = (function() {
tabs.find('.next.om-icon').click(function() {
scroll.scrollLeft(scroll.scrollLeft() + 30);
});
- container = $(".room.wb.area");
area = container.find(".wb-area");
$(window).keyup(deleteHandler);
}
@@ -827,14 +843,12 @@ var WbArea = (function() {
tabs.append(wb);
refreshTabs();
- $('.room.wb.area .wb-tabbar li').each(function(idx) {
- if (obj.id == 1 * $(this).data('wb-id')) {
- tabs.tabs("option", "active", idx);
- return false;
- }
- });
+ _activateTab(obj.id);
wb.data(Wb()).data('init')(obj.id, tid);
};
+ self.activate = function(obj) {
+ _activateTab(obj.id);
+ }
self.load = function(json) { //TODO need to be unified
var canvas = $('#' + getWbTabId(json.wbId)).data('getCanvas')();
_createObject(canvas, json.obj, _createHandler);
@@ -848,12 +862,15 @@ var WbArea = (function() {
break;
default:
_createObject(canvas, [o], _createHandler);
+ /*
+ * https://jsfiddle.net/l2aelba/kro7h6rv/2/
if ('Video' === o.fileType || 'Recording' === o.fileType) {
fabric.util.requestAnimFrame(function render() {
canvas.renderAll();
fabric.util.requestAnimFrame(render);
});
}
+ */
break;
}
};
@@ -919,7 +936,7 @@ $(function() {
}
}
} catch (err) {
- console.log(err);
+ //console.log(err);
//no-op
}
});
Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml?rev=1789322&r1=1789321&r2=1789322&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml Wed Mar 29 10:16:42 2017
@@ -202,7 +202,6 @@
<bean id="documentConverter" class="org.apache.openmeetings.core.converter.DocumentConverter" />
<bean id="smsHandler" class="org.apache.openmeetings.core.mail.SMSHandler" />
<bean id="importInitvalues" class="org.apache.openmeetings.installation.ImportInitvalues" />
- <bean id="generateSWF" class="org.apache.openmeetings.core.converter.GenerateSWF" />
<bean id="ldapLoginManagement" class="org.apache.openmeetings.core.ldap.LdapLoginManagement" />
<bean id="timezoneUtil" class="org.apache.openmeetings.db.util.TimezoneUtil" />
<bean id="whiteboardManager" class="org.apache.openmeetings.core.data.whiteboard.WhiteboardManager" />