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/11/28 05:32:01 UTC
svn commit: r1771682 - in /openmeetings/application/branches:
3.1.x/openmeetings-flash/src/main/swf/base/components/scrollbars/
3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/
3.1.x/openmeetings-flash/src/main/swf/modules/conferenc...
Author: solomax
Date: Mon Nov 28 05:32:01 2016
New Revision: 1771682
URL: http://svn.apache.org/viewvc?rev=1771682&view=rev
Log:
[OPENMEETINGS-1366] right click rename and scrolling are implemented
Added:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/resources/left.png (with props)
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/resources/right.png (with props)
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/resources/left.png (with props)
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/resources/right.png (with props)
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/scrollbars/om_hscrollbar.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/library.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/scrollbars/om_hscrollbar.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/library.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/scrollbars/om_hscrollbar.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/scrollbars/om_hscrollbar.lzx?rev=1771682&r1=1771681&r2=1771682&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/scrollbars/om_hscrollbar.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/scrollbars/om_hscrollbar.lzx Mon Nov 28 05:32:01 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
@@ -20,42 +20,39 @@
-->
<library>
-<class name="om_hscrollbar" extends="basescrollbar" styleable="false"
- axis="x">
+<class name="om_hscrollbar" extends="basescrollbar" styleable="false" axis="x">
+
+ <!--- @keywords private -->
+ <attribute name="height" value="10"/>
- <!--- @keywords private -->
- <attribute name="height" value="10"/>
-
- <!--- @keywords private -->
- <method name="_showEnabled">
- <![CDATA[
- if (!_enabled) {
- //this.scrolltrack.thumb.setAttribute('height', 0);
- this.scrolltrack.thumb.setAttribute('visibility', 'hidden');
- } else {
- this.scrolltrack.thumb.setAttribute('visibility', 'visible');
- }
- super._showEnabled();
- ]]>
- </method>
+ <!--- @keywords private -->
+ <method name="_showEnabled">
+ <![CDATA[
+ if (!_enabled) {
+ //this.scrolltrack.thumb.setAttribute('height', 0);
+ this.scrolltrack.thumb.setAttribute('visibility', 'hidden');
+ } else {
+ this.scrolltrack.thumb.setAttribute('visibility', 'visible');
+ }
+ super._showEnabled();
+ ]]>
+ </method>
<view name="rightarrow" width="0" />
- <view name="scrolltrack">
- <basescrolltrack name="left"
- resource="omscrolltrack_x_rsc" stretches="width">
- <attribute name="height" value="${parent.height}"/>
- <attribute name="width" value="${parent.width}"/>
- </basescrolltrack>
- <basescrollthumb name="thumb" x="1">
- <view resource="omscrollbar_xthumbleft_rsc"/>
- <view resource="omscrollbar_xthumbmiddle_rsc" stretches="both"/>
- <view resource="omscrollbar_xthumbright_rsc"/>
- <stableborderlayout axis="x"/>
- </basescrollthumb>
- </view>
+ <view name="scrolltrack">
+ <basescrolltrack name="left" resource="omscrolltrack_x_rsc" stretches="width">
+ <attribute name="height" value="${parent.height}"/>
+ <attribute name="width" value="${parent.width}"/>
+ </basescrolltrack>
+ <basescrollthumb name="thumb" x="1">
+ <view resource="omscrollbar_xthumbleft_rsc"/>
+ <view resource="omscrollbar_xthumbmiddle_rsc" stretches="both"/>
+ <view resource="omscrollbar_xthumbright_rsc"/>
+ <stableborderlayout axis="x"/>
+ </basescrollthumb>
+ </view>
<view height="0" name="leftarrow" />
- <stableborderlayout axis="x"/>
-
+ <stableborderlayout axis="x"/>
</class>
</library>
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx?rev=1771682&r1=1771681&r2=1771682&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx Mon Nov 28 05:32:01 2016
@@ -75,9 +75,9 @@
</handler>
</netRemoteCallHib>
</class>
-
<class name="fixedFileExplorerWhiteboardPanel" extends="basePropertyPanelWhiteboard" allowToggle="false"
labelid="615" visible="${ !canvas.currentRoomObj.hideWhiteboard }">
+ <attribute name="_bar" value="null" />
<handler name="oninit">
canvas._drawarea = this;
@@ -122,16 +122,14 @@
var whiteboard = new lz.multiWhiteboardPanel(this,{
whiteboardId:whiteboardId
});
- var tempWidth = this._bar.getCurrentSize();
var tWhiteboardBtn = new lz.whiteboardMiniButton(this._bar,{
objRef:whiteboard,
- width:tempWidth,
+ width: _bar.staticwidth,
isactive:true,
btnName: wbName
});
this._bar.currentBtn = tWhiteboardBtn;
tWhiteboardBtn.onmouseout.sendEvent(null);
- this.addNewItemButton.updatePosition();
canvas.whiteboardCount++;
return whiteboard;
</method>
@@ -265,30 +263,33 @@
]]>
</method>
- <whiteboardBarMenu name="_bar" height="20" y="21">
- <attribute name="whiteboardId" value="-1" type="number" />
-
- <handler name="onsubview" args="newSub">
- parent.addNewItemButton.updatePosition();
+ <view name="scrollLeft" y="21" x="0" width="20">
+ <handler name="onclick" args="refOb">
+ parent._barArea._scroll.step(-1);
</handler>
- <handler name="onwidth" args="newSub">
- parent.addNewItemButton.updatePosition();
+ <view resource="wb_arrow_left_rsc" y="0" x="0" opacity="${ parent.parent._barArea._scroll.scrollable ? 1 : 0.1 }" />
+ </view>
+ <view name="_barArea" width="${ parent.width - 60 }" height="20" x="20" y="21" clip="true">
+ <whiteboardBarMenu name="_bar" height="20" y="0" x="0">
+ <attribute name="whiteboardId" value="-1" type="number" />
+
+ <handler name="oninit">
+ parent.parent._bar = this;
+ </handler>
+ </whiteboardBarMenu>
+ <om_hscrollbar name="_scroll" height="0" stepsize="50"/>
+ </view>
+ <view name="scrollRight" y="21" x="${ parent.width - 40 }" width="20">
+ <handler name="onclick" args="refOb">
+ parent._barArea._scroll.step(1);
</handler>
- </whiteboardBarMenu>
+ <view resource="wb_arrow_right_rsc" y="0" x="0" opacity="${ parent.parent._barArea._scroll.scrollable ? 1 : 0.1 }" />
+ </view>
- <view name="addNewItemButton" y="24"
+ <view name="addNewItemButton" y="24" x="${ parent.width - 20 }"
visible="${ ((canvas.ismoderator) ? true : ((canvas.isAllowedToDraw) ? true : false )) }">
<attribute name="whiteboardId" value="-1" type="number" />
- <method name="updatePosition">
- if (parent._bar.subviews.length != 0) {
- var borderItem = parent._bar.subviews[parent._bar.subviews.length-1];
- this.setAttribute("x",borderItem.x + borderItem.width + 2);
- } else {
- this.setAttribute("x",2);
- }
- </method>
-
<handler name="onmouseover" args="refOb">
this.bg.setAttribute("visibility","visible");
</handler>
@@ -309,7 +310,7 @@
</view>
<view width="${ parent.width }" height="1" y="41"
- bgcolor="$once{ canvas.getThemeColor('basebgcolorizer') }">
+ bgcolor="$once{ canvas.getThemeColor('basebgcolorizer') }">
<attribute name="whiteboardId" value="-1" type="number" />
</view>
</class>
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/library.lzx?rev=1771682&r1=1771681&r2=1771682&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/library.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/library.lzx Mon Nov 28 05:32:01 2016
@@ -19,35 +19,33 @@
-->
<library>
- <!-- APL author sebawagner -->
+ <!-- BEGIN APL author sebawagner -->
<resource name="_boundingBoxPointerTR" src="resources/boundingBoxTR.png" />
- <!-- APL author sebawagner -->
<resource name="_boundingBoxPointerTL" src="resources/boundingBoxTL.png" />
- <!-- APL author sebawagner -->
<resource name="_boundingBoxPointerUR" src="resources/boundingBoxUR.png" />
- <!-- APL author sebawagner -->
<resource name="_boundingBoxPointerURNoGripper" src="resources/boundingBoxULNoGripper.png" />
- <!-- APL author sebawagner -->
<resource name="_boundingBoxPointerUL" src="resources/boundingBoxUL.png" />
- <!-- APL author sebawagner -->
<resource name="pointer_whiteboard_rsc" src="resources/pointer.swf" />
+ <!-- END APL author sebawagner -->
+
<!-- FamFam Icon Set -->
<resource name="bold" src="resources/text_bold.png" />
<!-- FamFam Icon Set -->
<resource name="italic" src="resources/text_italic.png" />
<!-- FamFam Icon Set -->
<resource name="add_whiteboard_rsc" src="resources/add.png" />
+ <resource name="wb_arrow_left_rsc" src="resources/left.png" />
+ <resource name="wb_arrow_right_rsc" src="resources/right.png" />
<include href="incubator/lzcombobox.lzx"/>
<include href="base/" />
<include href="windows/" />
<include href="helper/" />
-
<include href="panels/" />
-
+
<include href="basePropertyPanelWhiteboard.lzx" />
- <include href="fixedFileExplorerWhiteBoard.lzx" />
- <include href="fixedFileExplorerWhiteboardPanel.lzx" />
- <include href="whiteboardMiniButton.lzx" />
- <include href="whiteboardBarMenu.lzx" />
+ <include href="fixedFileExplorerWhiteBoard.lzx" />
+ <include href="fixedFileExplorerWhiteboardPanel.lzx" />
+ <include href="whiteboardMiniButton.lzx" />
+ <include href="whiteboardBarMenu.lzx" />
</library>
Added: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/resources/left.png
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/resources/left.png?rev=1771682&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/resources/left.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/resources/right.png
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/resources/right.png?rev=1771682&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/resources/right.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx?rev=1771682&r1=1771681&r2=1771682&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardBarMenu.lzx Mon Nov 28 05:32:01 2016
@@ -19,41 +19,11 @@
-->
<library>
-
-<class name="whiteboardBarMenu" extends="view" width="${ parent.width }" x="0" y="21"
+<class name="whiteboardBarMenu" extends="view" x="0" y="21"
height="20" layout="axis:x;spacing:1;inset:2" bgcolor="$once{ canvas.getThemeColor('baseMousecolorizer') }">
<attribute name="staticwidth" type="number" value="120" />
<attribute name="currentBtn" value="null" />
- <method name="getCurrentSize">
- <![CDATA[
- if ( ((this.subviews.length+1)*(this.staticwidth+1)) <= this.width) {
- return this.staticwidth;
- } else {
- var newwidth = Math.round((this.width-this.subviews.length)/(this.subviews.length+1));
- for (var i=0;i<this.subviews.length;i++) {
- this.subviews[i].setAttribute('width',newwidth);
- }
- return newwidth;
- }
- ]]>
- </method>
-
- <handler name="onwidth">
- <![CDATA[
- if ( ((this.subviews.length)*(this.staticwidth+1)) <= this.width) {
- for (var i=0;i<this.subviews.length;i++) {
- this.subviews[i].setAttribute('width',this.staticwidth);
- }
- } else {
- var newwidth = Math.round((this.width-this.subviews.length)/(this.subviews.length));
- for (var i=0;i<this.subviews.length;i++) {
- this.subviews[i].setAttribute('width',newwidth);
- }
- }
- ]]>
- </handler>
-
<method name="removeObject" args="btn">
var whiteboardId = btn.objRef.whiteboardId;
this.removeObjectSynced(btn);
@@ -68,7 +38,6 @@
if (this.subviews.length != 0 && removeCurrent) {
this.sendActiveWindowSynced(this.subviews[this.subviews.length-1]);
}
- parent.addNewItemButton.updatePosition();
]]>
</method>
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx?rev=1771682&r1=1771681&r2=1771682&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/whiteboardMiniButton.lzx Mon Nov 28 05:32:01 2016
@@ -40,12 +40,6 @@
parent.onwidth.sendEvent();
</handler>
- <handler name="onwidth">
- if (this.isinited){
- this.calcTextWidth();
- }
- </handler>
-
<method name="disableItem">
//if ($debug) Debug.write("disableItem :: set visibility to hidden");
this.isHidden = true;
@@ -138,11 +132,11 @@
<view name="_minimizebtn_dn" width="${ parent.width-2 }" height="16"
bgcolor="black" opacity="0.3" visibility="hidden" x="1" y="1" />
- <text text="${ parent.btnName }" fgcolor="0xFFFFFF" resize="false" x="1" fontsize="10" name="_text">
- <contextmenu>
- <contextmenuitem caption="$once{ canvas.getLabelName(711) }" onselect="this.parent.parent.parent.rename()" />
- </contextmenu>
- </text>
+ <text text="${ parent.btnName }" fgcolor="0xFFFFFF" resize="false" x="1" fontsize="10" name="_text"/>
+
+ <contextmenu>
+ <contextmenuitem caption="$once{ canvas.getLabelName(711) }" onselect="parent.parent.rename()" />
+ </contextmenu>
<method name="rename">
<![CDATA[
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/scrollbars/om_hscrollbar.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/scrollbars/om_hscrollbar.lzx?rev=1771682&r1=1771681&r2=1771682&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/scrollbars/om_hscrollbar.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/components/scrollbars/om_hscrollbar.lzx Mon Nov 28 05:32:01 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
@@ -20,42 +20,39 @@
-->
<library>
-<class name="om_hscrollbar" extends="basescrollbar" styleable="false"
- axis="x">
+<class name="om_hscrollbar" extends="basescrollbar" styleable="false" axis="x">
+
+ <!--- @keywords private -->
+ <attribute name="height" value="10"/>
- <!--- @keywords private -->
- <attribute name="height" value="10"/>
-
- <!--- @keywords private -->
- <method name="_showEnabled">
- <![CDATA[
- if (!_enabled) {
- //this.scrolltrack.thumb.setAttribute('height', 0);
- this.scrolltrack.thumb.setAttribute('visibility', 'hidden');
- } else {
- this.scrolltrack.thumb.setAttribute('visibility', 'visible');
- }
- super._showEnabled();
- ]]>
- </method>
+ <!--- @keywords private -->
+ <method name="_showEnabled">
+ <![CDATA[
+ if (!_enabled) {
+ //this.scrolltrack.thumb.setAttribute('height', 0);
+ this.scrolltrack.thumb.setAttribute('visibility', 'hidden');
+ } else {
+ this.scrolltrack.thumb.setAttribute('visibility', 'visible');
+ }
+ super._showEnabled();
+ ]]>
+ </method>
<view name="rightarrow" width="0" />
- <view name="scrolltrack">
- <basescrolltrack name="left"
- resource="omscrolltrack_x_rsc" stretches="width">
- <attribute name="height" value="${parent.height}"/>
- <attribute name="width" value="${parent.width}"/>
- </basescrolltrack>
- <basescrollthumb name="thumb" x="1">
- <view resource="omscrollbar_xthumbleft_rsc"/>
- <view resource="omscrollbar_xthumbmiddle_rsc" stretches="both"/>
- <view resource="omscrollbar_xthumbright_rsc"/>
- <stableborderlayout axis="x"/>
- </basescrollthumb>
- </view>
+ <view name="scrolltrack">
+ <basescrolltrack name="left" resource="omscrolltrack_x_rsc" stretches="width">
+ <attribute name="height" value="${parent.height}"/>
+ <attribute name="width" value="${parent.width}"/>
+ </basescrolltrack>
+ <basescrollthumb name="thumb" x="1">
+ <view resource="omscrollbar_xthumbleft_rsc"/>
+ <view resource="omscrollbar_xthumbmiddle_rsc" stretches="both"/>
+ <view resource="omscrollbar_xthumbright_rsc"/>
+ <stableborderlayout axis="x"/>
+ </basescrollthumb>
+ </view>
<view height="0" name="leftarrow" />
- <stableborderlayout axis="x"/>
-
+ <stableborderlayout axis="x"/>
</class>
</library>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx?rev=1771682&r1=1771681&r2=1771682&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx Mon Nov 28 05:32:01 2016
@@ -75,9 +75,9 @@
</handler>
</netRemoteCallHib>
</class>
-
<class name="fixedFileExplorerWhiteboardPanel" extends="basePropertyPanelWhiteboard" allowToggle="false"
labelid="615" visible="${ !canvas.currentRoomObj.hideWhiteboard }">
+ <attribute name="_bar" value="null" />
<handler name="oninit">
canvas._drawarea = this;
@@ -122,16 +122,14 @@
var whiteboard = new lz.multiWhiteboardPanel(this,{
whiteboardId:whiteboardId
});
- var tempWidth = this._bar.getCurrentSize();
var tWhiteboardBtn = new lz.whiteboardMiniButton(this._bar,{
objRef:whiteboard,
- width:tempWidth,
+ width: _bar.staticwidth,
isactive:true,
btnName: wbName
});
this._bar.currentBtn = tWhiteboardBtn;
tWhiteboardBtn.onmouseout.sendEvent(null);
- this.addNewItemButton.updatePosition();
canvas.whiteboardCount++;
return whiteboard;
</method>
@@ -265,30 +263,33 @@
]]>
</method>
- <whiteboardBarMenu name="_bar" height="20" y="21">
- <attribute name="whiteboardId" value="-1" type="number" />
-
- <handler name="onsubview" args="newSub">
- parent.addNewItemButton.updatePosition();
+ <view name="scrollLeft" y="21" x="0" width="20">
+ <handler name="onclick" args="refOb">
+ parent._barArea._scroll.step(-1);
</handler>
- <handler name="onwidth" args="newSub">
- parent.addNewItemButton.updatePosition();
+ <view resource="wb_arrow_left_rsc" y="0" x="0" opacity="${ parent.parent._barArea._scroll.scrollable ? 1 : 0.1 }" />
+ </view>
+ <view name="_barArea" width="${ parent.width - 60 }" height="20" x="20" y="21" clip="true">
+ <whiteboardBarMenu name="_bar" height="20" y="0" x="0">
+ <attribute name="whiteboardId" value="-1" type="number" />
+
+ <handler name="oninit">
+ parent.parent._bar = this;
+ </handler>
+ </whiteboardBarMenu>
+ <om_hscrollbar name="_scroll" height="0" stepsize="50"/>
+ </view>
+ <view name="scrollRight" y="21" x="${ parent.width - 40 }" width="20">
+ <handler name="onclick" args="refOb">
+ parent._barArea._scroll.step(1);
</handler>
- </whiteboardBarMenu>
+ <view resource="wb_arrow_right_rsc" y="0" x="0" opacity="${ parent.parent._barArea._scroll.scrollable ? 1 : 0.1 }" />
+ </view>
- <view name="addNewItemButton" y="24"
+ <view name="addNewItemButton" y="24" x="${ parent.width - 20 }"
visible="${ ((canvas.ismoderator) ? true : ((canvas.isAllowedToDraw) ? true : false )) }">
<attribute name="whiteboardId" value="-1" type="number" />
- <method name="updatePosition">
- if (parent._bar.subviews.length != 0) {
- var borderItem = parent._bar.subviews[parent._bar.subviews.length-1];
- this.setAttribute("x",borderItem.x + borderItem.width + 2);
- } else {
- this.setAttribute("x",2);
- }
- </method>
-
<handler name="onmouseover" args="refOb">
this.bg.setAttribute("visibility","visible");
</handler>
@@ -309,7 +310,7 @@
</view>
<view width="${ parent.width }" height="1" y="41"
- bgcolor="$once{ canvas.getThemeColor('basebgcolorizer') }">
+ bgcolor="$once{ canvas.getThemeColor('basebgcolorizer') }">
<attribute name="whiteboardId" value="-1" type="number" />
</view>
</class>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/library.lzx?rev=1771682&r1=1771681&r2=1771682&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/library.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/library.lzx Mon Nov 28 05:32:01 2016
@@ -29,19 +29,20 @@
<resource name="interview_record_start" src="resources/webstart_play.png" />
<resource name="interview_record_stop" src="resources/webstart_stop.png" />
<!-- END APL author sebawagner -->
-
+
<!-- FamFam Icon Set -->
<resource name="bold" src="resources/text_bold.png" />
<!-- FamFam Icon Set -->
<resource name="italic" src="resources/text_italic.png" />
<!-- FamFam Icon Set -->
<resource name="add_whiteboard_rsc" src="resources/add.png" />
+ <resource name="wb_arrow_left_rsc" src="resources/left.png" />
+ <resource name="wb_arrow_right_rsc" src="resources/right.png" />
<include href="incubator/lzcombobox.lzx"/>
<include href="base/" />
<include href="windows/" />
<include href="helper/" />
-
<include href="panels/" />
<include href="dynamicFileName.lzx" />
Added: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/resources/left.png
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/resources/left.png?rev=1771682&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/resources/left.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/resources/right.png
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/resources/right.png?rev=1771682&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/resources/right.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
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=1771682&r1=1771681&r2=1771682&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 Mon Nov 28 05:32:01 2016
@@ -19,8 +19,7 @@
-->
<library>
-
-<class name="whiteboardBarMenu" extends="view" width="${ parent.width }" x="0" y="21"
+<class name="whiteboardBarMenu" extends="view" x="0" y="21"
height="20" layout="axis:x;spacing:1;inset:2" bgcolor="$once{ canvas.getThemeColor('baseMousecolorizer') }">
<switch>
<when property="$as3">
@@ -32,35 +31,6 @@
<attribute name="staticwidth" type="number" value="120" />
<attribute name="currentBtn" value="null" />
- <method name="getCurrentSize">
- <![CDATA[
- if ( ((this.subviews.length+1)*(this.staticwidth+1)) <= this.width) {
- return this.staticwidth;
- } else {
- var newwidth = Math.round((this.width-this.subviews.length)/(this.subviews.length+1));
- for (var i=0;i<this.subviews.length;i++) {
- this.subviews[i].setAttribute('width',newwidth);
- }
- return newwidth;
- }
- ]]>
- </method>
-
- <handler name="onwidth">
- <![CDATA[
- if ( ((this.subviews.length)*(this.staticwidth+1)) <= this.width) {
- for (var i=0;i<this.subviews.length;i++) {
- this.subviews[i].setAttribute('width',this.staticwidth);
- }
- } else {
- var newwidth = Math.round((this.width-this.subviews.length)/(this.subviews.length));
- for (var i=0;i<this.subviews.length;i++) {
- this.subviews[i].setAttribute('width',newwidth);
- }
- }
- ]]>
- </handler>
-
<method name="removeObject" args="btn">
var whiteboardId = btn.objRef.whiteboardId;
this.removeObjectSynced(btn);
@@ -77,7 +47,6 @@
} else if (removeCurrent) {
this.sendActiveWindowSynced(this.subviews[this.subviews.length-1]);
}
- parent.addNewItemButton.updatePosition();
]]>
</method>
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=1771682&r1=1771681&r2=1771682&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 Mon Nov 28 05:32:01 2016
@@ -40,12 +40,6 @@
parent.onwidth.sendEvent();
</handler>
- <handler name="onwidth">
- if (this.isinited){
- this.calcTextWidth();
- }
- </handler>
-
<method name="disableItem">
//if ($debug) Debug.write("disableItem :: set visibility to hidden");
this.isHidden = true;
@@ -138,11 +132,11 @@
<view name="_minimizebtn_dn" width="${ parent.width-2 }" height="16"
bgcolor="black" opacity="0.3" visibility="hidden" x="1" y="1" />
- <text text="${ parent.btnName }" fgcolor="0xFFFFFF" resize="false" x="1" fontsize="10" name="_text">
- <contextmenu>
- <contextmenuitem caption="$once{ canvas.getLabelName(711) }" onselect="this.parent.parent.parent.rename()" />
- </contextmenu>
- </text>
+ <text text="${ parent.btnName }" fgcolor="0xFFFFFF" resize="false" x="1" fontsize="10" name="_text"/>
+
+ <contextmenu>
+ <contextmenuitem caption="$once{ canvas.getLabelName(711) }" onselect="parent.parent.rename()" />
+ </contextmenu>
<method name="rename">
<![CDATA[
@@ -219,4 +213,3 @@
</class>
</library>
-