Author: sebawagner
Date: Thu Apr 5 18:19:05 2012
New Revision: 1309986
URL: http://svn.apache.org/viewvc?rev=1309986&view=rev
Log:
OPENMEETINGS-128 More cleaned up folders Part8
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/3floppy_unmount.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/back.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/background.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/backgroundtools.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/boundingBoxPointer.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/button_cancel.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/combodown.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/configure.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/delete.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/down.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/drawarrow.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/drawarrow.swf
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/drawarrowgray.swf
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/ellipse.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/fileopen.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/folder_yellow.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/forward.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/hand.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/htmlbg.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/kuser.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/letter.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/mix_record.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/next.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/ooo_gulls.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/ooo_gulls_smal.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/page_white_powerpoint.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/paint.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/plain.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/point.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/pointer.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/rectangle.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/reload_small.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/revert.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/sharedIcon.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/tool_delay.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/top.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/videobg.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/viewmag.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/whiteboardBG.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/whiteboardback.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/wizard.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/www.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/x-office-presentation.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/resources/xmag.png
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/drawViewNew.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/helper/boundingBoxAll.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/library.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/drawViewNew.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/drawViewNew.lzx?rev=1309986&r1=1309985&r2=1309986&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/drawViewNew.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/drawViewNew.lzx
Thu Apr 5 18:19:05 2012
@@ -20,27 +20,6 @@
-->
<library>
-<class name="drawArrowWhiteBoard" resource="drawarrow_rsc" >
-
- <!-- Not needed anymore, use LzView.setColor instead
- <method name="setTint" args="color, brightness">
- <![CDATA[
- if (color != "" && color != null){
- if (brightness == null) { brightness = 0; }
- var rgb = color;
- var red=(rgb >> 16) & 0xFF;
- var green=(rgb >> 8) & 0xFF;
- var blue=rgb & 0xFF;
-
- this.setColorTransform( { ra : red, ga : green, ba : blue,
- rb : 0, gb : 0, bb : 100 } );
- }
- ]]>
- </method>
- -->
-
-</class>
-
<class name="drawViewInner" extends="drawview" x="0" y="0" >
</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/helper/boundingBoxAll.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/helper/boundingBoxAll.lzx?rev=1309986&r1=1309985&r2=1309986&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/helper/boundingBoxAll.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/helper/boundingBoxAll.lzx
Thu Apr 5 18:19:05 2012
@@ -410,26 +410,8 @@
<handler name="onmouseout">
lz.Cursor.unlock();
</handler>
- <!--
- <labelTooltip labelid="252" />
- -->
</view>
- <!--
- <view resource="_boundingBoxPointer" x="${ parent.width/2-this.width/2
}" y="${ parent.height/2-this.height/2 }"
- onmousedown="parent._applyDragstateFromThis()"
onmouseup="parent._removeDragstateFromThis()"
- onmouseover="this.parent.applyScrollbarToObject()"
onmouseout="this.parent.removeScrollbarToObject()">
- <handler name="oninit">
- var newMenu = new LzContextMenu();
- newMenu.hideBuiltInItems();
- var item1 = newMenu.makeMenuItem('remove Item', new
LzDelegate(this.parent, "__LZRemoveItem"));
- newMenu.addItem(item1);
- this.setContextMenu(newMenu);
- </handler>
- <labelTooltip labelid="251" />
- </view>
- -->
-
<view resource="deleteIcon" y="2" width="16" height="16"
x="${
parent.width-this.width-parent.innerInsetScrollbars-2 }" >
<handler name="onclick">
@@ -449,54 +431,6 @@
<labelTooltip labelid="80" />
</view>
- <!--
- <view name="_inner" y="22" width="${ parent.width }"
- height="${ parent.height-22 }" visible="false">
- <view name="_inner">
-
- <attribute name="timeisInited" value="false" type="boolean" />
- <attribute name="sendObjectDel" value="null" />
-
- <handler name="oninit">
- if (this.parent.parent.objRef.typeOfObject=='swf') {
- this.sendObjectDel = new LzDelegate( this, "sendObject" );
- }
- </handler>
- <handler name="onx" args="x">
- if (this.parent.parent.objRef.typeOfObject=='swf'){
- this.parent.parent.objRef._swfView.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 (this.parent.parent.objRef.typeOfObject=='swf'){
- this.parent.parent.objRef._swfView.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">
- //Debug.write("sendObject");
-
this.parent.parent.whiteboardRef.sendCurrentSWFObject(this.parent.parent.objRef);
- this.timeisInited=false;
- </method>
-
- </view>
- <om_vscrollbar name="_scrollstv" />
- <om_hscrollbar name="_scrollsth" />
- </view>
- -->
-
<view resource="_boundingBoxPointerTL" x="0" y="0" />
<view resource="_boundingBoxPointerTR" x="${ parent.width-this.width }"
y="0" />
<view name="_gripperResize" visibility="visible"
@@ -514,7 +448,6 @@
resource="_boundingBoxPointerURNoGripper" x="${
parent.width-this.width }" y="${ parent.height-this.height }" />
<view resource="_boundingBoxPointerUL" x="0" y="${
parent.height-this.height }" />
-
</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/library.lzx?rev=1309986&r1=1309985&r2=1309986&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/library.lzx
Thu Apr 5 18:19:05 2012
@@ -20,13 +20,10 @@
-->
<library>
- <resource name="backgroundtools_rsc"
src="resources/backgroundtools.png" />
<resource name="menupointer_rsc" src="resources/menupointer.png" />
<resource name="line_rsc" src="resources/line.png" />
<resource name="uline_rsc" src="resources/uline.png" />
- <resource name="whiteboardback_rsc" src="resources/whiteboardback.png"
/>
- <resource name="drawarrow_rsc" src="resources/drawarrowgray.swf" />
<resource name="drawarrowicon_rsc" src="resources/drawarrowicon.png" />
<resource name="_boundingBoxPointerTR"
src="resources/boundingBoxTR.png" />
@@ -34,35 +31,21 @@
<resource name="_boundingBoxPointerUR"
src="resources/boundingBoxUR.png" />
<resource name="_boundingBoxPointerURNoGripper"
src="resources/boundingBoxULNoGripper.png" />
<resource name="_boundingBoxPointerUL"
src="resources/boundingBoxUL.png" />
- <resource name="_boundingBoxPointer"
src="resources/boundingBoxPointer.png" />
<resource name="letter" src="resources/applixware.png" />
<resource name="paint" src="toolbar/resources/draw-freehand.png" />
<resource name="saveobj" src="resources/filesave.png" />
- <resource name="loadobj" src="resources/fileopen.png" />
<resource name="revert" src="resources/undo.png" />
<resource name="next" src="resources/redo.png" />
- <resource name="pointer" src="resources/configure.png" />
<resource name="plain" src="resources/editdelete.png" />
<resource name="plainSlides" src="resources/filenew.png" />
- <resource name="point" src="resources/point.png" />
<resource name="close" src="resources/cancel.png" />
<resource name="bold" src="resources/bold.png" />
<resource name="italic" src="resources/italic.png" />
- <resource name="combodown" src="resources/combodown.png" />
<resource name="deleteIcon" src="resources/cancel.png" />
<resource name="ellipse" src="toolbar/resources/draw-ellipse.png" />
<resource name="rectangle" src="toolbar/resources/draw-rectangle.png" />
<resource name="imageIcon" src="resources/image.png" />
- <resource name="handIcon" src="resources/wizard.png" />
- <resource name="sharedIcon" src="resources/kuser.png" />
- <resource name="htmlbg" src="resources/htmlbg.png" />
- <resource name="whiteboardBG" src="resources/whiteboardBG.png" />
- <resource name="videobg" src="resources/videobg.png" />
- <resource name="viewmag" src="resources/viewmag.png" />
- <resource name="reload_small_rsc" src="resources/reload_small.png" />
-
- <resource name="folder_top_rsc" src="resources/top.png" />
<resource name="pointer_whiteboard_rsc" src="resources/pointer.swf" />
<resource name="pointer_whiteboard_menu_rsc"
src="resources/pointerWhiteBoard_menu_rsc.swf" />
@@ -75,10 +58,6 @@
<resource name="doc_zoom_plus" src="resources/xmag_plus2.png" />
<resource name="doc_zoom_minus" src="resources/xmag_plus.png" />
- <resource name="filedelete_rsc" src="resources/delete.png" />
-
- <resource name="background_screenview_rsc"
src="resources/background.png" />
-
<resource name="add_whiteboard_rsc" src="resources/edit_add.png" />
<include href="incubator/lzcombobox.lzx"/>
