Revision: 4018
Author: solomax666
Date: Wed Aug 3 09:52:10 2011
Log: - user drawing statuses are added; 'user left' activity status is
added
http://code.google.com/p/openmeetings/source/detail?r=4018
Modified:
/trunk/singlewebapp/WebContent/languages/arabic.xml
/trunk/singlewebapp/WebContent/languages/bulgarian.xml
/trunk/singlewebapp/WebContent/languages/catalan.xml
/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
/trunk/singlewebapp/WebContent/languages/czech.xml
/trunk/singlewebapp/WebContent/languages/danish.xml
/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
/trunk/singlewebapp/WebContent/languages/deutsch.xml
/trunk/singlewebapp/WebContent/languages/english.xml
/trunk/singlewebapp/WebContent/languages/finnish.xml
/trunk/singlewebapp/WebContent/languages/french.xml
/trunk/singlewebapp/WebContent/languages/galician.xml
/trunk/singlewebapp/WebContent/languages/greek.xml
/trunk/singlewebapp/WebContent/languages/hebrew.xml
/trunk/singlewebapp/WebContent/languages/hungarian.xml
/trunk/singlewebapp/WebContent/languages/indonesian.xml
/trunk/singlewebapp/WebContent/languages/italian.xml
/trunk/singlewebapp/WebContent/languages/japanese.xml
/trunk/singlewebapp/WebContent/languages/korean.xml
/trunk/singlewebapp/WebContent/languages/persian.xml
/trunk/singlewebapp/WebContent/languages/polish.xml
/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
/trunk/singlewebapp/WebContent/languages/portugues.xml
/trunk/singlewebapp/WebContent/languages/russian.xml
/trunk/singlewebapp/WebContent/languages/slovak.xml
/trunk/singlewebapp/WebContent/languages/spanish.xml
/trunk/singlewebapp/WebContent/languages/swedish.xml
/trunk/singlewebapp/WebContent/languages/thai.xml
/trunk/singlewebapp/WebContent/languages/turkish.xml
/trunk/singlewebapp/WebContent/languages/ukrainian.xml
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
=======================================
--- /trunk/singlewebapp/WebContent/languages/arabic.xml Sun Jul 31 09:55:15
2011
+++ /trunk/singlewebapp/WebContent/languages/arabic.xml Wed Aug 3 09:52:10
2011
@@ -4108,4 +4108,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/bulgarian.xml Sun Jul 31
09:55:15 2011
+++ /trunk/singlewebapp/WebContent/languages/bulgarian.xml Wed Aug 3
09:52:10 2011
@@ -4106,4 +4106,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/catalan.xml Sun Jul 31
09:55:15 2011
+++ /trunk/singlewebapp/WebContent/languages/catalan.xml Wed Aug 3
09:52:10 2011
@@ -4107,4 +4107,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/chinese simplified.xml Sun Jul
31 09:55:15 2011
+++ /trunk/singlewebapp/WebContent/languages/chinese simplified.xml Wed
Aug 3 09:52:10 2011
@@ -4107,4 +4107,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/chinese traditional.xml Sun
Jul 31 09:55:15 2011
+++ /trunk/singlewebapp/WebContent/languages/chinese traditional.xml Wed
Aug 3 09:52:10 2011
@@ -4113,4 +4113,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/czech.xml Sun Jul 31 09:55:15
2011
+++ /trunk/singlewebapp/WebContent/languages/czech.xml Wed Aug 3 09:52:10
2011
@@ -4107,4 +4107,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/danish.xml Sun Jul 31 09:55:15
2011
+++ /trunk/singlewebapp/WebContent/languages/danish.xml Wed Aug 3 09:52:10
2011
@@ -4106,4 +4106,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Sun Jul
31 09:55:15 2011
+++ /trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Wed Aug
3 09:52:10 2011
@@ -4107,4 +4107,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/deutsch.xml Sun Jul 31
09:55:15 2011
+++ /trunk/singlewebapp/WebContent/languages/deutsch.xml Wed Aug 3
09:52:10 2011
@@ -4107,4 +4107,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/english.xml Sun Jul 31
09:55:15 2011
+++ /trunk/singlewebapp/WebContent/languages/english.xml Wed Aug 3
09:52:10 2011
@@ -4107,4 +4107,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/finnish.xml Sun Jul 31
09:55:15 2011
+++ /trunk/singlewebapp/WebContent/languages/finnish.xml Wed Aug 3
09:52:10 2011
@@ -4106,4 +4106,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/french.xml Sun Jul 31 09:55:15
2011
+++ /trunk/singlewebapp/WebContent/languages/french.xml Wed Aug 3 09:52:10
2011
@@ -4107,4 +4107,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/galician.xml Sun Jul 31
09:55:15 2011
+++ /trunk/singlewebapp/WebContent/languages/galician.xml Wed Aug 3
09:52:10 2011
@@ -4107,4 +4107,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/greek.xml Sun Jul 31 09:55:15
2011
+++ /trunk/singlewebapp/WebContent/languages/greek.xml Wed Aug 3 09:52:10
2011
@@ -4107,4 +4107,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/hebrew.xml Sun Jul 31 09:55:15
2011
+++ /trunk/singlewebapp/WebContent/languages/hebrew.xml Wed Aug 3 09:52:10
2011
@@ -4107,4 +4107,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/hungarian.xml Sun Jul 31
09:55:15 2011
+++ /trunk/singlewebapp/WebContent/languages/hungarian.xml Wed Aug 3
09:52:10 2011
@@ -4107,4 +4107,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/indonesian.xml Sun Jul 31
09:55:15 2011
+++ /trunk/singlewebapp/WebContent/languages/indonesian.xml Wed Aug 3
09:52:10 2011
@@ -4107,4 +4107,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/italian.xml Sun Jul 31
09:55:15 2011
+++ /trunk/singlewebapp/WebContent/languages/italian.xml Wed Aug 3
09:52:10 2011
@@ -4107,4 +4107,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/japanese.xml Sun Jul 31
09:55:15 2011
+++ /trunk/singlewebapp/WebContent/languages/japanese.xml Wed Aug 3
09:52:10 2011
@@ -4107,4 +4107,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/korean.xml Sun Jul 31 09:55:15
2011
+++ /trunk/singlewebapp/WebContent/languages/korean.xml Wed Aug 3 09:52:10
2011
@@ -4107,4 +4107,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/persian.xml Sun Jul 31
09:55:15 2011
+++ /trunk/singlewebapp/WebContent/languages/persian.xml Wed Aug 3
09:52:10 2011
@@ -4107,4 +4107,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/polish.xml Sun Jul 31 09:55:15
2011
+++ /trunk/singlewebapp/WebContent/languages/polish.xml Wed Aug 3 09:52:10
2011
@@ -4181,4 +4181,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/portugues brazil.xml Sun Jul
31 09:55:15 2011
+++ /trunk/singlewebapp/WebContent/languages/portugues brazil.xml Wed Aug
3 09:52:10 2011
@@ -4113,4 +4113,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/portugues.xml Sun Jul 31
09:55:15 2011
+++ /trunk/singlewebapp/WebContent/languages/portugues.xml Wed Aug 3
09:52:10 2011
@@ -4107,4 +4107,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/russian.xml Sun Jul 31
09:55:15 2011
+++ /trunk/singlewebapp/WebContent/languages/russian.xml Wed Aug 3
09:52:10 2011
@@ -4113,4 +4113,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/slovak.xml Sun Jul 31 09:55:15
2011
+++ /trunk/singlewebapp/WebContent/languages/slovak.xml Wed Aug 3 09:52:10
2011
@@ -4107,4 +4107,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/spanish.xml Sun Jul 31
09:55:15 2011
+++ /trunk/singlewebapp/WebContent/languages/spanish.xml Wed Aug 3
09:52:10 2011
@@ -4115,4 +4115,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/swedish.xml Sun Jul 31
09:55:15 2011
+++ /trunk/singlewebapp/WebContent/languages/swedish.xml Wed Aug 3
09:52:10 2011
@@ -4107,4 +4107,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/thai.xml Sun Jul 31 09:55:15
2011
+++ /trunk/singlewebapp/WebContent/languages/thai.xml Wed Aug 3 09:52:10
2011
@@ -4107,4 +4107,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/turkish.xml Sun Jul 31
09:55:15 2011
+++ /trunk/singlewebapp/WebContent/languages/turkish.xml Wed Aug 3
09:52:10 2011
@@ -4106,4 +4106,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
--- /trunk/singlewebapp/WebContent/languages/ukrainian.xml Sun Jul 31
09:55:15 2011
+++ /trunk/singlewebapp/WebContent/languages/ukrainian.xml Wed Aug 3
09:52:10 2011
@@ -4107,4 +4107,7 @@
<string id="1366" name="whiteboard">
<value>Not allowed</value>
</string>
+ <string id="1367" name="user_left_act_msg">
+ <value> has left the room.</value>
+ </string>
</language>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
Sat Jul 30 09:15:47 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
Wed Aug 3 09:52:10 2011
@@ -8,6 +8,24 @@
<dataset name="countrySet" />
<dataset name="timeZoneSet" />
+<class name="userStatus" extends="view" width="250" height="30">
+ <attribute name="statusText" type="string" />
+ <attribute name="statusColor" type="number" value="0" />
+
+ <text name="status" width="240" height="20" x="5" y="5"
fontstyle="bold" fgcolor="0" text="defaulttext" fontsize="10"/>
+
+ <handler name="oninit">
+ this.status.setAttribute("text", this.statusText);
+ this.status.setAttribute("fgcolor", this.statusColor);
+ this.setAttribute("visibility", "visible");
+ lz.Timer.addTimer( new LzDelegate( this, "selfDestroy" ), 3000 );
+ </handler>
+
+ <method name="selfDestroy" args="ignore=null">
+ this.destroy();
+ </method>
+</class>
+
<class name="hibRtmpConnection" extends="rtmpConnection" debug="false"
src="$once{
this.protocollName+'://'+canvas.rtmphostlocal+':'+this.protocollPort+'/'+canvas.webAppRootKey+'/'+this.userScope
}" >
@@ -1011,6 +1029,7 @@
if (value.isScreenClient) {
return;
}
+ canvas.currentActivityList.addMessageRequest(value,
canvas.getLabelName(1367), new Date().getTime());
if (canvas._overallchatcontent!=null){
var parentObj =
canvas._overallchatcontent.parent.parent.parent._chatparticipants;
parentObj.removeItemById(value.user_id);
@@ -1065,12 +1084,61 @@
</handler>
</netRemoteCallHib>
+ <method name="setUserStatus" args="ctx,user,o">
+ <![CDATA[
+if (!o) return;
+ //The onResult-Handler will be called be the rtmpconnection
+ if ($debug) {
+ Debug.write("setUserStatus: ", user);
+ Debug.write("setUserStatus: ", o.param);
+ }
+ var aObj = o.param[3];
+ var usPoint = null;
+ if ($debug) Debug.write("drawObj: ", aObj[0]);
+ switch(aObj[0]) {
+ case 'line':
+ case 'uline':
+ usPoint = {x: aObj[aObj.length - 5] + aObj[6], y:
aObj[aObj.length - 4] + aObj[7]};
+ break;
+ case 'letter':
+ case 'rectangle':
+ case 'ellipse':
+ case 'clipart':
+ usPoint = {x: aObj[aObj.length - 3] +
aObj[aObj.length - 5], y: aObj[aObj.length - 2] + aObj[aObj.length - 4]};
+ break;
+ case 'paint':
+ var points = aObj[1];
+ //points are empty on 'paint' move
+ usPoint = {
+ x: aObj[aObj.length - 5] + (points.length ?
points[points.length - 1][3] : aObj[aObj.length - 3])
+ , y: aObj[aObj.length - 4] + (points.length ?
points[points.length - 1][4] : aObj[aObj.length - 2])};
+ break;
+ case 'drawarrow':
+ usPoint = {x: aObj[aObj.length - 5] + aObj[9], y:
aObj[aObj.length - 4] + aObj[10]};
+ break;
+ case 'clipart':
+ break;
+ }
+ if (usPoint) {
+ var us = new lz.userStatus(ctx, {
+ width:100
+ , x: usPoint.x
+ , y: usPoint.y - 25 //little above
+ , queueable: false
+ , statusText: user.firstname + " " + user.lastname
+ });
+ if ($debug) Debug.write("us: ", us, "; usPoint: ",
usPoint);
+ }
+ ]]>
+ </method>
+
<netRemoteCallHib name="sendVarsToWhiteboard"
funcname="sendVarsToWhiteboard">
<handler name="ondata" args="value">
<![CDATA[
//The onResult-Handler will be called be the rtmpconnection
if ($debug) Debug.write("sendVarsToWhiteboard :
",value);
-
canvas._drawarea.sendWatchObject(value[2],value[3],false);
+ parent.setUserStatus(canvas._drawarea, value[0],
value[1]);
+
canvas._drawarea.sendWatchObject(canvas._drawarea,value[1][2],value[1][3],false);
]]>
</handler>
</netRemoteCallHib>
@@ -1079,8 +1147,9 @@
<handler name="ondata" args="value">
<![CDATA[
//The onResult-Handler will be called be the rtmpconnection
- if ($debug)
Debug.write("sendVarsToWhiteboardById : ",value);
-
canvas._drawarea.parent.parent.parent.sendWatchObjectByWhiteboard(value);
+ if ($debug) Debug.write("sendVarsToWhiteboardById :
",value);
+ parent.setUserStatus(canvas._drawarea, value[0],
value[1]);
+
canvas._drawarea.parent.parent.parent.sendWatchObjectByWhiteboard(value[1]);
]]>
</handler>
</netRemoteCallHib>
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Wed Jul 27 05:56:23 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Wed Aug 3 09:52:10 2011
@@ -2137,7 +2137,7 @@
//log.debug("*..*idremote: " + rcl.getStreamid());
//log.debug("*..* sendVars room_id IS EQUAL: " +
currentClient.getStreamid() + " asd " + rcl.getStreamid() + " IS eq? "
+currentClient.getStreamid().equals(rcl.getStreamid()));
if
(!currentClient.getStreamid().equals(rcl.getStreamid())) {
- ((IServiceCapableConnection) conn).invoke("sendVarsToWhiteboard",
new Object[] { whiteboardObj },this);
+ ((IServiceCapableConnection) conn).invoke("sendVarsToWhiteboard",
new Object[] { currentClient, whiteboardObj },this);
//log.debug("sending sendVarsToWhiteboard to " + conn + " rcl " +
rcl);
numberOfUsers++;
}
@@ -2263,7 +2263,7 @@
//log.debug("*..*idremote: " + rcl.getStreamid());
//log.debug("*..* sendVars room_id IS EQUAL: " +
currentClient.getStreamid() + " asd " + rcl.getStreamid() + " IS eq? "
+currentClient.getStreamid().equals(rcl.getStreamid()));
if
(!currentClient.getStreamid().equals(rcl.getStreamid())) {
- ((IServiceCapableConnection)
conn).invoke("sendVarsToWhiteboardById", new Object[] { sendObject },this);
+ ((IServiceCapableConnection)
conn).invoke("sendVarsToWhiteboardById", new Object[] { currentClient,
sendObject },this);
//log.debug("sending sendVarsToWhiteboard to " + conn + " rcl " +
rcl);
numberOfUsers++;
}
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
