X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fbuiltin%2Fsplash.xwt;h=b0fc15175846d3ea38e79676c290669dc88dd755;hb=d075aa8d89b4919fb10379f2f0abe35665586f27;hp=bef59951ba029187709dd6ea31526982bb414d6f;hpb=a7bc8922080f56017b141a3835c722344fa4cffc;p=org.ibex.core.git

diff --git a/src/org/xwt/builtin/splash.xwt b/src/org/xwt/builtin/splash.xwt
index bef5995..b0fc151 100644
--- a/src/org/xwt/builtin/splash.xwt
+++ b/src/org/xwt/builtin/splash.xwt
@@ -4,20 +4,34 @@
 
         KeyPressed += function(k) { if (k == "escape") thisbox = null; }
 
-        var progress = function(n, d) {
-var t = "downloaded " + xwt.math.ceil(100 * n/d) + "%";
-xwt.log.println("downloaded " + t);
-            $innerbar.width = $bar.width * n / d + 1;
+        var settext = function(t) {
             $text.text = t;
+            $text1.text = t;
+            $text2.text = t;
+            $text3.text = t;
+            $text4.text = t;
         }
 
+        var progress = function(n, d) {
+            var t = "downloaded " + xwt.math.ceil(100 * n/d) + "%";
+            xwt.log.println("downloaded " + t);
+            $innerbar.width = $bar.width * n / d + 1;
+            settext(t);
+       } 
+
         xwt.thread = function() {
-//            $text.font = xwt.fonts.vera["Vera.ttf"];
-//            $text.font = xwt.res.cache(cab["Arial.TTF"]);
-            $text.font = xwt.res.uncab(xwt.res.url("http://master.dist.xwt.org/msfonts/arial32.exe"))["Arial.TTF"];
-            $text.fontsize = 18;
-          $text.text = "downloading...";
-            fill = xwt.org.xwt.builtin["splash.png"];
+            $text.font = xwt.font.sansserif;
+            $text.fontsize = 14;
+            $text1.font = xwt.font.sansserif;
+            $text1.fontsize = 14;
+            $text2.font = xwt.font.sansserif;
+            $text2.fontsize = 14;
+            $text3.font = xwt.font.sansserif;
+            $text3.fontsize = 14;
+            $text4.font = xwt.font.sansserif;
+            $text4.fontsize = 14;
+            settext("downloading...");
+            fill = .org.xwt.builtin["splash.png"];
             xwt.ui.window = thisbox;
             thisbox.width=394;
             thisbox.height=276;
@@ -33,18 +47,28 @@ xwt.log.println("downloaded " + t);
             var new_xwt = xwt.clone(new_rr);
 
             xwt.thread = function() {
-for(var i=0; 100>i; i++) {
-progress(i, 100);
-xwt.thread.yield();
-}
-                new_xwt.apply(xwt.box, new_xwt["main.xwt"]);
-                thisbox = null;
+                for(var i=0; 100>i; i++) {
+                progress(i, 100);
+                xwt.thread.yield();
             }
+            new_xwt.apply(xwt.box, new_xwt["main.xwt"]);
+            thisbox = null;
+        }
 xwt.log.println("leaving");
         }
 
         <box height="236" align="bottomleft" packed="false" x="20" y="0">
-            <box textcolor="white" id="text" shrink="true"/>
+            <box vshrink="true">
+                <box packed="false" textcolor="black" x="2" y="2" id="text1"/>
+                <box packed="false" textcolor="black" x="0" y="2" id="text2"/>
+                <box packed="false" textcolor="black" x="2" y="0" id="text3"/>
+                <box packed="false" textcolor="black" x="0" y="0" id="text4"/>
+                <box cols="2">
+                    <box height="1" colspan="2"/>
+                    <box width="1"/>
+                    <box textcolor="white" id="text"/>
+                </box>
+            </box>
         </box>
         <box packed="false" id="bar" x="20" y="236" width="354" height="20" align="left">
             <box id="innerbar" fill="blue" width="10" height="20"/>
@@ -52,3 +76,4 @@ xwt.log.println("leaving");
 
     </template>
 
+</xwt>
\ No newline at end of file