You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/03/02 16:14:01 UTC
svn commit: r1296244 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/src/base/components/ WebContent/src/modules/conference/
WebContent/src/modules/conference/conference/
WebContent/src/modules/conference/flexibleConferenceRoom/ WebContent/...
Author: sebawagner
Date: Fri Mar 2 15:14:00 2012
New Revision: 1296244
URL: http://svn.apache.org/viewvc?rev=1296244&view=rev
Log:
OPENMEETINGS-61 fix screensharing player to use the new audio/video components
++ UI Fixes, replaced icons in user list and refactored button for starting screensharing
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/miniIconsNew.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/resources/monitor_go.png (with props)
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/fixedWhiteboardPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/eventRoomSidebar.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/resources/krec_record.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/resources/media-record.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/resources/player_stop.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/resources/tool_delay.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/fileExplorerWindow.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListDetails.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/moderationMiniIconsEventUserList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebar.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/moderationPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/fileExplorer.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/miniIcons.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/library.lzx?rev=1296244&r1=1296243&r2=1296244&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/library.lzx Fri Mar 2 15:14:00 2012
@@ -21,6 +21,7 @@
<library>
<include href="iconView.lzx" />
+ <include href="miniIconsNew.lzx" />
<include href="resetCombobox.lzx" />
<include href="updatecheckbox.lzx" />
<include href="tableCombobox.lzx" />
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/miniIconsNew.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/miniIconsNew.lzx?rev=1296244&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/miniIconsNew.lzx (added)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/miniIconsNew.lzx Fri Mar 2 15:14:00 2012
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<library>
+
+ <class name="miniIconsNew" extends="view" >
+ <attribute name="innerResource" value="" type="string" />
+ <handler name="onmouseover">
+ if (this.showhandcursor) {
+ this.innnerView.setAttribute("x",this.innnerView.x-1);
+ this.innnerView.setAttribute("y",this.innnerView.y-1);
+ this.innnerView.setAttribute("height",this.innnerView.height+2);
+ this.innnerView.setAttribute("width",this.innnerView.width+2);
+ }
+ </handler>
+ <handler name="onmouseout">
+ if (this.showhandcursor) {
+ this.innnerView.setAttribute("x",this.innnerView.x+1);
+ this.innnerView.setAttribute("y",this.innnerView.y+1);
+ this.innnerView.setAttribute("height",this.innnerView.height-2);
+ this.innnerView.setAttribute("width",this.innnerView.width-2);
+ }
+ </handler>
+ <view name="innnerView" resource="$once{ parent.innerResource }" stretches="both"
+ width="$once{ parent.width }" height="$once{ parent.height }">
+
+ </view>
+ </class>
+
+</library>
\ No newline at end of file
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx?rev=1296244&r1=1296243&r2=1296244&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx Fri Mar 2 15:14:00 2012
@@ -11,6 +11,7 @@
canvas.thishib.switchMicMuted.setMute(publicSID, tMute);
};
canvas.videoComp_lc.as3ConnectionSuccess = function() {
+ //FIXME: Throws a Null Pointer Exception if the parent view was already destroyed
t.parent.as3ConnectionSuccess();
}
</handler>
@@ -50,13 +51,6 @@
</handler>
<!---
- set size of video objects
- -->
- <method name="initVideoContainer" args="offsetLength,videoWidth,videoHeight">
- canvas.lc.send(canvas.vid_lc_name, "initVideoContainer", canvas.publicSID,canvas.firstName,canvas.lastName,offsetLength,videoWidth,videoHeight);
- </method>
-
- <!---
Creates video object
-->
<method name="createVideo" args="publicSID,displayName,broadcastId,avsettings,interviewPodId,object">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListDetails.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListDetails.lzx?rev=1296244&r1=1296243&r2=1296244&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListDetails.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListDetails.lzx Fri Mar 2 15:14:00 2012
@@ -54,7 +54,7 @@
</class>
-<class name="roomListDetails" extends="view" bgcolor="0xFFFFFF" >
+<class name="roomListDetails" extends="view" >
<attribute name="roomid" value="0" type="number" />
<attribute name="roomname" value="" type="string" />
@@ -175,7 +175,7 @@
<labelText labelid="270" y="${parent._roomcomment.y}" width="50" />
<labelText name="user_label" labelid="407" y="${10 + parent._roomcomment.y + parent._roomcomment.height}" width="200" />
- <view name="_users" bgcolor="$once{ canvas.basebgcolorizer }" width="300" y="${30 + parent._roomcomment.y + parent._roomcomment.height}"
+ <view name="_users" width="300" y="${30 + parent._roomcomment.y + parent._roomcomment.height}"
height="${ parent.height - parent._users.y }" >
<method name="clearList">
for (var eg in this._users._cbtext.subviews)
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx?rev=1296244&r1=1296243&r2=1296244&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx Fri Mar 2 15:14:00 2012
@@ -147,7 +147,7 @@
width="${ canvas.width - parent._sidePanel.width }" />
<fixedFileExplorerWhiteboardPanel name="_whiteboard" labelid="615"
- y="0" x="${ parent._sidePanel.width }" restricted="true"
+ y="0" x="${ parent._sidePanel.width }"
width="${ canvas.width - parent._sidePanel.width }"
height="${ canvas.height - (parent._chatPanelStrict.height) -
((parent._chatPanelStrict.visibility == 'hidden') ? 6:28) + ((canvas.currentRoomObj.hideTopBar) ? 28:0)}" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx?rev=1296244&r1=1296243&r2=1296244&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx Fri Mar 2 15:14:00 2012
@@ -53,7 +53,6 @@
<include href="appointmentNotificationPopUp.lzx" />
<include href="baseRoomInnerList.lzx" />
<include href="baseConferenceRoom.lzx" />
- <include href="fixedWhiteboardPanel.lzx" />
<include href="flexibleConferenceRoom.lzx" />
<include href="restrictedConferenceRoom.lzx" />
<include href="interviewConferenceRoom.lzx" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/moderationMiniIconsEventUserList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/moderationMiniIconsEventUserList.lzx?rev=1296244&r1=1296243&r2=1296244&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/moderationMiniIconsEventUserList.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/moderationMiniIconsEventUserList.lzx Fri Mar 2 15:14:00 2012
@@ -130,7 +130,7 @@
<simplelayout axis="x" spacing="2" />
- <miniIcons name="_isMod" x="0" width="16" resource="participants_isMod_rsc"
+ <miniIconsNew name="_isMod" x="0" width="16" innerResource="participants_isMod_rsc"
height="16" showhandcursor="false">
<handler name="onclick">
<![CDATA[
@@ -138,9 +138,9 @@
]]>
</handler>
<labelTooltip name="_text" labelid="688" />
- </miniIcons>
+ </miniIconsNew>
- <miniIcons name="_isModAddbutton" opacity="0.5" x="0" width="16" resource="participants_isMod_rsc" height="16">
+ <miniIconsNew name="_isModAddbutton" opacity="0.5" x="0" width="16" innerResource="participants_isMod_rsc" height="16">
<handler name="onclick">
<![CDATA[
//Apply for Moderation
@@ -148,9 +148,9 @@
]]>
</handler>
<labelTooltip name="_text" labelid="685" />
- </miniIcons>
+ </miniIconsNew>
- <miniIcons name="_canDraw" x="20" width="16" resource="participants_allow_drawing_rsc"
+ <miniIconsNew name="_canDraw" x="20" width="16" innerResource="participants_allow_drawing_rsc"
height="16" showhandcursor="false" >
<attribute name="isActive" value="true" type="boolean" />
<handler name="onclick">
@@ -159,20 +159,20 @@
]]>
</handler>
<labelTooltip name="_text" labelid="689" />
- </miniIcons>
+ </miniIconsNew>
- <miniIcons name="_canDrawModerator" x="20" width="16" opacity="0.5"
- resource="participants_allow_drawing_rsc" height="16" showhandcursor="true">
+ <miniIconsNew name="_canDrawModerator" x="20" width="16" opacity="0.5"
+ innerResource="participants_allow_drawing_rsc" height="16" showhandcursor="true">
<handler name="onclick">
//Ask for Right to Draw on Whiteboard
var tDate = new Date();
canvas.thishib.sendMessageWithClient.sendMessage("applyForWhiteboard",tDate.getTime());
</handler>
<labelTooltip labelid="686" />
- </miniIcons>
+ </miniIconsNew>
- <miniIcons name="_allowScreen" x="40" width="16" height="16"
- resource="screen_allow_rsc" showhandcursor="false">
+ <miniIconsNew name="_allowScreen" x="40" width="16" height="16"
+ innerResource="screen_allow_rsc" showhandcursor="false">
<attribute name="isActive" value="true" type="boolean" />
<handler name="onclick">
<![CDATA[
@@ -180,20 +180,20 @@
]]>
</handler>
<labelTooltip name="_text" labelid="1071" />
- </miniIcons>
+ </miniIconsNew>
- <miniIcons name="_denyScreen" x="40" width="16" height="16" opacity="0.5"
- resource="screen_allow_rsc" showhandcursor="true">
+ <miniIconsNew name="_denyScreen" x="40" width="16" height="16" opacity="0.5"
+ innerResource="screen_allow_rsc" showhandcursor="true">
<handler name="onclick">
if ($debug) Debug.write("Allow Screen: ",canvas.refObj.publicSID);
var tDate = new Date();
canvas.thishib.sendMessageWithClient.sendMessage("applyForScreen",tDate.getTime());
</handler>
<labelTooltip labelid="1072" />
- </miniIcons>
+ </miniIconsNew>
- <miniIcons name="_allowRemote" x="60" width="16" height="16"
- resource="remote_allow_rsc" showhandcursor="false">
+ <miniIconsNew name="_allowRemote" x="60" width="16" height="16"
+ innerResource="remote_allow_rsc" showhandcursor="false">
<attribute name="isActive" value="true" type="boolean" />
<handler name="onclick">
<![CDATA[
@@ -201,21 +201,21 @@
]]>
</handler>
<labelTooltip name="_text" labelid="1081" />
- </miniIcons>
+ </miniIconsNew>
- <miniIcons name="_denyRemote" x="60" width="16" height="16" opacity="0.5"
- resource="remote_allow_rsc" showhandcursor="true">
+ <miniIconsNew name="_denyRemote" x="60" width="16" height="16" opacity="0.5"
+ innerResource="remote_allow_rsc" showhandcursor="true">
<handler name="onclick">
if ($debug) Debug.write("Allow Remote: ",parent.parent.parent.refObj.publicSID);
var tDate = new Date();
canvas.thishib.sendMessageWithClient.sendMessage("applyForRemote",tDate.getTime());
</handler>
<labelTooltip labelid="1080" />
- </miniIcons>
+ </miniIconsNew>
- <miniIcons name="_allowDevice" x="80" width="40" height="16" opacity="0.5"
- visible="$once{ parent.showAvIcons }" resource="av_allow_rsc" showhandcursor="true">
+ <miniIconsNew name="_allowDevice" x="80" width="40" height="16" opacity="0.5"
+ visible="$once{ parent.showAvIcons }" innerResource="av_allow_rsc" showhandcursor="true">
<handler name="onclick">
if ($debug) Debug.write("NOTHING: ",canvas.publicSID);
if (canvas.ismoderator) {
@@ -231,10 +231,10 @@
}
</handler>
<labelTooltip labelid="687" />
- </miniIcons>
+ </miniIconsNew>
- <miniIcons name="_denyDevice" x="80" width="40" height="16"
- visible="$once{ parent.showAvIcons }" resource="av_allow_rsc" showhandcursor="false">
+ <miniIconsNew name="_denyDevice" x="80" width="40" height="16"
+ visible="$once{ parent.showAvIcons }" innerResource="av_allow_rsc" showhandcursor="false">
<handler name="onclick">
if ($debug) Debug.write("DENY: ",canvas.publicSID);
//Nothing happens here
@@ -243,10 +243,10 @@
canvas.thishib.setBroadCastingFlag.doCall();
</handler>
<labelTooltip name="_text" labelid="690" />
- </miniIcons>
+ </miniIconsNew>
- <miniIcons name="_muteDevice" x="120" width="16" height="16"
- resource="mute_btn_rsc" showhandcursor="true">
+ <miniIconsNew name="_muteDevice" x="120" width="16" height="16"
+ innerResource="mute_btn_rsc" showhandcursor="true">
<handler name="onclick">
if (canvas.ismoderator) {
new lz.confirmationSingle(canvas.main_content._content.inner,{
@@ -266,9 +266,9 @@
}
</method>
<labelTooltip name="_tip" labelid="1394" />
- </miniIcons>
+ </miniIconsNew>
- <miniIcons name="_unMuteDevice" x="120" width="16" height="16" resource="unmute_btn_rsc"
+ <miniIconsNew name="_unMuteDevice" x="120" width="16" height="16" innerResource="unmute_btn_rsc"
showhandcursor="true" >
<handler name="onclick">
if (canvas.ismoderator) {
@@ -280,10 +280,10 @@
}
</handler>
<labelTooltip name="_tip" labelid="1395" />
- </miniIcons>
+ </miniIconsNew>
- <miniIcons name="_allowExclusiveAudio" x="60" width="16" height="16"
- resource="participants_exclusive_audio_rsc" showhandcursor="false">
+ <miniIconsNew name="_allowExclusiveAudio" x="60" width="16" height="16"
+ innerResource="participants_exclusive_audio_rsc" showhandcursor="false">
<attribute name="isActive" value="true" type="boolean" />
<handler name="onclick">
<![CDATA[
@@ -295,17 +295,17 @@
]]>
</handler>
<labelTooltip name="_text" labelid="1433" />
- </miniIcons>
+ </miniIconsNew>
- <miniIcons name="_denyExclusiveAudio" x="60" width="16" height="16" opacity="0.5"
- resource="participants_exclusive_audio_rsc" showhandcursor="true">
+ <miniIconsNew name="_denyExclusiveAudio" x="60" width="16" height="16" opacity="0.5"
+ innerResource="participants_exclusive_audio_rsc" showhandcursor="true">
<handler name="onclick">
if ($debug) Debug.write("Allow Give Exclusive Audio: ",canvas.publicSID);
var tDate = new Date();
canvas.thishib.sendMessageWithClient.sendMessage("applyForGiveExclusiveAudioOn",tDate.getTime());
</handler>
<labelTooltip labelid="1432" />
- </miniIcons>
+ </miniIconsNew>
</class>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx?rev=1296244&r1=1296243&r2=1296244&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx Fri Mar 2 15:14:00 2012
@@ -141,7 +141,7 @@
width="${ canvas.width - parent._sidePanel.width }" />
<fixedFileExplorerWhiteboardPanel name="_whiteboard" labelid="615"
- y="0" x="${ parent._sidePanel.width }" restricted="true"
+ y="0" x="${ parent._sidePanel.width }"
width="${ canvas.width - parent._sidePanel.width }"
height="${ canvas.height - (parent._chatPanelStrict.height) - ((parent._chatPanelStrict.visibility == 'hidden') ? 0:28) }" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebar.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebar.lzx?rev=1296244&r1=1296243&r2=1296244&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebar.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/conferenceRoomSidebar.lzx Fri Mar 2 15:14:00 2012
@@ -20,7 +20,7 @@
-->
<library>
-<class name="conferenceRoomSidebar" extends="view" width="280"
+<class name="conferenceRoomSidebar" extends="view" width="280" bgcolor="0xFFFFFF"
height="${ canvas.height - ((canvas.currentRoomObj.hideTopBar) ? 0:28) }" y="0" clip="true">
<attribute name="selected" value="null" />
@@ -98,10 +98,10 @@
</view>
- <fileExplorer name="_files" y="16" width="$once{ parent.width-12 }"
- height="${ parent.height-216 }" visibility="hidden" />
+ <fileExplorer name="_files" y="22" width="$once{ parent.width-12 }"
+ height="${ parent.height-222 }" visibility="hidden" />
- <participants name="_videocontainer" y="36" userNewVideoContainer="true"
+ <participants name="_videocontainer" y="36"
width="$once{ parent.width-10 }"
height="${ parent.height-((canvas.currentRoomObj.hideActivitiesAndActions == true) ? 36:236) }" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx?rev=1296244&r1=1296243&r2=1296244&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/roomSidebar/restrictedRoomSidebar.lzx Fri Mar 2 15:14:00 2012
@@ -20,14 +20,14 @@
-->
<library>
-<class name="restrictedRoomSidebar" extends="view" width="280"
+<class name="restrictedRoomSidebar" extends="view" width="280" bgcolor="0xFFFFFF"
height="${ canvas.height - 28 }" y="0" clip="true">
<attribute name="selected" value="null" />
<attribute name="isOpen" value="true" type="boolean"/>
- <attribute name="restricted" value="false" type="boolean" />
+ <attribute name="restricted" value="true" type="boolean" />
<attribute name="listType" value="eventUserListTable" type="string" />
@@ -55,11 +55,11 @@
if (this.selected.name == "userTabButton") {
if ($debug) Debug.write("-- userTabButton");
this._files.setAttribute("visibility","hidden");
- this._videocontainer._participants.setAttribute("visibility","visible");
+ this._participants.setAttribute("visibility","visible");
} else if (this.selected.name == "filesTabButton") {
if ($debug) Debug.write("-- filesTabButton");
this._files.setAttribute("visibility","visible");
- this._videocontainer._participants.setAttribute("visibility","hidden");
+ this._participants.setAttribute("visibility","hidden");
}
]]>
</method>
@@ -112,10 +112,10 @@
</view>
- <fileExplorer name="_files" y="16" width="$once{ parent.width-12 }"
- height="${ parent.height-216 }" visibility="hidden" />
+ <fileExplorer name="_files" y="22" width="$once{ parent.width-12 }"
+ height="${ parent.height-222 }" visibility="hidden" />
- <restrictedUserList name="_videocontainer" y="36"
+ <restrictedUserList name="_participants" y="36"
width="$once{ parent.width-10 }"
height="${ parent.height-((canvas.currentRoomObj.hideActivitiesAndActions == true) ? 36:236) }" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/library.lzx?rev=1296244&r1=1296243&r2=1296244&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/library.lzx Fri Mar 2 15:14:00 2012
@@ -19,12 +19,15 @@
-->
<library>
- <resource name="applyformodicon" src="resources/kdmconfig.png" />
- <resource name="start_recording_conf" src="resources/media-record.png" />
- <resource name="stop_recording_conf" src="resources/player_stop.png" />
+
+ <resource name="applyformodicon_rsc" src="resources/kdmconfig.png" />
- <include href="applyForModeration.lzx" />
- <include href="moderationPanel.lzx" />
- <include href="responseForModeration.lzx" />
+ <!-- FamFam Icon Creative Commons -->
+ <resource name="start_screensharing_rsc" src="resources/monitor_go.png" />
+
+ <include href="applyForModeration.lzx" />
+ <include href="moderationPanel.lzx" />
+ <include href="responseForModeration.lzx" />
<include href="recordingStartWin.lzx"/>
+
</library>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/moderationPanel.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/moderationPanel.lzx?rev=1296244&r1=1296243&r2=1296244&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/moderationPanel.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/moderationPanel.lzx Fri Mar 2 15:14:00 2012
@@ -131,79 +131,28 @@
<labelText name="_roomName" fgcolor="0xFFFFFF" y="4" fontstyle="bold" fontsize="12" />
- <!--
- <labelText name="mymodText" resize="true" fgcolor="0xFFFFFF" y="6" labelid="98" />
-
- <resetCombobox name="currentModerators" width="170" y="4" editable="false"
- shownitems="7" />
- -->
-
- <simpleLabelButton name="mod_btn"
- visible="${ (canvas.ismoderator) ? false : true }"
- width="30" height="24" y="2" style="itemStyle">
+ <miniIconsNew name="mod_btn" y="6" innerResource="applyformodicon_rsc" width="16" height="16"
+ visible="${ (canvas.ismoderator) ? false : true }" showhandcursor="true">
<handler name="onclick">
//We do only ask the Moderator(s) to change Moderation
//new lz.applyForModeration(canvas.main_content._content.inner);
canvas.thishib.applyForModeration.doCall();
</handler>
- <view x="7" y="4" name="infoview" resource="applyformodicon" />
<labelTooltip inittwice="true" labelid="906" />
- </simpleLabelButton>
+ </miniIconsNew>
- <!--
- Uncomment when the recording functionality is back
- -->
-
- <!--
- <labelText labelid="417" y="6" width="100" fgcolor="0xFFFFFF"
- visibility="$once{ canvas.showRecording }" />
-
- <simpleLabelButton name="sta_btn" width="30" height="24" y="2" style="itemStyle"
- visibility="$once{ canvas.showRecording }">
- <handler name="oninit">
- if (canvas.showRecording == "hidden") {
- this.destroy();
- }
- </handler>
- <handler name="onclick">
- canvas.thishib.checkForRecording.doCall();
- </handler>
- <view resource="start_recording_conf" x="3" y="1" />
- <labelTooltip labelid="415" />
- </simpleLabelButton>
-
- <simpleLabelButton name="stp_btn" width="30" height="24" y="2" style="itemStyle"
- visibility="hidden">
- <handler name="onclick">
- parent.stopRecordMeetingStream.doCall();
- </handler>
- <view resource="stop_recording_conf" x="7" y="4" />
- <labelTooltip labelid="416" />
- </simpleLabelButton>
-
- <netRemoteCallHib name="stopRecordMeetingStream" remotecontext="$once{ canvas.thishib }"
- funcname="streamservice.stopRecordMeetingStream" >
- <netparam><method name="getValue">return parent.parent.recordingsName;</method></netparam>
- <handler name="ondata" args="value">
- //The onResult-Handler will be called be the rtmpconnection
- Debug.write("+++++++++++++++++ stopRecordingShow: ",value);
- </handler>
- </netRemoteCallHib>
- -->
-
- <simpleLabelButton name="_doShare" labelid="239" height="24"
- visible="${canvas.currentRoomObj.hideScreenSharing ? false : ((canvas.ismoderator) ? true : ((canvas.isAllowedToScreenShare) ? true : false )) }"
- style="itemStyle" width="210" y="2">
+ <miniIconsNew name="_doShare" y="6" innerResource="start_screensharing_rsc" width="16" height="16"
+ showhandcursor="true"
+ visible="${canvas.currentRoomObj.hideScreenSharing ? false : ((canvas.ismoderator) ? true : ((canvas.isAllowedToScreenShare) ? true : false )) }" >
<handler name="onclick">
- //canvas._drawarea.setModus('plain');
this.parent.checkSharerSession.doCall();
</handler>
- <view y="1" x="2" resource="background_screenview_rsc" />
- </simpleLabelButton>
+ <labelTooltip labelid="239" />
+ </miniIconsNew>
- <!-- -->
<labelText name="_inner" fgcolor="0xFF3300" y="4" />
+ <view width="2" />
</class>
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/resources/monitor_go.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/resources/monitor_go.png?rev=1296244&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/moderation/resources/monitor_go.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/library.lzx?rev=1296244&r1=1296243&r2=1296244&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/library.lzx Fri Mar 2 15:14:00 2012
@@ -20,8 +20,10 @@
-->
<library>
+ <!-- FamFam Icon Creative Commons -->
<resource name="right_isactive_rsc" src="resources/accept.png" />
+ <!-- FamFam Icon Creative Commons -->
<resource name="right_notactive_rsc" src="resources/delete.png" />
<resource name="participants_isMod_rsc" src="resources/kdmconfig.png" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantList.lzx?rev=1296244&r1=1296243&r2=1296244&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantList.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantList.lzx Fri Mar 2 15:14:00 2012
@@ -227,13 +227,13 @@
<view width="1" height="${ parent.parent.height }" x="80"
bgcolor="$once{ canvas.basebgcolorizer }" />
- <view name="_icon_remote" x="82" y="3" resource="participants_exclusive_audio_rsc" onclick="" showhandcursor="false">
+ <view name="_icon_exclusive_audio" x="82" y="3" resource="participants_exclusive_audio_rsc" onclick="" showhandcursor="false">
<labelTooltip labelid="1423" />
</view>
<view width="1" height="${ parent.parent.height }" x="100"
bgcolor="$once{ canvas.basebgcolorizer }" />
- <view name="_icon_sync" x="102" y="3" resource="av_allow_rsc" onclick="" showhandcursor="false">
+ <view name="_icon_av_allow" x="102" y="3" resource="av_allow_rsc" onclick="" showhandcursor="false">
<labelTooltip labelid="610" />
</view>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx?rev=1296244&r1=1296243&r2=1296244&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participants.lzx Fri Mar 2 15:14:00 2012
@@ -26,11 +26,6 @@
<!--- holds a references to the videoview which is broadcasting -->
<attribute name="broadCastViewRef" value="null" />
- <!--
- This is a variable to make it backwards compatible to the old room layout
- -->
- <attribute name="userNewVideoContainer" value="false" type="boolean"/>
-
<handler name="oninit">
//set modus
canvas.thishib.modus = "conference";
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx?rev=1296244&r1=1296243&r2=1296244&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx Fri Mar 2 15:14:00 2012
@@ -65,7 +65,6 @@
//The user is already in the correct Scope
this.reconnectSuccess();
}
- _videoviewcontent.initVideoContainer(40, 100, 100);
</handler>
<commonVideoComponentAdapter name="_videoviewcontent"/>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx?rev=1296244&r1=1296243&r2=1296244&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx Fri Mar 2 15:14:00 2012
@@ -21,8 +21,7 @@
<library>
<class name="restrictedUserListInner" extends="baseRoomInnerList"
- width="$once{ parent.width }" height="${ parent.height }"
- bgcolor="$once{ canvas.basebgcolorizer }" >
+ width="$once{ parent.width }" height="${ parent.height }" >
<attribute name="selectedItem" value="null" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx?rev=1296244&r1=1296243&r2=1296244&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx Fri Mar 2 15:14:00 2012
@@ -172,7 +172,7 @@
</netRemoteCallHib>
<!-- inn.inn.inn view would be setted object by above ondata hander. -->
- <view name="inn" width="480" height="${ parent.height }" bgcolor="$once{ canvas.basebgcolorizer }" >
+ <view name="inn" width="480" height="${ parent.height }" >
<view name="inn" x="1" y="1" width="478" height="${ parent.height-2 }"
bgcolor="0xFFFFFF" clip="true" >
<view name="inn" layout="axis:y;spacing:1"/>
@@ -233,7 +233,7 @@
</netRemoteCallHib>
<!-- inn.inn.inn view would be setted object by above ondata hander. -->
- <view name="inn" width="480" height="${ parent.height }" bgcolor="$once{ canvas.basebgcolorizer }" >
+ <view name="inn" width="480" height="${ parent.height }" >
<view name="inn" x="1" y="1" width="478" height="${ parent.height-2 }" bgcolor="0xFFFFFF" clip="true" >
<view name="inn" layout="axis:y;spacing:1"/>
<vscrollbar />
@@ -317,7 +317,7 @@
</netRemoteCallHib>
<!-- inn.inn.inn view would be setted object by above ondata hander. -->
- <view name="inn" width="480" height="${ parent.height }" bgcolor="$once{ canvas.basebgcolorizer }" >
+ <view name="inn" width="480" height="${ parent.height }" >
<view name="inn" x="1" y="1" width="478" height="${ parent.height-2 }" bgcolor="0xFFFFFF" clip="true" >
<view name="inn" layout="axis:y;spacing:1"/>
<vscrollbar />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/fileExplorer.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/fileExplorer.lzx?rev=1296244&r1=1296243&r2=1296244&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/fileExplorer.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/fileExplorer.lzx Fri Mar 2 15:14:00 2012
@@ -316,20 +316,6 @@
</method>
<!--
- public FileExplorerObject getFileExplorerByRoom(String SID, Long room_id)
-
- <netRemoteCallHib name="getFileExplorerByRoom" funcname="fileservice.getFileExplorerByRoom"
- remotecontext="$once{ canvas.thishib }" >
- <netparam><method name="getValue">return canvas.sessionId;</method></netparam>
- <netparam><method name="getValue">return hib.currentroomid;</method></netparam>
- <handler name="ondata" args="value">
- if ($debug) Debug.write("getFileExplorerByRoom: ",value);
- parent.parseRootItems(value);
- </handler>
- </netRemoteCallHib>
- -->
-
- <!--
Parse Items and generate Output
-->
<method name="parseRootItems" args="roomObject">
@@ -515,19 +501,6 @@
<!--
Borders
- -->
-
- <view name="_bg1" bgcolor="$once{ canvas.basebgcolorizer }" width="$once{ parent.width }"
- x="0" y="14" height="${ parent.height-14 }" />
-
- <view name="_bg2" bgcolor="0xFFFFFF" x="1" y="14" width="$once{ parent.width - 2 }"
- height="${ parent.height-15 }" />
-
- <!--
- <view name="_border1a" x="0" y="0" width="1"
- height="14" bgcolor="$once{ canvas.basebgcolorizer }" />
- <view name="_border1b" x="${ parent.width-1 }" y="0" width="1"
- height="14" bgcolor="$once{ canvas.basebgcolorizer }" />
-->
<view name="_border2" x="0" y="${ 33 + parent._documentsTabs.height }" width="$once{ parent.width }"
@@ -605,7 +578,7 @@
<view name="_filearea" x="1" y="${ 34 + parent._documentsTabs.height }" clip="true"
height="${ parent.height - 35 - parent._documentsTabs.height - parent._userSpace.height }"
- width="$once{ parent.width - 2 }">
+ width="$once{ parent.width }">
<attribute name="currentTrackGroupName" value="fileExplorer" type="string" />
@@ -621,7 +594,7 @@
<hscrollbar name="_hscrollbar" />
</view>
- <view name="_userSpace" height="40" valign="bottom" width="$once{ parent.width - 2 }">
+ <view name="_userSpace" height="40" valign="bottom" width="$once{ parent.width }">
<labelText name="_userHomeSizeLabel" labelid="923" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/library.lzx?rev=1296244&r1=1296243&r2=1296244&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/plugins/fileexplorer/library.lzx Fri Mar 2 15:14:00 2012
@@ -27,7 +27,6 @@
<include href="dynamicFileName.lzx" />
<include href="dragItemFileExplorer.lzx" />
- <include href="fileExplorerWindow.lzx" />
<include href="fileExplorer.lzx" />
<resource name="drag_n_drop_rsc">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx?rev=1296244&r1=1296243&r2=1296244&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/commonVideoViewContentSWF10.lzx Fri Mar 2 15:14:00 2012
@@ -24,7 +24,6 @@
//client.reconnect = this.reconnect;
client.createEditRecordStream = this.createEditRecordStream;
- client.initVideoContainer = this.initVideoContainer;
client.createVideoObject = this.createVideoObject;
client.createVideo = this.createVideo;
client.getVideoObjectByPublicSID = this.getVideoObjectByPublicSID;
@@ -59,15 +58,6 @@
</method>
-->
- <method name="initVideoContainer" args="publicSID,firstName,lastName,offsetLength,videoWidth,videoHeight">
- canvas.setAttribute("publicSID",publicSID);
- canvas.setAttribute("firstName",firstName);
- canvas.setAttribute("lastName",lastName);
- this.setAttribute("offsetLength",offsetLength);
- this.setAttribute("videoWidth",videoWidth);
- this.setAttribute("videoHeight",videoHeight);
- </method>
-
<method name="createEditRecordStream" args="syncUpdate,isInterview,interviewPodId">
if($debug) Debug.info("createEditRecordStream,",syncUpdate,isInterview,interviewPodId);
if (canvas.inner.editRecordStream != null)
@@ -113,19 +103,19 @@
vidContainer.setAttribute('chatpartnername',displayName);
if (avsettings=="n"){
vidContainer.setVideouserProfilePic(object);
+ vidContainer.setAttribute("visibility","hidden");
} else if (avsettings=="a"){
vidContainer.setVideouserProfilePic(object);
if ($debug) Debug.warn("start play");
vidContainer._chatvideoinner._videostream.playStream(broadcastId,-1);
vidContainer.setAttribute("visibility","visible");
} else {
+ //this means avsettings is either: "v" or "av"
vidContainer.setDefaultVideoSize(object.VWidth,object.VHeight);
vidContainer._chatvideoinner._videostream.playStream(broadcastId,-1);
vidContainer.setAttribute("visibility","visible");
}
- //vidContainer.updateAVSettingsSymbol(object);
vidContainer.setAttribute("interviewPodId", interviewPodId);
-
vidContainer.updateAVSettingsSymbol(object);
}
@@ -142,44 +132,17 @@
]]>
</method>
- <!--
- <method name="addClientItem" args="connectedSince,isMod,streamid,username,room_id,formatedDate,position,color,object">
- <![CDATA[
- if ($debug) Debug.write("### initializeStreams addClientItem: ",connectedSince,isMod,streamid,username,room_id,formatedDate);
-
- if (canvas.publicSID != object.publicSID){
-
-
- var myvideocontainer = this.getNewVideoObjectByPos(object.publicSID);
- myvideocontainer.clientVars = object;
- myvideocontainer.setAttribute('chatpartnername',object.firstname+' '+object.lastname);
- if ($debug) Debug.write("addClientItem avsettings: ",object.avsettings);
- if (object.avsettings=="n" || object.avsettings=="a"){
- myvideocontainer.setVideouserProfilePic(object);
- }
- myvideocontainer.updateAVSettingsSymbol(object);
-
- }
-
- ]]>
- </method>
- -->
-
<method name="getVideoObjectByPublicSID" args="publicSID">
<![CDATA[
if ($debug) Debug.write("getVideoObjectByPublicSid SEARCH: ",publicSID);
-
for (var i=0;i<this.subviews.length;i++){
if ($debug) Debug.write("this.subviews[i].publicSID ",this.subviews[i].publicSID);
if (this.subviews[i].publicSID==publicSID){
return this.subviews[i];
}
}
-
if ($debug) Debug.warn(" - getVideoObjectByPublicSID - DID NOT FIND THE USER BY ",publicSID);
-
return null;
-
]]>
</method>
@@ -221,9 +184,7 @@
});
this.broadCastViewRef._chatvideoinner.r.destroy();
-
if ($debug) Debug.write("getNewVideoObject canvas.userobject ",publicSID,canvas.userobject);
-
this.broadCastViewRef.setAttribute('chatpartnername',canvas.userobject.firstname+' '+canvas.userobject.lastname);
}
return this.broadCastViewRef;
@@ -237,9 +198,7 @@
return this.subviews[i];
}
}
-
if ($debug) Debug.warn(" - getVideoObjectByInterviewPodId - DID NOT FIND THE USER BY ",interviewPodId);
-
return null;
]]>
</method>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/miniIcons.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/miniIcons.lzx?rev=1296244&r1=1296243&r2=1296244&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/miniIcons.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/miniIcons.lzx Fri Mar 2 15:14:00 2012
@@ -2,6 +2,7 @@
<library>
<class name="miniIcons" extends="view" stretches="both">
+ <attribute name="showhandcursor" value="true" type="boolean" />
<handler name="onmouseover">
if (this.showhandcursor) {
this.setAttribute("x",this.x-1);
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx?rev=1296244&r1=1296243&r2=1296244&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx Fri Mar 2 15:14:00 2012
@@ -307,10 +307,8 @@
<handler name="oninit">
<![CDATA[
- if (false) { //canvas.currentRoomObject.isAudioOnly
+ if (canvas.currentRoomObject.isAudioOnly) {
this.addItem(canvas.getLabelName(449),"a");
- //this.addItem(canvas.getLabelName(845),"s");
- //this.addItem(canvas.getLabelName(846),"sv");
this.addItem(canvas.getLabelName(451),"n");
} else {
this.addItem(canvas.getLabelName(448),"av");
@@ -321,18 +319,16 @@
this.addItem(canvas.getLabelName(451),"n");
}
- //var r = "av";
-
var t:SharedObject = SharedObject.getLocal('userdata');
var g = t.data;
var cam = null;
if (g!=null){
- var cam = g["avstored"];
+ var avstored = g["avstored"];
}
- var tItem = this.getItem(String(cam));
+ var tItem = this.getItem(String(avstored));
if (tItem != null) {
- this.selectItem(String(cam));
+ this.selectItem(String(avstored));
} else {
this.selectItemAt(0);
}
@@ -368,9 +364,9 @@
this.parent.availibleMicsLabel.setAttribute("visibility",micVisible);
this.parent.availibleMics.setAttribute("visibility",micVisible);
this.parent.infoTextNoAV.setAttribute("visibility",textVisible);
- this.parent.availibleResolutionsLabel.setAttribute("visibility",camVisible);
- this.parent.availibleResolutionsWarning.setAttribute("visibility",camVisible);
- this.parent.availibleResolutions.setAttribute("visibility",camVisible);
+ this.parent.availibleResolutionsLabel.setAttribute("visibility",((canvas.isInterview) ? 'hidden' : camVisible));
+ this.parent.availibleResolutionsWarning.setAttribute("visibility",((canvas.isInterview) ? 'hidden' : camVisible));
+ this.parent.availibleResolutions.setAttribute("visibility",((canvas.isInterview) ? 'hidden' : camVisible));
]]>
</handler>
</resetCombobox>
@@ -448,18 +444,15 @@
fontsize="11" x="10" y="180" visibility="hidden" />
<labelText name="availibleResolutionsLabel" labelid="1429"
- fontsize="11" x="10" y="164" width="$once{ parent.width-20 }"
- visibility="${ (!canvas.isInterview) ? 'visible' : 'hidden' }" />
+ fontsize="11" x="10" y="164" width="$once{ parent.width-20 }" />
<view name="availibleResolutionsWarning" x="272" y="164"
- resource="warning_icon_popup_devices_rsc" clickable="true"
- visibility="${ (!canvas.isInterview) ? 'visible' : 'hidden' }">
+ resource="warning_icon_popup_devices_rsc" clickable="true">
<labelTooltip multiline="true" labelid="1430" />
</view>
<resetCombobox fontsize="11" name="availibleResolutions" x="10" shownitems="10"
- y="184" width="280" editable="false"
- visibility="${ (!canvas.isInterview) ? 'visible' : 'hidden' }">
+ y="184" width="280" editable="false">
<!--- @keywords private -->
<attribute name="counter" value="0" />
<handler name="onselect" args="item">
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java?rev=1296244&r1=1296243&r2=1296244&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java Fri Mar 2 15:14:00 2012
@@ -2189,6 +2189,11 @@ public class ScopeApplicationAdapter ext
return 1;
}
+ /**
+ * send status for shared browsing to all members except self
+ * @param newMessage
+ * @return
+ */
@SuppressWarnings({ "rawtypes" })
public synchronized int sendBrowserMessageToMembers(Object newMessage) {
try {
@@ -2222,6 +2227,11 @@ public class ScopeApplicationAdapter ext
return 1;
}
+ /**
+ * wrapper method
+ * @param newMessage
+ * @return
+ */
public synchronized int sendMessageToMembers(Object newMessage) {
try {
@@ -2238,13 +2248,15 @@ public class ScopeApplicationAdapter ext
* General sync mechanism for all messages that are send from within the
* scope of the current client, but:
* <ul>
- * <li>do not send to self</li>
+ * <li>optionally do not send to self (see param: sendSelf)</li>
* <li>do not send to clients that are screen sharing clients</li>
+ * <li>do not send to clients that are audio/video clients (or potentially ones)</li>
* <li>do not send to connections where no RoomClient is registered</li>
* </ul>
*
* @param remoteMethodName
* @param newMessage
+ * @param sendSelf
* @return
*/
private synchronized int syncMessageToCurrentScope(String remoteMethodName, Object newMessage, boolean sendSelf) {
@@ -2262,15 +2274,15 @@ public class ScopeApplicationAdapter ext
.getClientByStreamId(conn.getClient().getId());
if (rcl == null) {
- // rcl can be null if there are network problems
+ // RoomClient can be null if there are network problems
continue;
} else if (rcl.getIsScreenClient() != null && rcl
.getIsScreenClient()) {
- // screensharing clients do not receive events
+ // screen sharing clients do not receive events
continue;
} else if (rcl.getIsAVClient() == null || rcl
.getIsAVClient()) {
- // avclient or potential AVClients do not receive events
+ // AVClients or potential AVClients do not receive events
continue;
} else if (current.getClient().getId().equals(
conn.getClient().getId()) && !sendSelf) {
@@ -2291,6 +2303,11 @@ public class ScopeApplicationAdapter ext
return 1;
}
+ /**
+ * wrapper method
+ * @param newMessage
+ * @return
+ */
public synchronized int sendMessageWithClient(Object newMessage) {
try {
sendMessageWithClientWithSyncObject(newMessage, false);
@@ -2302,6 +2319,12 @@ public class ScopeApplicationAdapter ext
return 1;
}
+ /**
+ * wrapper method
+ * @param newMessage
+ * @param sync
+ * @return
+ */
public synchronized int sendMessageWithClientWithSyncObject(Object newMessage, boolean sync) {
try {
IConnection current = Red5.getConnectionLocal();