Revision: 3724
Author: seba.wagner
Date: Wed Apr 20 03:16:40 2011
Log: [No log message]
http://code.google.com/p/openmeetings/source/detail?r=3724
Modified:
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
/trunk/singlewebapp/WebContent/openmeetings/plugins/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
Mon Oct 11 08:09:56 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
Wed Apr 20 03:16:40 2011
@@ -336,7 +336,7 @@
<!-- 340 -->
<view name="_clickLayer" clickable="true" opacity="0.75" x="340"
- width="460" height="$once{ parent.height - this.y - 4
}"
+ width="460" height="$once{ parent.height - this.y }"
y="20" showhandcursor="false" bgcolor="0xFFFFFF" />
</view>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/plugins/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
Tue Apr 19 02:36:23 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/plugins/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
Wed Apr 20 03:16:40 2011
@@ -153,7 +153,7 @@
if ($debug) Debug.write("onmouseup multiWhiteboardPanel");
this._drawareaMask._drawarea.onmouseupMethod();
</handler>
-
+
<!--
The Content Area
-->
@@ -161,9 +161,56 @@
height="${ (canvas.ismoderator) ?
(parent.parent.height-42-parent._propertyPanel.height) :
((canvas.isAllowedToDraw) ?
(parent.parent.height-42-parent._propertyPanel.height) :
(parent.parent.height-42)) }"
y="0" name="_drawareaMask" clip="true" bgcolor="0xFFFFFF" >
+ <handler name="onmousedown">
+ this._drawarea.onmousedownMethod();
+ </handler>
+ <handler name="onmouseup">
+ this._drawarea.onmouseupMethod();
+ </handler>
+
+ <handler name="onmouseover">
+ this._drawarea.onmouseoverMethod();
+ </handler>
+ <handler name="onmouseout">
+ this._drawarea.onmouseoutMethod();
+ </handler>
+
<remoteWhiteboard y="0" name="_drawarea" isRemoteOID="true"
- restricted="$once{ parent.parent.restricted }"
- width="${parent.width}"
height="${parent.height}" >
+ restricted="$once{ parent.parent.restricted }" >
+
+ <attribute name="sendUpdate" value="true" type="boolean"/>
+
+ <handler name="onx" args="x">
+ if (this.sendUpdate) {
+ if ($debug) Debug.write("# x",x);
+ parent.parent.scrollContainer.calcScrollContent();
+ }
+ </handler>
+
+ <handler name="ony" args="y">
+ if (this.sendUpdate) {
+ if ($debug) Debug.write("# y",y);
+ parent.parent.scrollContainer.calcScrollContent();
+ }
+ </handler>
+
+ <handler name="onheight" args="h">
+ if ($debug) Debug.write("# height",h);
+ //this.dragger.drag_min_x = parent.width - w;
+ parent.parent.scrollContainer.calcScrollContent();
+ </handler>
+
+ <handler name="onwidth" args="w">
+ if ($debug) Debug.write("# width",w);
+ //this.dragger.drag_min_y = parent.height - h;
+ parent.parent.scrollContainer.calcScrollContent();
+ </handler>
+
+ <handler name="onupdateScale" args="tRef">
+ if ($debug) Debug.write("#
updateScale",this.getDisplayObject()._xscale);
+ parent.parent.scrollContainer.calcScrollContent();
+ </handler>
+
<attribute name="initH"/>
<attribute name="initW"/>
<handler name="oninit">
@@ -298,6 +345,77 @@
</view>
+ <view name="scrollContainer" width="${ parent.parent.width-2 }"
+ visible="${ ((canvas.ismoderator) ? true :
((canvas.isAllowedToDraw) ? true : false )) }"
+ height="${ (canvas.ismoderator) ?
(parent.parent.height-42-parent._propertyPanel.height) :
((canvas.isAllowedToDraw) ?
(parent.parent.height-33-parent._propertyPanel.height) :
(parent.parent.height-33)) }" >
+
+ <attribute name="sendUpdate" value="true" type="boolean"/>
+
+ <method name="calcScrollContent">
+ var rHeight = Math.round(parent._drawareaMask._drawarea.height
* (parent._drawareaMask._drawarea.getDisplayObject()._xscale / 100));
+ var rWidth = Math.round(parent._drawareaMask._drawarea.width *
(parent._drawareaMask._drawarea.getDisplayObject()._yscale / 100));
+ this.sendUpdate = false;
+
this.scrollview.setAttribute("x",parent._drawareaMask._drawarea.x);
+
this.scrollview.setAttribute("y",parent._drawareaMask._drawarea.y);
+ this.scrollview.setAttribute("height",rHeight);
+ this.scrollview.setAttribute("width",rWidth);
+ this.sendUpdate = true;
+ </method>
+
+ <view name="scrollview">
+
+ <attribute name="timeisInited" value="false" type="boolean" />
+ <attribute name="sendObjectDel" value="null" />
+
+ <handler name="oninit">
+ this.sendObjectDel = new LzDelegate( this, "sendObject" );
+ </handler>
+
+ <handler name="onx" args="x">
+ if (parent.sendUpdate) {
+ if ($debug) Debug.write("# scrollview x",x);
+
parent.parent._drawareaMask._drawarea.setAttribute("x",x);
+
+ if (!this.timeisInited){
+ this.timeisInited=true;
+ lz.Timer.addTimer( this.sendObjectDel, 250 );
+ } else {
+ lz.Timer.resetTimer( this.sendObjectDel, 250 );
+ }
+ }
+ </handler>
+ <handler name="ony" args="y">
+ if (parent.sendUpdate) {
+ if ($debug) Debug.write("# scrollview y",y);
+
parent.parent._drawareaMask._drawarea.setAttribute("y",y);
+
+ if (!this.timeisInited){
+ this.timeisInited=true;
+ lz.Timer.addTimer( this.sendObjectDel, 250 );
+ } else {
+ lz.Timer.resetTimer( this.sendObjectDel, 250 );
+ }
+ }
+ </handler>
+
+ <method name="sendObject" args="itemRef">
+ if ($debug) Debug.info("sendObject :: scrollview");
+
+ var tArray = new Array();
+ tArray[0] = "moveMap";
+ tArray[1] = this.x;
+ tArray[2] = this.y;
+
+
this.parent.parent._drawareaMask._drawarea.onsharedMessage('moveMap',tArray);
+ this.timeisInited=false;
+ </method>
+ </view>
+
+ <vscrollbar name="_scrollstv"/>
+ <hscrollbar name="_scrollsth" />
+
+ </view>
+
<netRemoteCallHib name="sendMessageWithClientById"
funcname="sendMessageWithClientById"
remotecontext="$once{ canvas.thishib }" >
@@ -430,6 +548,57 @@
</view>
+ <view name="zoombox" y="0" x="${ parent.width-this.width-14 }"
layout="axis:x;spacing:2"
+ visible="${ ((canvas.ismoderator) ? true :
((canvas.isAllowedToDraw) ? true : false )) }">
+
+ <attribute name="ignoreUpdates" value="false" type="boolean" />
+
+ <method name="setWhiteboardValues" args="fullFit,zoom">
+ if ($debug) Debug.write("setWhiteboardValues
-1- ",fullFit,zoom);
+ this.ignoreUpdates = true;
+ this._zoom.setSliderValue(zoom);
+ this._fullFit.setValue(fullFit);
+ this.ignoreUpdates = false;
+ </method>
+
+ <method name="setCurrentScaleByFullFit" args="tScale">
+ if ($debug) Debug.write("setCurrentScaleByFullFit
-2- ",tScale);
+ this.ignoreUpdates = true;
+ this._zoom.setSliderValue(tScale);
+ this.ignoreUpdates = false;
+ </method>
+
+ <labelCheckbox x="344" name="_fullFit" labelid="847" y="4"
fontstyle="bold" fgcolor="0xFFFFFF">
+ <handler name="onvalue" args="v">
+ if (parent.ignoreUpdates) {
+ return;
+ }
+ if ($debug) Debug.warn("onvalue Full Fit ",v);
+
+
parent.parent._drawareaMask._drawarea.doUpdateFullFit(v,parent._zoom.initialNumber);
+ </handler>
+ <labelTooltip labelid="1212" multiline="true" />
+ </labelCheckbox>
+
+ <changeWidthSlider name="_zoom" initialNumberInit="50"
+ boxPosition="down" initialNumber="50" maximum="200">
+ <handler name="oninitialNumber" args="i">
+ if (parent.ignoreUpdates) {
+ return;
+ }
+
+ if ($debug) Debug.warn("onvalue Zoom
Fit ",this.initialNumber);
+
+ parent._fullFit.setValue(false);
+
+
parent.parent._drawareaMask._drawarea.doUpdateZoom(parent._fullFit.getValue(),this.initialNumber);
+ </handler>
+ </changeWidthSlider>
+
+ <view width="2" />
+
+ </view>
+
<propertyPanel name="_propertyPanel" x="0" y="${
parent.parent.height-this.height-42 }"
visible="${ ((canvas.ismoderator) ? true :
((canvas.isAllowedToDraw) ? true : false )) }">
<handler name="onheight" args="h">
--
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.
