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 2015/12/01 09:38:30 UTC
svn commit: r1717389 - in /openmeetings:
branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/
branches/3.1.x/openmeetings-flash/src/main/swf/base/components/upload/
branches/3.1.x/openmeetings-flash/src/main/swf/module...
Author: solomax
Date: Tue Dec 1 08:38:30 2015
New Revision: 1717389
URL: http://svn.apache.org/viewvc?rev=1717389&view=rev
Log:
[OPENMEETINGS-1279] more work on presentation display
Modified:
openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateSWF.java
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/upload/uploadWindowExplorer.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/presentations/items/listPresentationThumbExplorer.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/imageForDrawView.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/remoteWhiteboard.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/swfResourceView.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawClipArt.lzx
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateSWF.java
Modified: openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateSWF.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateSWF.java?rev=1717389&r1=1717388&r2=1717389&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateSWF.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateSWF.java Tue Dec 1 08:38:30 2015
@@ -78,6 +78,7 @@ public class GenerateSWF {
getPathToSwfTools() + "pdf2swf" + execExt, "-s",
"insertstop", // insert Stop command into every frame
"-s","poly2bitmap", //http://www.swftools.org/gfx_tutorial.html#Rendering_pages_to_SWF_files
+ "--flashversion=9", //option to generate as3 compatible files
"-i", // change draw order to reduce pdf complexity
"-j", "" + getSwfJpegQuality(), // JPEG Quality
"-s", "zoom=" + getSwfZoom(), // set zoom dpi
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/upload/uploadWindowExplorer.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/upload/uploadWindowExplorer.lzx?rev=1717389&r1=1717388&r2=1717389&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/upload/uploadWindowExplorer.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/upload/uploadWindowExplorer.lzx Tue Dec 1 08:38:30 2015
@@ -219,7 +219,18 @@
return downloadurl;
]]>
</method>
-
+
+ <method name="generateFileLink" args="fileHash">
+ <![CDATA[
+ return canvas.getUrl()+'DownloadHandler?' +
+ 'fileName='+ fileHash +
+ '&moduleName='+ "videoconf1" +
+ '&parentPath='+ '/' +
+ '&room_id=files' +
+ '&sid='+canvas.sessionId;
+ ]]>
+ </method>
+
<method name="createFileComplete" args="event">
if ($debug) Debug.write("createFileComplete::File has been created!!!!");
//FIXME TODO remove remoteComplete!!!!!
@@ -255,25 +266,11 @@
}
if ($debug) Debug.write("createFileComplete::6");
- /*
- FIXME TODO investigate this
- if (parent.isdefaultreturn) {
- var tempSendArray = new Array ();
- tempSendArray[0] = 'fileslist';
- var nowTime = new Date();
- var datumsString = nowTime.getHours()+':'+nowTime.getMinutes();
- tempSendArray[1] = datumsString;
- //if ($debug) Debug.write("Setting Message");
- tempSendArray[2] = 'newfile';
- tempSendArray[3] = canvas.currentusename;
- //if ($debug) Debug.write("send: ",tempSendArray);
- canvas.objMessage = tempSendArray;
- canvas.thishib.sendMessageAll.doCall();
- } else {
- //FIXME TODO refresh !!! parent.returnObj.sendRefresh();
- }
- */
+ var now = new Date();
+ canvas.objMessage = ['fileslist', now.getHours() + ':' + now.getMinutes(), 'newfile', canvas.currentusename];
+ canvas.thishib.sendMessageAll.doCall();
+ canvas.currentFileExplorer.getSelectedFolder().refresh();
if ($debug) Debug.write("createFileComplete::7");
this.close();
if ($debug) Debug.write("createFileComplete::8");
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/presentations/items/listPresentationThumbExplorer.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/presentations/items/listPresentationThumbExplorer.lzx?rev=1717389&r1=1717388&r2=1717389&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/presentations/items/listPresentationThumbExplorer.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/presentations/items/listPresentationThumbExplorer.lzx Tue Dec 1 08:38:30 2015
@@ -33,7 +33,7 @@
this.parent.checkForOriginal(Number(no));
</handler>
- <image name="_thumb" x="10" y="1"/>
+ <omImage name="_thumb" x="10" y="1"/>
<text name="_thumbText" x="120" text="$once{ this.parent.no }" fontsize="10"
width="240" multiline="true"/>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx?rev=1717389&r1=1717388&r2=1717389&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx Tue Dec 1 08:38:30 2015
@@ -387,8 +387,7 @@
</method>
<method name="addItemToDocumentToolBar">
- var docToolbar = this.getDocumentToolBar();
- docToolbar.addCurrentObject(this.currentlayer);
+ this.getDocumentToolBar().addCurrentObject(this.currentlayer);
</method>
<method name="setCurrentDocumentByToolBar" args="itemRefName">
@@ -441,13 +440,9 @@
docToolbar._currentSlideNo.setAttribute('text',this.ObjectByName._swfView.frame);
docToolbar._totalSlideNo.setAttribute('text',this.ObjectByName._swfView.totalframes);
- //docToolbar._zoom.setAttribute('text',this.ObjectByName.currentzoomFactor);
- //docToolbar.parent._fullFit.setValue(this.ObjectByName.fullFit);
} else {
docToolbar._currentSlideNo.setAttribute('text',"0");
docToolbar._totalSlideNo.setAttribute('text',"0");
- //docToolbar._zoom.setAttribute('text',"100");
- //docToolbar.parent._fullFit.setValue(false);
}
docToolbar.parent.parent.ignoreUpdates = false;
@@ -455,13 +450,11 @@
</method>
<method name="doDeleteFromDocumentsBar" args="itemRefName">
- var docToolbar = this.getDocumentToolBar();
- docToolbar.removeDocument(itemRefName);
+ this.getDocumentToolBar().removeDocument(itemRefName);
</method>
<method name="clearDocumentsBar">
- var docToolbar = this.getDocumentToolBar();
- docToolbar.clearDocumentsBar();
+ this.getDocumentToolBar().clearDocumentsBar();
</method>
<method name="sendCurrentSWFObject" args="objRef">
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/imageForDrawView.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/imageForDrawView.lzx?rev=1717389&r1=1717388&r2=1717389&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/imageForDrawView.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/imageForDrawView.lzx Tue Dec 1 08:38:30 2015
@@ -92,8 +92,6 @@
this.refObj.sendLoadNotificationImage(this);
}
this.refObj.layers.push(this);
-
- //this.oninit.sendEvent();
]]>
</handler>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/remoteWhiteboard.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/remoteWhiteboard.lzx?rev=1717389&r1=1717388&r2=1717389&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/remoteWhiteboard.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/remoteWhiteboard.lzx Tue Dec 1 08:38:30 2015
@@ -136,9 +136,6 @@
<![CDATA[
//The onResult-Handler will be called be the rtmpconnection
if ($debug) Debug.write("loadWMLFile: ",value);
- //canvas._drawarea.clearAll();
- //parent.loadSavedObjectList(value);
-
]]>
</handler>
</netRemoteCallHib>
@@ -155,10 +152,6 @@
if ($debug) Debug.write("startNewSyncprocess: ",value);
if (value.publicSID == canvas.publicSID){
if ($debug) Debug.write("currentLoadingItem IS mine");
- //TODO: Check usage of currentLoadingItem
- //if (value.currentLoadingItem){
- parent.startInitialLoadinProcess();
- //}
}
]]>
</handler>
@@ -169,13 +162,7 @@
<![CDATA[
//The onResult-Handler will be called be the rtmpconnection
if ($debug) Debug.write("startNewSyncprocess: ",value);
- //if (value.publicSID == canvas.publicSID){
- if ($debug) Debug.write("currentLoadingItem IS mine");
- //TODO: Check usage of currentLoadingItem
- //if (value.currentLoadingItem){
- parent.startInitialLoadinProcess();
- //}
- //}
+ if ($debug) Debug.write("currentLoadingItem IS mine");
]]>
</handler>
</netRemoteCallHib>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/swfResourceView.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/swfResourceView.lzx?rev=1717389&r1=1717388&r2=1717389&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/swfResourceView.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/swfResourceView.lzx Tue Dec 1 08:38:30 2015
@@ -62,6 +62,13 @@
<attribute name="swfUrl" value="" type="string" />
<omMiniIcon name="_swfView" play="false" imgUrl="${ parent.swfUrl }">
+ <switch>
+ <when property="$as3">
+ <passthrough>
+ import flash.display.*;
+ </passthrough>
+ </when>
+ </switch>
<!-- Do not send update events in case
this is sync event broadcasted by another user -->
<attribute name="doSendChangeValue" value="false" type="boolean" />
@@ -80,11 +87,11 @@
<method name="initialLoadFullFit">
<![CDATA[
- if ($debug) Debug.write(" -- fullFit -- ",parent.parent.fullFit);
+ if ($debug) Debug.write(" -- fullFit -- ", parent.parent.fullFit);
if (parent.parent.fullFit) {
- if ($debug) Debug.write(" -- fullFit -2- ",this.width,this.height);
- if ($debug) Debug.write(" -- fullFit -3- ",parent.parent.width,parent.parent.height);
+ if ($debug) Debug.write(" -- fullFit -2- ", this.width, this.height);
+ if ($debug) Debug.write(" -- fullFit -3- ", parent.parent.width, parent.parent.height);
//Scale to container width/height
var xScale = (parent.parent.parent.width-16)/this.width;
@@ -102,13 +109,15 @@
</method>
<method name="completeCallback" args="event">
- //if ($debug) Debug.info("OVERRIDEN swfResourceView::_swfView::completeCallback: ", this.width, this,height);
- //designed to be empty to override default behavior
- </method>
-
- <handler name="onload">
<![CDATA[
- if ($debug) Debug.info("swfResourceView::_swfView::onload: ", this.width, this,height);
+ if ($debug) Debug.info("OVERRIDEN swfResourceView::_swfView::completeCallback: ", this.width, this.height, this.sprite.imgLoader.width, this.sprite.imgLoader.height);
+ if ($debug) Debug.info("OVERRIDEN swfResourceView::_swfView::completeCallback: ", this.sprite.imgLoader.content);
+ if ($debug) Debug.info("OVERRIDEN swfResourceView::_swfView::completeCallback: ", this.sprite.imgLoader.content['frame'], this.sprite.imgLoader.content['totalframes']);
+ var mc = MovieClip(this.sprite.imgLoader.content);
+ if ($debug) Debug.info("OVERRIDEN swfResourceView::_swfView::completeCallback: ", mc);
+ if ($debug) Debug.info("OVERRIDEN swfResourceView::_swfView::completeCallback: ", mc.frame, mc.totalframes);
+ this.width = this.sprite.imgLoader.width;
+ this.height = this.sprite.imgLoader.height;
this.stop();
this.setAttribute('play',false);
@@ -163,10 +172,8 @@
this.parent.refObj.layers.push(this.parent);
this.doSendChangeValue = true;
-
- this.oninit.sendEvent();
]]>
- </handler>
+ </method>
<handler name="onerror" args="error">
<![CDATA[
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawClipArt.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawClipArt.lzx?rev=1717389&r1=1717388&r2=1717389&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawClipArt.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawClipArt.lzx Tue Dec 1 08:38:30 2015
@@ -24,6 +24,18 @@
<class name="drawClipArtWhiteBoard" extends="omMiniIcon">
<attribute name="clipArtEndx" value="0" type="number" />
<attribute name="clipArtEndy" value="0" type="number" />
+
+ <handler name="onwidth">
+ if (this.sprite.imgLoader) {
+ this.sprite.imgLoader.width = this.width;
+ }
+ </handler>
+
+ <handler name="onheight">
+ if (this.sprite.imgLoader) {
+ this.sprite.imgLoader.height = this.height;
+ }
+ </handler>
</class>
<class name="baseDrawClipArt" extends="baseDrawArrow" >
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateSWF.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateSWF.java?rev=1717389&r1=1717388&r2=1717389&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateSWF.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateSWF.java Tue Dec 1 08:38:30 2015
@@ -78,6 +78,7 @@ public class GenerateSWF {
getPathToSwfTools() + "pdf2swf" + execExt, "-s",
"insertstop", // insert Stop command into every frame
"-s","poly2bitmap", //http://www.swftools.org/gfx_tutorial.html#Rendering_pages_to_SWF_files
+ "--flashversion=9", //option to generate as3 compatible files
"-i", // change draw order to reduce pdf complexity
"-j", "" + getSwfJpegQuality(), // JPEG Quality
"-s", "zoom=" + getSwfZoom(), // set zoom dpi