Author: vdegtyarev Date: Wed Nov 25 11:21:17 2015 New Revision: 1716356 URL: http://svn.apache.org/viewvc?rev=1716356&view=rev Log: OPENMEETINGS-1279: OmImage class is used instead of image to display icons.
Added: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/omImage.lzx Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/button/baseChooseIcon.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/button/blueButton.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/library.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/fillColorChoose.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/lineColorChoose.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/lineOnlyColorChoose.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/miniIcons.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/simplevaluelist/recordValueList.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/turnoverlist/turnOverListHeaderItem.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/conferenceMenubar.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/confirmationSingle.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/helper/boundingBoxAll.lzx openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/dashboard/tabButtonMain.lzx Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/button/baseChooseIcon.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/button/baseChooseIcon.lzx?rev=1716356&r1=1716355&r2=1716356&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/button/baseChooseIcon.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/button/baseChooseIcon.lzx Wed Nov 25 11:21:17 2015 @@ -33,7 +33,7 @@ <view name="_bg" x="1" y="1" height="$once{ parent.height - 2 }" width="$once{ parent.width - 2 }" bgcolor="$once{ canvas.getThemeColor('baseMousecolorizer') }" /> - <image name="_icon" src="$once{ canvas.getThemeImage(parent.resourceN) }" + <omImage name="_icon" src="$once{ canvas.getThemeImage(parent.resourceN) }" x="$once{ (parent.width-this.width) / 2 }" y="$once{ (parent.height-this.height) / 2 }" width="18" height="18" stretches="both"/> Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/button/blueButton.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/button/blueButton.lzx?rev=1716356&r1=1716355&r2=1716356&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/button/blueButton.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/button/blueButton.lzx Wed Nov 25 11:21:17 2015 @@ -45,7 +45,7 @@ bgcolor="white" opacity="1" x="1" y="1" width="$once{ parent.width-2 }" height="$once{ parent.height-2 }" /> - <image name="_rscIcon" stretches="both" + <omImage name="_rscIcon" stretches="both" opacity="${ ( parent.enabled ) ? 1 : 0.4 }" x="$once{ parent.x_insetResource }" y="$once{ parent.y_insetResource }" @@ -53,7 +53,6 @@ height="$once{ parent.height_insetResource }" src="$once{ canvas.getThemeImage(parent.resourceItem) }" /> - <handler name="onmouseover"> this._rscIcon.setAttribute("x",this._rscIcon.x-1); Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/library.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/library.lzx?rev=1716356&r1=1716355&r2=1716356&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/library.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/library.lzx Wed Nov 25 11:21:17 2015 @@ -30,6 +30,7 @@ <include href="tableListItem.lzx" /> <include href="labelRadioButton.lzx" /> <include href="labeltabelement.lzx" /> + <include href="omImage.lzx" /> <include href="scrollbars/" /> <include href="text/" /> Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/fillColorChoose.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/fillColorChoose.lzx?rev=1716356&r1=1716355&r2=1716356&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/fillColorChoose.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/fillColorChoose.lzx Wed Nov 25 11:21:17 2015 @@ -142,7 +142,7 @@ </view> <button name="rgt" x="32" y="1" onclick="parent.toggle()" width="24" height="23" > - <image x="4" y="3" src="$once{ canvas.getThemeImage('colorfillchoose_rsc') }" + <omImage x="4" y="3" src="$once{ canvas.getThemeImage('colorfillchoose_rsc') }" width="16" height="16" stretches="both" /> <labelTooltip labelid="427" /> </button> @@ -171,9 +171,9 @@ this._lock_open.setAttribute("visibility","hidden"); } </handler> - <image x="4" y="3" name="_lock" src="$once{ canvas.getThemeImage('color_lock_rsc') }" + <omImage x="4" y="3" name="_lock" src="$once{ canvas.getThemeImage('color_lock_rsc') }" width="16" height="16" stretches="both" /> - <image x="4" y="3" name="_lock_open" src="$once{ canvas.getThemeImage('color_lock_open_rsc') }" + <omImage x="4" y="3" name="_lock_open" src="$once{ canvas.getThemeImage('color_lock_open_rsc') }" width="16" height="16" stretches="both" visibility="hidden" /> <labelTooltip labelid="428" /> </button> Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/lineColorChoose.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/lineColorChoose.lzx?rev=1716356&r1=1716355&r2=1716356&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/lineColorChoose.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/lineColorChoose.lzx Wed Nov 25 11:21:17 2015 @@ -144,7 +144,7 @@ </view> <button name="rgt" x="32" y="1" onclick="parent.toggle()" width="24" height="23" > - <image x="4" y="3" src="$once{ canvas.getThemeImage('colorlinechoose_rsc') }" + <omImage x="4" y="3" src="$once{ canvas.getThemeImage('colorlinechoose_rsc') }" width="16" height="16" stretches="both" /> <labelTooltip labelid="424" /> </button> @@ -173,9 +173,9 @@ this._lock_open.setAttribute("visibility","hidden"); } </handler> - <image x="4" y="3" name="_lock" src="$once{ canvas.getThemeImage('color_lock_rsc') }" + <omImage x="4" y="3" name="_lock" src="$once{ canvas.getThemeImage('color_lock_rsc') }" width="16" height="16" stretches="both" /> - <image x="4" y="3" name="_lock_open" src="$once{ canvas.getThemeImage('color_lock_open_rsc') }" + <omImage x="4" y="3" name="_lock_open" src="$once{ canvas.getThemeImage('color_lock_open_rsc') }" width="16" height="16" stretches="both" visibility="hidden" /> <labelTooltip labelid="426" /> </button> Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/lineOnlyColorChoose.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/lineOnlyColorChoose.lzx?rev=1716356&r1=1716355&r2=1716356&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/lineOnlyColorChoose.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/lps/lineOnlyColorChoose.lzx Wed Nov 25 11:21:17 2015 @@ -92,7 +92,7 @@ </view> <button name="rgt" x="32" y="1" onclick="parent.toggle()" width="24" height="23" > - <image x="4" y="3" src="$once{ canvas.getThemeImage('colorlinechoose_rsc') }" + <omImage x="4" y="3" src="$once{ canvas.getThemeImage('colorlinechoose_rsc') }" width="16" height="16" stretches="both" /> <labelTooltip labelid="424" /> </button> Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/miniIcons.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/miniIcons.lzx?rev=1716356&r1=1716355&r2=1716356&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/miniIcons.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/miniIcons.lzx Wed Nov 25 11:21:17 2015 @@ -42,7 +42,7 @@ </handler> </class> -<class name="miniIconsImage" extends="image" stretches="both"> +<class name="miniIconsImage" extends="omImage" stretches="both"> <attribute name="showhandcursor" value="true" type="boolean" /> <handler name="onmouseover"> if (this.showhandcursor) { Added: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/omImage.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/omImage.lzx?rev=1716356&view=auto ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/omImage.lzx (added) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/omImage.lzx Wed Nov 25 11:21:17 2015 @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + 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 + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> +<library> + +<class name="omImage" extends="image"> + <switch> + <when property="$as3"> + <passthrough> + import flash.net.*; + import flash.display.*; + </passthrough> + </when> + </switch> + <handler name="oninit"> + <![CDATA[ + if (this.src != '' && this.src != null) { + //if ($debug) Debug.write("omImage::oninit src ", this.src); + this.sprite.resource = this.src; + if (! this.sprite.imgLoader) { + if (this.sprite.resourceContainer) { + // unload previous internal image-resource + this.sprite.unload(); + } + this.sprite.imgLoader = new Loader(); + this.sprite.imgLoader.mouseEnabled = false;// @devnote: see LPP-7022 + this.sprite.imgLoader.mouseChildren = false; + this.sprite.resourceContainer = this.sprite.imgLoader; + this.sprite.addChild(this.sprite.imgLoader); + } + var res:Loader = this.sprite.imgLoader; + if (res) { + res.scaleX = res.scaleY = 1.0; + } + + this.sprite.imgLoader.load(new URLRequest(this.src), LzSprite.loaderContext); + } + ]]> + </handler> +</class> + +</library> Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/simplevaluelist/recordValueList.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/simplevaluelist/recordValueList.lzx?rev=1716356&r1=1716355&r2=1716356&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/simplevaluelist/recordValueList.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/simplevaluelist/recordValueList.lzx Wed Nov 25 11:21:17 2015 @@ -33,7 +33,7 @@ this.parent.parent.parent.parent.parent.itemToDelete=this; this.parent.parent.parent.parent.parent.deleteItem.sendEvent(parent); </method> - <image stretches="both" width="16" height="16" + <omImage stretches="both" width="16" height="16" src="$once{ canvas.getThemeImage('button_cancel_rsc') }" align="center" y="4" /> <labelTooltip labelid="274" /> Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/turnoverlist/turnOverListHeaderItem.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/turnoverlist/turnOverListHeaderItem.lzx?rev=1716356&r1=1716355&r2=1716356&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/turnoverlist/turnOverListHeaderItem.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/turnoverlist/turnOverListHeaderItem.lzx Wed Nov 25 11:21:17 2015 @@ -160,9 +160,9 @@ parent.parent.parent.updateOrder(this); </handler> - <image name="_sortUp" visibility="hidden" stretches="both" width="8" height="8" y="6" + <omImage name="_sortUp" visibility="hidden" stretches="both" width="8" height="8" y="6" x="${parent.width - 13 }" src="$once{ canvas.getThemeImage('sort_up_rsc') }" /> - <image name="_sortDown" visibility="hidden" stretches="both" width="8" height="8" y="6" + <omImage name="_sortDown" visibility="hidden" stretches="both" width="8" height="8" y="6" x="${parent.width - 13 }" src="$once{ canvas.getThemeImage('sort_down_rsc') }" /> </class> Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx?rev=1716356&r1=1716355&r2=1716356&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx Wed Nov 25 11:21:17 2015 @@ -778,6 +778,8 @@ //if ($debug) Debug.write("tPath "+tPath); if (tPath == null) { if ($debug) Debug.warn("getThemeImage - No Image found for config: ",tName); + } else { + tPath = canvas.getUrl() + 'public/' + tPath; } return tPath; </method> Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/conferenceMenubar.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/conferenceMenubar.lzx?rev=1716356&r1=1716355&r2=1716356&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/conferenceMenubar.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/conference/conferenceMenubar.lzx Wed Nov 25 11:21:17 2015 @@ -113,7 +113,7 @@ <view width="${ parent.width-1 }" bgcolor="0xFFFFFF" opacity="0.4" height="$once{ parent.height - 2}" y="1" visibility="hidden" name="bgc"/> - <image src="$once{ canvas.getThemeImage( 'exit_btn_rsc' ) }" y="4" x="4" /> + <omImage src="$once{ canvas.getThemeImage( 'exit_btn_rsc' ) }" y="4" x="4" /> <view width="1" height="${ parent.height }" y="0" bgcolor="0xEEEEEE" x="${ parent.width-1 }" /> Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/confirmationSingle.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/confirmationSingle.lzx?rev=1716356&r1=1716355&r2=1716356&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/confirmationSingle.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/popups/confirmationSingle.lzx Wed Nov 25 11:21:17 2015 @@ -35,7 +35,7 @@ <attribute name="iconResource" value="warning_popup_icon_rsc" type="string" /> - <image x="4" src="$once{ canvas.getThemeImage(parent.iconResource) }" y="24" /> + <omImage x="4" src="$once{ canvas.getThemeImage(parent.iconResource) }" y="24" /> <labelText labelid="$once{ parent.labeliderror }" y="24" width="$once{ parent.width - 40 }" Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/helper/boundingBoxAll.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/helper/boundingBoxAll.lzx?rev=1716356&r1=1716355&r2=1716356&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/helper/boundingBoxAll.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/helper/boundingBoxAll.lzx Wed Nov 25 11:21:17 2015 @@ -454,7 +454,7 @@ </view> - <image src="$once{ canvas.getThemeImage('bounding_box_textedit_item_rsc') }" y="2" width="16" height="16" stretches="both" + <omImage src="$once{ canvas.getThemeImage('bounding_box_textedit_item_rsc') }" y="2" width="16" height="16" stretches="both" name="_editText" visibility="hidden" x="${ parent.width-this.width-parent.innerInsetScrollbars-18 }" > <handler name="onclick"> this.parent.whiteboardRef @@ -476,9 +476,9 @@ </handler> <labelTooltip labelid="1463" /> - </image> + </omImage> - <image src="$once{ canvas.getThemeImage('bounding_box_delete_item_rsc') }" y="2" width="16" height="16" + <omImage src="$once{ canvas.getThemeImage('bounding_box_delete_item_rsc') }" y="2" width="16" height="16" x="${ parent.width-this.width-parent.innerInsetScrollbars-2 }" stretches="both"> <handler name="onclick"> //Debug.write("this.parent.objRef.name: ",this.parent.objRef.name); @@ -495,7 +495,7 @@ </handler> <labelTooltip labelid="80" /> - </image> + </omImage> <view resource="_boundingBoxPointerTL" x="0" y="0" /> <view resource="_boundingBoxPointerTR" x="${ parent.width-this.width }" y="0" /> Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/dashboard/tabButtonMain.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/dashboard/tabButtonMain.lzx?rev=1716356&r1=1716355&r2=1716356&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/dashboard/tabButtonMain.lzx (original) +++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/dashboard/tabButtonMain.lzx Wed Nov 25 11:21:17 2015 @@ -105,7 +105,7 @@ height="$once{ parent.height-4 }" opacity="1" visibility="hidden"/> <state applied="$once{ parent.showIcon }" > - <image x="6" y="6" name="_icon" src="$once{ canvas.getThemeImage( parent.currentIconRsc ) }" + <omImage x="6" y="6" name="_icon" src="$once{ canvas.getThemeImage( parent.currentIconRsc ) }" width="20" height="20" stretches="both" /> </state>