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/12/09 04:55:41 UTC
svn commit: r1773320 [2/2] - in /openmeetings/application/branches:
3.1.x/openmeetings-flash/src/main/swf/base/
3.1.x/openmeetings-flash/src/main/swf/base/hibernate/
3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/
3.1.x/openmeeting...
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx?rev=1773320&r1=1773319&r2=1773320&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx Fri Dec 9 04:55:41 2016
@@ -9,7 +9,7 @@
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
@@ -19,7 +19,7 @@
-->
<library>
-
+
<class name="propertyPanel" extends="basePropertyPanel"
width="${ parent.parent.width-1 }" height="100" labelid="843" titlePos="150">
@@ -32,7 +32,7 @@
this._content._widthvalue.setAttribute('text',width);
this._content._heightvalue.setAttribute('text',height);
</method>
-
+
<method name="onUpdateBoundByText">
if (canvas._drawarea.boundingref!=null){
if ($debug) Debug.write("onUpdateBoundByText boundingref: ",canvas._drawarea.boundingref);
@@ -42,7 +42,7 @@
canvas._drawarea.boundingref.setAttribute('height',Number(this._content._heightvalue.getText()));
}
</method>
-
+
<method name="loadPanelByModus" args="drawArea">
if ($debug) Debug.write("loadPanelByModus drawmodus: ",drawArea.drawmodus);
this.ignoreUpdates = true;
@@ -64,10 +64,10 @@
this._content.changeOpacitySlider.setSliderValue(drawArea.currentulineOpacity*100);
} else if (drawArea.drawmodus == 'drawarrow') {
this._content.lineColorChoose.setSelectedColorWithDis(drawArea.currentdrawarrowlinestroke,
- drawArea.currentdrawarrowlinestrokeDis);
+ drawArea.currentdrawarrowlinestrokeDis);
this._content.changeWidthSlider.setSliderValue(drawArea.currentdrawarrowlinelineWidth);
this._content.fillColorChoose.setSelectedColorWithDis(drawArea.currentdrawarrowlinestrokeFill,
- drawArea.currentdrawarrowlinestrokeFillDis);
+ drawArea.currentdrawarrowlinestrokeFillDis);
this._content.changeOpacitySlider.setSliderValue(drawArea.currentdrawarrowOpacity*100);
} else if (drawArea.drawmodus == 'rectangle') {
this._content.lineColorChoose.setSelectedColorWithDis(drawArea.currentrectanglestroke,
@@ -98,36 +98,33 @@
this._content.fillColorChoose.setEnabled(false);
this._content.changeOpacitySlider.setEnabled(false);
}
-
+
if (drawArea.drawmodus == 'letter'){
- this._content._italic.setAttribute('enabled',true);
- this._content._bold.setAttribute('enabled',true);
- } else {
- this._content._italic.setAttribute('enabled',false);
- this._content._bold.setAttribute('enabled',false);
- }
-
+ this._content._italic.setAttribute('enabled',true);
+ this._content._bold.setAttribute('enabled',true);
+ } else {
+ this._content._italic.setAttribute('enabled',false);
+ this._content._bold.setAttribute('enabled',false);
+ }
+
this.ignoreUpdates = false;
</method>
-
+
<method name="loadPanelByBoundingBox" args="drawArea,objRef">
if ($debug) Debug.write("loadPanelByBoundingBox objRef: ",objRef);
-
- this.loadPanelByModus(drawArea);
-
- this.ignoreUpdates = true;
-
- if (objRef.name.indexOf('swf') >= 0) {
-
- this._content._documentsPanel._currentSlideNo.setAttribute("text",objRef.slideNumber);
- //this._content._documentsPanel._zoom.setAttribute("text",objRef.currentzoomFactor);
- //this._content._fullFit.setValue(objRef.fullFit);
-
- }
-
+
+ this.loadPanelByModus(drawArea);
+ this.ignoreUpdates = true;
+
+ if (objRef.name.indexOf('swf') >= 0) {
+ this._content._documentsPanel._currentSlideNo.setAttribute("text",objRef.slideNumber);
+ //this._content._documentsPanel._zoom.setAttribute("text",objRef.currentzoomFactor);
+ //this._content._fullFit.setValue(objRef.fullFit);
+ }
+
this.ignoreUpdates = false;
</method>
-
+
<method name="updateProperties">
if (!this.ignoreUpdates){
if (canvas._drawarea.drawmodus == 'paint'){
@@ -144,10 +141,10 @@
canvas._drawarea.currentulineOpacity = this._content.changeOpacitySlider.initialNumber/100;
} else if (canvas._drawarea.drawmodus == 'drawarrow'){
canvas._drawarea.currentdrawarrowlinestroke = this._content.lineColorChoose.selectedColor;
- canvas._drawarea.currentdrawarrowlinestrokeDis = this._content.lineColorChoose.selectedColorDis;
- canvas._drawarea.currentdrawarrowlinestrokeFill = this._content.fillColorChoose.selectedColor;
- canvas._drawarea.currentdrawarrowlinestrokeFillDis = this._content.fillColorChoose.selectedColorDis;
- canvas._drawarea.currentdrawarrowlinelineWidth = this._content.changeWidthSlider.initialNumber;
+ canvas._drawarea.currentdrawarrowlinestrokeDis = this._content.lineColorChoose.selectedColorDis;
+ canvas._drawarea.currentdrawarrowlinestrokeFill = this._content.fillColorChoose.selectedColor;
+ canvas._drawarea.currentdrawarrowlinestrokeFillDis = this._content.fillColorChoose.selectedColorDis;
+ canvas._drawarea.currentdrawarrowlinelineWidth = this._content.changeWidthSlider.initialNumber;
canvas._drawarea.currentdrawarrowOpacity = this._content.changeOpacitySlider.initialNumber/100;
} else if (canvas._drawarea.drawmodus == 'rectangle'){
canvas._drawarea.currentrectanglestroke = this._content.lineColorChoose.selectedColor;
@@ -176,62 +173,57 @@
</method>
<view name="_content" visible="${this.parent.isopen}" >
- <labelTextWidthTooltip name="_xvalueLabel" x="4" y="24"
- labelid="545" labelLabelid="546" />
+ <labelTextWidthTooltip name="_xvalueLabel" x="4" y="24" labelid="545" labelLabelid="546" />
<customEdittext name="_xvalue" x="24" y="24" regexpType="number"
- width="40" text="0" height="24"
- onafterCheck="parent.parent.onUpdateBoundByText()" />
-
- <labelTextWidthTooltip name="_yvalueLabel" x="4" y="52"
- labelid="547" labelLabelid="548" />
+ width="40" text="0" height="24"
+ onafterCheck="parent.parent.onUpdateBoundByText()" />
+
+ <labelTextWidthTooltip name="_yvalueLabel" x="4" y="52" labelid="547" labelLabelid="548" />
<customEdittext name="_yvalue" x="24" y="52" regexpType="number"
- width="40" text="0" height="24"
- onafterCheck="parent.parent.onUpdateBoundByText()" />
-
- <labelTextWidthTooltip name="_widthvalueLabel" x="68" y="24"
- labelid="549" labelLabelid="550" />
+ width="40" text="0" height="24"
+ onafterCheck="parent.parent.onUpdateBoundByText()" />
+
+ <labelTextWidthTooltip name="_widthvalueLabel" x="68" y="24" labelid="549" labelLabelid="550" />
<customEdittext name="_widthvalue" x="88" y="24" regexpType="number"
- width="40" text="0" height="24"
- onafterCheck="parent.parent.onUpdateBoundByText()" />
-
- <labelTextWidthTooltip name="_heightvalueLabel" x="68" y="52"
- labelid="551" labelLabelid="552" />
+ width="40" text="0" height="24"
+ onafterCheck="parent.parent.onUpdateBoundByText()" />
+
+ <labelTextWidthTooltip name="_heightvalueLabel" x="68" y="52" labelid="551" labelLabelid="552" />
<customEdittext name="_heightvalue" x="88" y="52" regexpType="number"
- width="40" text="0" height="24"
- onafterCheck="parent.parent.onUpdateBoundByText()" />
-
-
+ width="40" text="0" height="24"
+ onafterCheck="parent.parent.onUpdateBoundByText()" />
+
<lineColorChoose x="132" y="24" name="lineColorChoose" boxPosition="up" >
<handler name="onselectedColor" args="sel">
if ($debug) Debug.write("lineColorChoose sel: ",sel);
- parent.parent.updateProperties();
+ parent.parent.updateProperties();
</handler>
</lineColorChoose>
-
+
<fillColorChoose x="132" y="52" name="fillColorChoose" boxPosition="up" >
<handler name="onselectedColor" args="sel">
if ($debug) Debug.write("fillColorChoose sel: ",sel);
- parent.parent.updateProperties();
+ parent.parent.updateProperties();
</handler>
</fillColorChoose>
-
+
<changeWidthSlider x="222" y="24" name="changeWidthSlider" boxPosition="up"
initialNumber="2" >
<handler name="oninitialNumber" args="i">
//this.parent.parent.parent._drawareaMask._drawarea.setAttribute('currentlayersize',i);
if ($debug) Debug.write("changeWidthSlider oninitialNumber sel: ",i);
- parent.parent.updateProperties();
+ parent.parent.updateProperties();
</handler>
- </changeWidthSlider>
-
+ </changeWidthSlider>
+
<changeWidthSlider x="222" y="52" name="changeOpacitySlider" labelid="553" boxPosition="up"
initialNumber="100" >
<handler name="oninitialNumber" args="i">
//this.parent.parent.parent._drawareaMask._drawarea.setAttribute('currentlayersize',i);
if ($debug) Debug.write("changeOpacitySlider oninitialNumber sel: ",i);
- parent.parent.updateProperties();
+ parent.parent.updateProperties();
</handler>
- </changeWidthSlider>
+ </changeWidthSlider>
<propertyPanelLetterButton name="_italic" x="286" y="24" labelid="86" itemResourceName="italic" />
@@ -247,84 +239,78 @@
<attribute name="sendSelection" value="true" type="boolean"/>
<handler name="onselect" args="sel">
if (this.sendSelection) {
- parent.parent.parent._drawareaMask._drawarea.setCurrentDocument(sel.value);
+ canvas._drawarea.setCurrentDocument(sel.value);
}
</handler>
</resetCombobox>
<view name="_documentsPanel" x="480" y="52" layout="axis:x;spacing:2">
<handler name="oninit">
- //if ($debug) Debug.write("oninit: ",this);
- this._currentSlideNo.setAttribute('text',canvas.currentSlideNo);
- this._totalSlideNo.setAttribute('text',canvas.currentSlideTotal);
- //this._zoom.setAttribute('text',canvas.currentSlideZoom);
- </handler>
- <handler name="preclose">
- //if ($debug) Debug.write("onclose: ",this);
- canvas.currentSlideNo = Number(this._currentSlideNo.getText());
- canvas.currentSlideTotal = Number(this._totalSlideNo.getText());
- //canvas.currentSlideZoom = Number(this._zoom.getText());
- </handler>
-
+ //if ($debug) Debug.write("oninit: ",this);
+ this._currentSlideNo.setAttribute('text',canvas.currentSlideNo);
+ this._totalSlideNo.setAttribute('text',canvas.currentSlideTotal);
+ //this._zoom.setAttribute('text',canvas.currentSlideZoom);
+ </handler>
+ <handler name="preclose">
+ //if ($debug) Debug.write("onclose: ",this);
+ canvas.currentSlideNo = Number(this._currentSlideNo.getText());
+ canvas.currentSlideTotal = Number(this._totalSlideNo.getText());
+ //canvas.currentSlideZoom = Number(this._zoom.getText());
+ </handler>
+
<method name="addCurrentObject" args="itemObj">
- //if ($debug) Debug.write("addCurrentObject ",itemObj.fileName,itemObj.name);
- var docName = itemObj.standardFileName;
- if (docName.length == 0) {
- docName = itemObj.fileName;
- }
-
- parent.currentDocument.addItem(docName,itemObj.name);
- parent.currentDocument.sendSelection = false;
- parent.currentDocument.selectItem(itemObj.name);
- parent.currentDocument.sendSelection = true;
-
- parent._clickLayer.setAttribute("visibility","hidden");
- </method>
-
- <method name="removeDocument" args="refItemName">
-
- if ($debug) Debug.warn("removeDocument ",refItemName);
-
- parent.currentDocument.removeItem(refItemName);
- if (parent.currentDocument.getNumItems() != 0) {
- parent.currentDocument.selectItemAt(0);
- parent._clickLayer.setAttribute("visibility","hidden");
- } else {
- parent.currentDocument.clearSelection();
- parent._clickLayer.setAttribute("visibility","visible");
- }
- </method>
-
- <method name="clearDocumentsBar">
- parent.currentDocument.reset();
- parent._clickLayer.setAttribute("visibility","visible");
- </method>
-
- <drawDocumentPanelItem name="b3" modi="doc_first" resourceItem="doc_first"
- labelid="255" />
- <drawDocumentPanelItem name="b4" modi="doc_pre" resourceItem="doc_pre"
- labelid="256" />
- <drawDocumentPanelItem name="b5" modi="doc_next" resourceItem="doc_next"
- labelid="257" />
- <drawDocumentPanelItem name="b6" modi="doc_last" resourceItem="doc_last"
- labelid="258" />
-
- <customEdittext name="_currentSlideNo" width="40" height="24" regexpType="number" >
- <handler name="onblur">
- if (parent.parent.parent.ignoreUpdates) {
- if ($debug) Debug.write("ignoreUpdates -- ");
- return;
- }
- parent.parent.parent.parent._drawareaMask._drawarea.setCurrentDocumentByToolBar(parent.parent.currentDocument.getValue());
- parent.parent.parent.parent._drawareaMask._drawarea.newSlideNumber = Number(this.getText());
- parent.parent.parent.parent._drawareaMask._drawarea.doDocumentAction("setSlideNumber");
- </handler>
- </customEdittext>
- <labelText y="6" labelid="254" />
- <labelText name="_totalSlideNo" y="6" width="40" />
-
+ //if ($debug) Debug.write("addCurrentObject ",itemObj.fileName,itemObj.name);
+ var docName = itemObj.standardFileName;
+ if (docName.length == 0) {
+ docName = itemObj.fileName;
+ }
+
+ parent.currentDocument.addItem(docName,itemObj.name);
+ parent.currentDocument.sendSelection = false;
+ parent.currentDocument.selectItem(itemObj.name);
+ parent.currentDocument.sendSelection = true;
+
+ parent._clickLayer.setAttribute("visibility","hidden");
+ </method>
+
+ <method name="removeDocument" args="refItemName">
+ if ($debug) Debug.warn("removeDocument ",refItemName);
+
+ parent.currentDocument.removeItem(refItemName);
+ if (parent.currentDocument.getNumItems() != 0) {
+ parent.currentDocument.selectItemAt(0);
+ parent._clickLayer.setAttribute("visibility","hidden");
+ } else {
+ parent.currentDocument.clearSelection();
+ parent._clickLayer.setAttribute("visibility","visible");
+ }
+ </method>
+
+ <method name="clearDocumentsBar">
+ parent.currentDocument.reset();
+ parent._clickLayer.setAttribute("visibility","visible");
+ </method>
+
+ <drawDocumentPanelItem name="b3" modi="doc_first" resourceItem="doc_first" labelid="255" />
+ <drawDocumentPanelItem name="b4" modi="doc_pre" resourceItem="doc_pre" labelid="256" />
+ <drawDocumentPanelItem name="b5" modi="doc_next" resourceItem="doc_next" labelid="257" />
+ <drawDocumentPanelItem name="b6" modi="doc_last" resourceItem="doc_last" labelid="258" />
+
+ <customEdittext name="_currentSlideNo" width="40" height="24" regexpType="number" >
+ <handler name="onblur">
+ if (parent.parent.parent.ignoreUpdates) {
+ if ($debug) Debug.write("ignoreUpdates -- ");
+ return;
+ }
+ canvas._drawarea.setCurrentDocumentByToolBar(parent.parent.currentDocument.getValue());
+ canvas._drawarea.newSlideNumber = Number(this.getText());
+ canvas._drawarea.doDocumentAction("setSlideNumber");
+ </handler>
+ </customEdittext>
+ <labelText y="6" labelid="254" />
+ <labelText name="_totalSlideNo" y="6" width="40" />
</view>
-
+
<!-- 340 -->
<view name="_clickLayer" clickable="true" opacity="0.75" x="340"
width="460" height="$once{ parent.height - this.y }"
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx?rev=1773320&r1=1773319&r2=1773320&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx Fri Dec 9 04:55:41 2016
@@ -34,7 +34,7 @@
<method name="removeObject" args="btn">
var whiteboardId = btn.objRef.whiteboardId;
this.removeObjectSynced(btn);
- parent.sendRemoveWindow(whiteboardId);
+ canvas._wb.sendRemoveWindow(whiteboardId);
</method>
<method name="removeObjectSynced" args="btn">
@@ -63,17 +63,12 @@
<method name="sendActiveWindowSynced" args="btn">
<![CDATA[
if (this.currentBtn != null){
- this.currentBtn.isactive=false;
- if (this.currentBtn._minimizebtn_mo != null) this.currentBtn._minimizebtn_mo.setAttribute('visibility','hidden');
- if (this.currentBtn._minimizebtn_dn != null) this.currentBtn._minimizebtn_dn.setAttribute('visibility','hidden');
+ this.currentBtn.setActive(false);
}
this.currentBtn = btn;
this.currentBtn.objRef.setAttribute("visibility","visible");
this.currentBtn.objRef.bringToFront();
- //if ($debug) Debug.write("sendActiveWindow2: ",this.currentBtn);
- this.currentBtn._minimizebtn_mo.setAttribute('visibility','hidden');
- this.currentBtn._minimizebtn_dn.setAttribute('visibility','visible');
- this.currentBtn.isactive=true;
+ this.currentBtn.setActive(true);
]]>
</method>
</class>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx?rev=1773320&r1=1773319&r2=1773320&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx Fri Dec 9 04:55:41 2016
@@ -52,6 +52,12 @@
this.isHidden = false;
</method>
+ <method name="setActive" args="val">
+ isactive = val;
+ if (!!_minimizebtn_mo) _minimizebtn_mo.setAttribute('visible', !val);
+ if (!!_minimizebtn_dn) _minimizebtn_dn.setAttribute('visible', val);
+ </method>
+
<method name="calcTextWidth">
<![CDATA[
if (this.isHidden) {
@@ -73,7 +79,9 @@
if (this.isHidden) {
return;
}
- rename();
+ if (this.isactive) {
+ rename();
+ }
this._minimizebtn_mo.setAttribute('visibility','visible');
this._minimizebtn_dn.setAttribute('visibility','hidden');
if ($debug) Debug.write(" :: onclick :: ");
@@ -119,11 +127,11 @@
</handler>
<method name="sendActiveWindow" args="win">
- this.parent.sendActiveWindow(this,win);
+ canvas._wbBar.sendActiveWindow(this,win);
</method>
<method name="activateSynced">
- this.parent.sendActiveWindowSynced(this);
+ canvas._wbBar.sendActiveWindowSynced(this);
</method>
<view name="_minimizebtn_mo" width="${ parent.width-2 }" height="16"
@@ -140,7 +148,7 @@
<method name="rename">
<![CDATA[
- if (this.isactive && canvas.ismoderator) {
+ if (canvas.ismoderator) {
var tWidth = this._text.width;
var _y = this._text.getAttributeRelative("y", canvas);
var _x = this._text.getAttributeRelative("x", canvas);
@@ -201,7 +209,7 @@
<method name="closeWhiteboardConfirmMethod" args="bool,sharedObjectData">
if ($debug) Debug.write("confirm closeWhiteboard:", bool);
if (bool) {
- parent.parent.removeObject(parent);
+ canvas._wbBar.removeObject(parent);
}
</method>
<labelTooltip labelid="1364" />