X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fbuiltin%2Fsplash.xwt;h=a62061cd51b1589c89b52644f278e85008f63ff6;hb=e1bf2123524ba1cc258188314733f62c2bf45c00;hp=40ed34ed999cf458826542421416803b6b9555e3;hpb=679661c1f27b31d928d20edf698cb22adb086b17;p=org.ibex.core.git

diff --git a/src/org/xwt/builtin/splash.xwt b/src/org/xwt/builtin/splash.xwt
index 40ed34e..a62061c 100644
--- a/src/org/xwt/builtin/splash.xwt
+++ b/src/org/xwt/builtin/splash.xwt
@@ -1,24 +1,40 @@
 <xwt>
 
-    <template orient="vertical" width="394" height="276" color="white">
+    <template orient="vertical" color="white">
 
         KeyPressed += function(k) { if (k == "escape") thisbox = null; }
 
+        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;
-            $text.text = "downloaded " + (xwt.math.ceil(100 * n/d)) + "%";
-        }
+            settext(t);
+       } 
 
         xwt.thread = function() {
-//            $text.font = xwt.fonts.vera["Vera.ttf"];
-            $text.font = xwt.res.uncab(xwt.res.url("http://master.dist.xwt.org/msfonts/arial32.exe"))["Arial.TTF"];
-//            $text.font = xwt.res.cache(cab["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 = 100;
-            thisbox.height = 100;
+            thisbox.width=394;
+            thisbox.height=276;
             x = (xwt.ui.screen.width - width) / 2;
             y = (xwt.ui.screen.height - height) / 2;
             var origin = xwt.origin;
@@ -27,11 +43,10 @@
                 origin = "http://" + origin.substring(origin.indexOf('/') + 1);
             }
             xwt.log.println("origin is " + origin);
-            var new_rr = xwt.res.unzip(xwt.watchProgress(xwt.load(origin), progress));
+            var new_rr = xwt.res.unzip(xwt.res.watch(xwt.res.url(origin), progress));
             var new_xwt = xwt.clone(new_rr);
 
             xwt.thread = function() {
-xwt.thread.sleep(1000); // let the fonts get pulled in
 for(var i=0; 100>i; i++) {
 progress(i, 100);
 xwt.thread.yield();
@@ -42,11 +57,21 @@ xwt.thread.yield();
 xwt.log.println("leaving");
         }
 
-        <box height="233" align="bottomleft" packed="false" x="20" y="0">
-            <box textcolor="white" id="text" shrink="true"/>
+        <box height="236" align="bottomleft" packed="false" x="20" y="0">
+            <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"/>
+            <box id="innerbar" fill="blue" width="10" height="20"/>
         </box>
 
     </template>