r9763: Add the start bar as a widget from the

desktop file.  This is more portable to IE, though
there are still some IE issues hanging around.

deryck
(This used to be commit a70b52bb04689de90ee5ec59109d669175b91c04)

diff --git a/swat/desktop/index.esp b/swat/desktop/index.esp
index 21ca766f590a6023cce4c1d07f9cd8dd3bffcea5..ee4290f234c5c53dc06be697caa06589f81a8fa4 100644 (file)
--- a/swat/desktop/index.esp
+++ b/swat/desktop/index.esp
@@ -8,6 +8,7 @@ libinclude("base.js");
 <script type="text/javascript" src="/scripting/client/js_scripts.js"></script>
 <script type="text/javascript" src="/scripting/client/desktop.js"></script>
 <script type="text/javascript" src="/scripting/client/status.js"></script>
 <script type="text/javascript" src="/scripting/client/js_scripts.js"></script>
 <script type="text/javascript" src="/scripting/client/desktop.js"></script>
 <script type="text/javascript" src="/scripting/client/status.js"></script>

+<script type="text/javascript" src="/scripting/client/regedit.js"></script>

 
 <script type="text/javascript">
 
 
 <script type="text/javascript">
 


@@ -115,7 +116,7 @@ function showReg()
        regWin.setVisible('true');
 }
 
        regWin.setVisible('true');
 }
 

-function startSwat()
+function startMenu() 

 {
        var sMenu = new QxMenu;
        with(sMenu) {
 {
        var sMenu = new QxMenu;
        with(sMenu) {


@@ -204,8 +205,4 @@ function startSwat()
 }
 </script>
 
 }
 </script>
 

-<div id="toolbar">
-<h3><a href="javascript:startSwat()">SWAT (Start)</a></h3>
-</div>
-

 <% page_footer(); %>
 <% page_footer(); %>

diff --git a/swat/scripting/client/desktop.js b/swat/scripting/client/desktop.js
index b1c77dc6131bcc77a762327a8d8e3e9d42fd83ef..6383e58bdae4b9cd7f094102fdc2911455658a95 100644 (file)
--- a/swat/scripting/client/desktop.js
+++ b/swat/scripting/client/desktop.js
@@ -35,9 +35,8 @@ function docX()
 function docY()
 {
        var y;
 function docY()
 {
        var y;

-       // Less 25px to not cover the toolbar

        if (browser != "mshtml") {
        if (browser != "mshtml") {

-               y = window.innerHeight - 25;
+               y = window.innerHeight;

        } else {
                y = document.documentElement.clientHeight;
        }
        } else {
                y = document.documentElement.clientHeight;
        }


@@ -154,6 +153,23 @@ window.application.main = function()
        var doc = this.getClientWindow().getClientDocument();
        doc.addEventListener("contextmenu", showContextMenu);
        doc.add(w);
        var doc = this.getClientWindow().getClientDocument();
        doc.addEventListener("contextmenu", showContextMenu);
        doc.add(w);

+
+       var bar = new QxMenuBar;
+       with (bar) {
+               setBottom(0);
+               setLeft(0);
+               setWidth("100%");
+               setHeight(25);
+               setBackgroundColor("ThreeDFace");
+       }
+
+       var start = new QxMenuButton("START");
+       start.addEventListener("click", function() {
+               startMenu();
+       });
+       bar.add(start);
+
+       w.add(bar);

 }
 
 window.onresize = function() 
 }
 
 window.onresize = function()