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" />
