2002/07/19 04:41:24

darcs-hash:20040130064908-2ba56-e89370cf6ea49bd561e07a0f79087bc5670949e5.gz

diff --git a/src/org/xwt/builtin/key.png b/src/org/xwt/builtin/key.png
new file mode 100644 (file)
index 0000000..c57178b
--- /dev/null
+++ b/src/org/xwt/builtin/key.png
@@ -0,0 +1,4 @@
+\89PNG\r
+\1a
+
+CúCõõ\\8e||o§s\ 4\11\ 1ðê1å.\82E\80

diff --git a/src/org/xwt/builtin/password12.xwf b/src/org/xwt/builtin/password12.xwf
new file mode 100644 (file)
index 0000000..e35a170
--- /dev/null
+++ b/src/org/xwt/builtin/password12.xwf
@@ -0,0 +1,3 @@
+\89PNG\r
+\1a
+

diff --git a/src/org/xwt/builtin/proxy_authorization.xwt b/src/org/xwt/builtin/proxy_authorization.xwt
new file mode 100644 (file)
index 0000000..bad8a70
--- /dev/null
+++ b/src/org/xwt/builtin/proxy_authorization.xwt
@@ -0,0 +1,86 @@
+<xwt>
+
+    <import name="org.xwt.builtin.*"/>
+    <template thisbox="frame" minwidth="397" maxwidth="397" minheight="243" maxheight="243"
+              vpad="20" hpad="10" titlebar="Enter Network Password">
+
+        _KeyPressed = function(k) {
+            if (k == "tab") {
+                if ($password.focused) $user.focused = true;
+                else $password.focused = true;
+            } else if (k == "enter") {
+                $ok.click = true;
+            }
+        }
+
+        $cancel._click = function() { thisbox = null; }
+
+        $user._focused = function(f) {
+            xwt.println("user.focused = " + f);
+            if (f) $password.focused = false;
+        }
+
+        $password._focused = function(f) {
+            xwt.println("password.focused = " + f);
+            if (f) $user.focused = false;
+        }
+
+        _proxyIP = function(p) { $firewall.text = p; }
+        _realm = function(r) { $realm.text = r; }
+        $user._SizeChange = function() { $password.height = $user.height; }
+
+        $ok._click = function() {
+            xwt.proxyAuthorization = $user.text + ":" + $password.text;
+            thisbox = null;
+        }
+
+        <box hshrink="true">
+            <box width="10"/>
+            <box>
+                <box sizetoimage="true" image="key" align="topleft"/>
+            </box>
+            <box width="10"/>
+        </box>
+
+        <box orient="vertical">
+            <box font="dialog8" text="Please type your user name and password." vshrink="true"/>
+            <box height="13"/>
+            <box>
+                <box width="75" font="dialog8" text="Firewall:" vshrink="true"/>
+                <box vshrink="true" font="dialog8" text="unknown" id="firewall"/>
+            </box>
+            <box height="13"/>
+            <box>
+                <box width="75" font="dialog8" text="Realm" vshrink="true"/>
+                <box vshrink="true" font="dialog8" text="unknown" id="realm"/>
+            </box>
+            <box height="22"/>
+            <box>
+                <box width="75" font="dialog8" text="User Name" vshrink="true"/>
+                <box border="bevel_2_down" hpad="2" vpad="2">
+                    <edit color="white" id="user" focused="true"/>
+                </box>
+            </box>
+            <box height="10"/>
+            <box>
+                <box width="75" font="dialog8" text="Password" vshrink="true"/>
+                <box border="bevel_2_down" hpad="2" vpad="2">
+                    <edit color="white" id="password" font="org.xwt.builtin.password12" focused="false"/>
+                </box>
+            </box>
+            <box height="30"/>
+            <box>
+                <box/>
+                <button width="75" height="24" id="ok">
+                    <box font="dialog8" text="OK" shrink="true"/>
+                </button>
+                <box width="20"/>
+                <button width="75" height="24" id="cancel">
+                    <box font="dialog8" text="Cancel" shrink="true"/>
+                </button>
+            </box>
+            <box/>
+        </box>
+
+    </template>
+

diff --git a/src/org/xwt/builtin/splash.xwt b/src/org/xwt/builtin/splash.xwt
index 3d2f595..97ceac0 100644 (file)
--- a/src/org/xwt/builtin/splash.xwt
+++ b/src/org/xwt/builtin/splash.xwt
@@ -9,8 +9,11 @@
 
         xwt.thread = function() {
             var origin = xwt.origin;
-            if (origin.substring(0, 21) == "http://launch.xwt.org")
+            if (origin.substring(0, 21) == "http://launch.xwt.org") {
                 origin = origin.substring(22);
+                origin = "http://" + origin.substring(origin.indexOf('/') + 1);
+            }
+            xwt.println("origin is " + origin);
 
             xwt.loadArchive(origin, function(num, den) {
                     $left.flex = 50 * (num / den);
@@ -39,9 +42,8 @@
         <box absolute="true" sizetoimage="true" id="inner" image="org.xwt.builtin.lithium"/>
 
         <box/>
-        <box text="Downloading user interface..." vshrink="true" hpad="30" vpad="3" id="status" textcolor="white"/>
+        <box text="Downloading user interface..." vshrink="true" hpad="4" vpad="3" id="status" textcolor="white"/>
         <box hpad="4" height="10">
-            <box width="25"/>
             <box flex="0.0" image="org.xwt.builtin.progress" tile="true" id="left"/>
             <box flex="100.0" id="right"/>
         </box>