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 2016/08/12 09:00:36 UTC
svn commit: r1756131 - in
/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf:
base/baseMethods.lzx base/components/explorer/explorerBox.lzx
base/mainMethods.lzx settings.lzx video/editRecordStreamSWF10.lzx
Author: solomax
Date: Fri Aug 12 09:00:36 2016
New Revision: 1756131
URL: http://svn.apache.org/viewvc?rev=1756131&view=rev
Log:
[OPENMEETINGS-1408] more work on dialog
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/baseMethods.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/explorer/explorerBox.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/settings.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/baseMethods.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/baseMethods.lzx?rev=1756131&r1=1756130&r2=1756131&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/baseMethods.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/baseMethods.lzx Fri Aug 12 09:00:36 2016
@@ -114,7 +114,6 @@
this.setAttribute('loudnessAcitviation',canvas.myConfigSet.getPointer().xpathQuery('config/loudnessAcitviation/text()'));
this.setAttribute('webAppRootKey',canvas.myConfigSet.getPointer().xpathQuery('config/webAppRootKey/text()'));
- this.setAttribute('showWindowEffect',canvas.myConfigSet.getPointer().xpathQuery('config/showWindowEffect/text()'));
//Audio-Video-Settings
this.setAttribute('loudnessAcitviation',canvas.myConfigSet.getPointer().xpathQuery('config/loudnessAcitviation/text()'));
@@ -211,12 +210,18 @@
if (!!canvas.myinit) {
canvas.myinit();
} else {
+ canvas.showWindowEffect = 'n';
new lz.editRecordStreamSWF10(canvas.main_content,{
- name:"editRecordStream",
- doDefaultAnimation:false,
- isInterview:true,
- interviewPodId:this.parent.parent.interviewPodId,
- isSyncUpdate:true});
+ allowDragging: false,
+ dropShadow: false,
+ standalone: true,
+ name: "editRecordStream",
+ doDefaultAnimation: false,
+ isInterview: true,
+ interviewPodId: this.parent.parent.interviewPodId,
+ isSyncUpdate: true,
+ x: 0, y: 0, initY: 0
+ });
}
]]>
</method>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/explorer/explorerBox.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/explorer/explorerBox.lzx?rev=1756131&r1=1756130&r2=1756131&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/explorer/explorerBox.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/explorer/explorerBox.lzx Fri Aug 12 09:00:36 2016
@@ -33,10 +33,9 @@
</switch>
<attribute name="showWindowEffect" value="false" type="boolean" />
-
<attribute name="annimationStartStyle" value="center" type="string" />
-
<attribute name="annimationColor" value="$once{ canvas.getThemeColor('basebgcolorizer') }" type="string" />
+ <attribute name="dropShadow" value="true" type="boolean" />
<event name="animationInited" />
@@ -86,8 +85,11 @@
</method>
<method name="setShadow" args="bool">
+ <![CDATA[
+ if (!dropShadow) {
+ return;
+ }
this.hasshadow = bool;
- <![CDATA[
if (this.isinited){
this.normalMC = this.getDisplayObject();
//Debug.write(this.normalMC);
@@ -96,9 +98,9 @@
this.displacementMap = new DropShadowFilter();
this.normalMC.filters = [this.displacementMap];
}
- ]]>
- </method>
-
+ ]]>
+ </method>
+
<!--- The Title of this Box -->
<attribute name="title" value="defaulttitle" type="string" />
@@ -371,25 +373,25 @@
<view width="${ this.parent.width-2 }" height="${ this.parent.height-2 }"
x="1" y="1" bgcolor="$once{ canvas.getThemeColor('mainBackgroundColor') }" />
- <view x="1" y="1" width="${ this.parent.width-2 }" height="20" >
+ <view name="_titlebar" x="1" y="1" width="${ this.parent.width-2 }" height="20" >
<gradientview x="0" width="${ this.parent.width }" height="20"
colorFrom="$once{ canvas.getThemeColor('baseMousecolorizer') }"
colorTo="$once{ canvas.getThemeColor('styleMenuBarBaseColor') }" >
</gradientview>
- <text fontsize="10" height="17" x="6" y="1" text="${ this.parent.parent.title }"
+ <text fontsize="10" height="17" x="6" y="1" text="${ this.parent.parent.title }"
fgcolor="0xFFFFFF" resize="true" fontstyle="bold" />
-
- <view visible="${ this.parent.parent.closable }" x="${ this.parent.parent.width-20 }"
- y="2" resource="btn_presenter_close"
- onmouseover="this.setAttribute('frame',2)"
- onmouseout="this.setAttribute('frame',1)"
- onmousedown="this.setAttribute('frame',3)"
- onmouseup="this.setAttribute('frame',1)" >
+
+ <view visible="${ this.parent.parent.closable }" x="${ this.parent.parent.width-20 }"
+ y="2" resource="btn_presenter_close"
+ onmouseover="this.setAttribute('frame',2)"
+ onmouseout="this.setAttribute('frame',1)"
+ onmousedown="this.setAttribute('frame',3)"
+ onmouseup="this.setAttribute('frame',1)" >
<handler name="onclick">
this.parent.parent.close();
- </handler>
+ </handler>
</view>
</view>
<handler name="onaddsubview" args="v">
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx?rev=1756131&r1=1756130&r2=1756131&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx Fri Aug 12 09:00:36 2016
@@ -35,6 +35,7 @@
<method name="myinit">
<![CDATA[
+ this.setAttribute('showWindowEffect',canvas.myConfigSet.getPointer().xpathQuery('config/showWindowEffect/text()'));
hib.userScope = canvas.wicketroomid;
var src = hib.getUrl();
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/settings.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/settings.lzx?rev=1756131&r1=1756130&r2=1756131&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/settings.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/settings.lzx Fri Aug 12 09:00:36 2016
@@ -46,7 +46,6 @@
<include href="base/baseMethods.lzx" />
<include href="base/functions.lzx" />
<include href="base/components" />
- <include href="base/contentviews" />
<include href="base/hibernate" />
<include href="base/remote" />
<include href="resources/" />
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx?rev=1756131&r1=1756130&r2=1756131&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx Fri Aug 12 09:00:36 2016
@@ -51,6 +51,8 @@
<attribute name="myvideocontainer" value="null" />
+ <attribute name="standalone" value="false" type="boolean" />
+ <attribute name="initY" value="40" type="number" />
<attribute name="chosenCam" value="null" />
<attribute name="chosenMic" value="null" />
<attribute name="chosenSetting" value="null" />
@@ -112,6 +114,11 @@
<![CDATA[
//Make this view the upmost in the z-Index order
canvas.inner.bringToFront();
+ if (standalone) {
+ _titlebar.setAttribute('visible', false);
+ lz.Cursor.showHandCursor(false);
+ lz.Cursor.unlock();
+ }
this.counterDelegate = new LzDelegate(this, "count");
@@ -133,7 +140,7 @@
if (this.doDefaultAnimation && !canvas.isInterview) {
this._chooseDeviceAnimation.setAttribute('started', true);
} else {
- this.setAttribute("y", 40);
+ this.setAttribute("y", initY);
}
this.initItemsAndDefaultAttachCamera();
}
@@ -198,10 +205,10 @@
parent.setUserAVSettings.doCall();
]]>
- </handler>
- </netRemoteCallHib>
+ </handler>
+ </netRemoteCallHib>
- <netRemoteCallHib name="setUserAVSettings" funcname="setUserAVSettings" remotecontext="$once{ canvas.thishib }" >
+ <netRemoteCallHib name="setUserAVSettings" funcname="setUserAVSettings" remotecontext="$once{ canvas.thishib }" >
<netparam><method name="getValue">return parent.parent.chosenSetting;</method></netparam>
<netparam><method name="getValue">return parent.parent.remoteMessage;</method></netparam>
<netparam><method name="getValue">return parent.parent.cam_default_width;</method></netparam>
@@ -215,8 +222,8 @@
parent.currentClient = value;
parent.doStartConference();
]]>
- </handler>
- </netRemoteCallHib>
+ </handler>
+ </netRemoteCallHib>
<method name="storelocaldata">
<![CDATA[
@@ -786,7 +793,7 @@
width="${ parent.width-50 }" multiline="true" />
<!-- Remember Me -->
- <labelCheckbox name="holddatainSO" labelid="762" x="10" y="${ parent.height-20 }" >
+ <labelCheckbox name="holddatainSO" labelid="762" x="10" y="${ parent.height-20 }" visible="${ !parent.standalone }" >
<switch>
<when property="$as3">
<passthrough>
@@ -803,8 +810,8 @@
</handler>
</labelCheckbox>
- <simpleLabelButton fontsize="11" visibility="${ (canvas.isInterview) ? 'visible' : 'hidden' }"
- labelid="54" x="${ parent.width-220 }" y="${ parent.height-50 }" width="100">
+ <simpleLabelButton fontsize="11" visible="${ !parent.standalone && canvas.isInterview }" labelid="54" x="${ parent.width-220 }"
+ y="${ parent.height-50 }" width="100">
<handler name="onclick">
parent.cleanVideos();
this.parent.storelocaldata();
@@ -819,16 +826,16 @@
</handler>
</simpleLabelButton>
- <simpleLabelButton fontsize="11" visibility="${ (canvas.isInterview) ? 'visible' : 'hidden' }"
- labelid="918" x="${ parent.width-110 }" y="${ parent.height-50 }" width="100">
+ <simpleLabelButton fontsize="11" visible="${ !parent.standalone && canvas.isInterview }" labelid="918" x="${ parent.width-110 }"
+ y="${ parent.height-50 }" width="100">
<handler name="onclick">
parent.cleanVideos();
parent.close();
</handler>
</simpleLabelButton>
- <simpleLabelButton fontsize="11" visibility="${ (!canvas.isInterview) ? 'visible' : 'hidden' }"
- labelid="761" width="160" x="${ parent.width-170 }" y="${ parent.height-50 }" height="28">
+ <simpleLabelButton fontsize="11" visible="${ !parent.standalone && !canvas.isInterview }" labelid="761" width="160" x="${ parent.width-170 }"
+ y="${ parent.height-50 }" height="28">
<handler name="onclick">
parent.cleanVideos();
this.parent.storelocaldata();
@@ -843,6 +850,13 @@
</handler>
</simpleLabelButton>
+ <simpleLabelButton fontsize="11" visible="${ parent.standalone }" labelid="144" width="160" x="${ parent.width-170 }"
+ y="${ parent.height-50 }" height="28">
+ <handler name="onclick">
+ parent.cleanVideos();
+ this.parent.storelocaldata();
+ </handler>
+ </simpleLabelButton>
</class>
</library>