Author: sebawagner
Date: Sun Apr 1 16:52:36 2012
New Revision: 1308152
URL: http://svn.apache.org/viewvc?rev=1308152&view=rev
Log:
OPENMEETINGS-124 Clean Up Splash Screen and unused resources in init
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/configure.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/resources/mainbackroundmenu.png
incubator/openmeetings/trunk/singlewebapp/WebContent/src/splash_defaultvalues.swf
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/autoLoader.lzx
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx?rev=1308152&r1=1308151&r2=1308152&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx Sun Apr
1 16:52:36 2012
@@ -48,10 +48,7 @@
<whitestyle name="menuStyle" basecolor="${ canvas.styleMenuBarBaseColor }"
textcolor="0x000000" />
-<resource name="currentsplash" src="splash_defaultvalues.swf" />
-<resource name="configure_vidrsc" src="resources/configure.png" />
-<resource name="mainbackroundmenu_rsc" src="resources/mainbackroundmenu.png" />
-<splash><view center="true" ratio="1" resource="splash_defaultvalues.swf"
/></splash>
+
<!-- main colors: 264269 -->
<handler name="oninit">
//this.setAttribute('framerate',12);
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx?rev=1308152&r1=1308151&r2=1308152&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx Sun
Apr 1 16:52:36 2012
@@ -49,10 +49,6 @@
<whitestyle name="menuStyle" basecolor="${ canvas.styleMenuBarBaseColor }"
textcolor="0x000000" />
-<resource name="currentsplash" src="splash_defaultvalues.swf" />
-<resource name="configure_vidrsc" src="resources/configure.png" />
-<resource name="mainbackroundmenu_rsc" src="resources/mainbackroundmenu.png" />
-<splash><view center="true" ratio="1" resource="splash_defaultvalues.swf"
/></splash>
<!-- main colors: 264269 -->
<handler name="oninit">
//this.setAttribute('framerate',12);
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/autoLoader.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/autoLoader.lzx?rev=1308152&r1=1308151&r2=1308152&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/autoLoader.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/autoLoader.lzx
Sun Apr 1 16:52:36 2012
@@ -23,8 +23,8 @@
<class name="autoLoader" extends="view" align="center" valign="middle"
layout="axis:y;spacing:2">
- <attribute name="maxwidth" value="100" type="number" />
- <attribute name="maxsteps" value="20" type="number" />
+ <attribute name="maxwidth" value="300" type="number" />
+ <attribute name="maxsteps" value="22" type="number" />
<attribute name="currentsteps" value="0" type="number" />
<method name="close">
@@ -37,18 +37,20 @@
<method name="setProgress">
this.currentsteps += 1;
if($debug) Debug.write("autoLoader/setProgress =====
",this.currentsteps);
- var w =
Math.round(((this.maxwidth-2)/this.maxsteps)*this.currentsteps);
+ var w =
Math.round(((this.maxwidth)/this.maxsteps)*this.currentsteps);
this.loadingbar.setAttribute('visibility','visible');
if($debug) Debug.write("autoLoader/setResourceNumber == ",w);
- this.loadingbar.setAttribute('frame',w);
+ this.loadingbar._loading.setAttribute('width',w);
</method>
- <text fontsize="11" >Autoconnect</text>
<text fontsize="11" name="error" />
<text fontsize="11" name="_src" />
- <view name="loadingbar" resource="currentsplash"
- x="-5" y="60" width="$once{ parent.maxwidth }" visibility="hidden" />
+ <view name="loadingbar" bgcolor="$once{ canvas.styleMenuBarBaseColor }"
height="10"
+ x="-5" y="60" width="$once{ parent.maxwidth }" visibility="hidden">
+ <view x="1" y="1" width="$once{ parent.width-2 }" height="8"
bgcolor="0xFFFFFF"/>
+ <view name="_loading" x="1" y="1" width="0" height="8"
bgcolor="$once{ canvas.styleMenuBarBaseColor }"/>
+ </view>
</class>
</library>
