r10228: Reorganizing a bit, trying to simplify. This is an attempt

to find what's going wrong in IE formatting.

This is some better, but still IE needs help.

deryck

diff --git a/swat/desktop/index.esp b/swat/desktop/index.esp
index 0714a2d038fbb89147a6f77e21cbadeb618de222..1dee4d3bb4c8547d6536d197c8bf13bff7c5b39c 100644 (file)
--- a/swat/desktop/index.esp
+++ b/swat/desktop/index.esp
@@ -35,39 +35,22 @@ function showMessage(m)
                setBottom(2);
        }
        ok.addEventListener("click", function() {
                setBottom(2);
        }
        ok.addEventListener("click", function() {

-               w.remove(message);
+               doc.remove(message);

        });
 
        message.add(note);
        message.add(ok);
        });
 
        message.add(note);
        message.add(ok);

-       w.add(message);
+       doc.add(message);

        message.setVisible(true);
 }
 
 function blankW()
 {
        var blank = new Window.standard('SWAT');
        message.setVisible(true);
 }
 
 function blankW()
 {
        var blank = new Window.standard('SWAT');

-       w.add(blank);
+       doc.add(blank);

        blank.setVisible(true);
 }
 
        blank.setVisible(true);
 }
 

-// Always open with stats
-var win = new QxWindow();
-document.js.add('/scripting/client/status.js');
-win._onclosebuttonclick = function(e)
-{
-       this.close();
-       e.stopPropagation();
-       document.js.remove('/scripting/client/status.js');
-};
-with(win) {
-       setTop(50);
-       setRight(50);
-       setHeight(175);
-}
-w.add(win);
-getServerStatus(win);
-

 function showReg()
 {
        document.js.add('/scripting/client/regedit.js');
 function showReg()
 {
        document.js.add('/scripting/client/regedit.js');


@@ -88,7 +71,7 @@ function showReg()
        
        var regedit = regedit_widget("ncalrpc:");
        regWin.add(regedit);
        
        var regedit = regedit_widget("ncalrpc:");
        regWin.add(regedit);

-       w.add(regWin);
+       doc.add(regWin);

        regWin.setVisible('true');
 }
 
        regWin.setVisible('true');
 }
 


@@ -112,7 +95,7 @@ function clientContextMenu(e)
 
        cmenu.setLeft(e.getClientX());
        cmenu.setTop(e.getClientY());
 
        cmenu.setLeft(e.getClientX());
        cmenu.setTop(e.getClientY());

-       w.add(cmenu);
+       doc.add(cmenu);

        cmenu.setVisible(true);
 }
 
        cmenu.setVisible(true);
 }
 


@@ -150,7 +133,7 @@ function startMenu()
        var srv5 = new QxMenuButton("WINS Server", null);
        var srv6 = new QxMenuButton("Kerberos Server", null);
        srvMenu.add(srv1, srv2, srv3, srv4, srv5, srv6);
        var srv5 = new QxMenuButton("WINS Server", null);
        var srv6 = new QxMenuButton("Kerberos Server", null);
        srvMenu.add(srv1, srv2, srv3, srv4, srv5, srv6);

-       w.add(srvMenu);
+       doc.add(srvMenu);

        srvMenu.setVisible(false);
 
        var editReg = new QxCommand;
        srvMenu.setVisible(false);
 
        var editReg = new QxCommand;


@@ -161,7 +144,7 @@ function startMenu()
        var espMenu = new QxMenu;
        var esp1 = new QxMenuButton("Registry Editor", null, editReg);
        espMenu.add(esp1);
        var espMenu = new QxMenu;
        var esp1 = new QxMenuButton("Registry Editor", null, editReg);
        espMenu.add(esp1);

-       w.add(espMenu);
+       doc.add(espMenu);

        espMenu.setVisible(false);
 
        var opt1 = new QxMenuButton("Servers", null)
        espMenu.setVisible(false);
 
        var opt1 = new QxMenuButton("Servers", null)


@@ -184,7 +167,7 @@ function startMenu()
        var newMenu = new QxMenu;
        var new1 = new QxMenuButton("Window", null, openWin);
        newMenu.add(new1);
        var newMenu = new QxMenu;
        var new1 = new QxMenuButton("Window", null, openWin);
        newMenu.add(new1);

-       w.add(newMenu);
+       doc.add(newMenu);

        newMenu.setVisible(false);
 
        var opt2 = new QxMenuButton("Installation", null);
        newMenu.setVisible(false);
 
        var opt2 = new QxMenuButton("Installation", null);


@@ -218,9 +201,61 @@ function startMenu()
        sMenu.add(opt1, opt2, opt3, sep1, opt4, sep2, opt5, opt6);
        sMenu.setLeft(0);
        sMenu.setTop(docY() - 150);
        sMenu.add(opt1, opt2, opt3, sep1, opt4, sep2, opt5, opt6);
        sMenu.setLeft(0);
        sMenu.setTop(docY() - 150);

-       w.add(sMenu);
+       doc.add(sMenu);

        sMenu.setVisible(true);
 }
        sMenu.setVisible(true);
 }

+
+function contextMenu(e)
+{      
+       var t = e.getTarget()
+       var tObj = t.getHtmlAttribute("class")
+
+       if (tObj == 'QxClientDocument QxThemeWin9x') {
+               clientContextMenu(e);
+       } else if (tObj == 'QxWindowPane') {
+               windowContextMenu(t, e);
+       }
+}
+
+window.application.main = function()
+{
+       doc = this.getClientWindow().getClientDocument();
+       doc.addEventListener("contextmenu", contextMenu);
+
+       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);
+
+       doc.add(bar);
+
+       // Always open with stats
+       var win = new QxWindow();
+       document.js.add('/scripting/client/status.js');
+       win._onclosebuttonclick = function(e)
+       {
+               this.close();
+               e.stopPropagation();
+               document.js.remove('/scripting/client/status.js');
+       };
+       with(win) {
+               setTop(50);
+               setRight(50);
+               setHeight(175);
+       }
+       doc.add(win);
+       getServerStatus(win);
+}

 </script>
 
 <% page_footer(); %>
 </script>
 
 <% page_footer(); %>

diff --git a/swat/scripting/client/desktop.js b/swat/scripting/client/desktop.js
index e8f10f6efa690a930a6dbd3f379b0bd19f77bf03..9e1a34293609a156441d05adf991dd82801b8766 100644 (file)
--- a/swat/scripting/client/desktop.js
+++ b/swat/scripting/client/desktop.js
@@ -5,10 +5,6 @@
    released under the GNU GPL Version 2 or later
 */
 
    released under the GNU GPL Version 2 or later
 */
 

-
-// The global widget we attach everything to
-var w = new QxWidget();
-

 /* Qooxdoo's browser sniffer doesn't distinguish IE version.
 We'll cover IE 6 for now, but these checks need to be
 revisited for fuller browser coverage. */
 /* Qooxdoo's browser sniffer doesn't distinguish IE version.
 We'll cover IE 6 for now, but these checks need to be
 revisited for fuller browser coverage. */


@@ -122,53 +118,4 @@ Window.small = SmallWindow;
 Window.standard = StandardWindow;
 Window.large = LargeWindow;
 
 Window.standard = StandardWindow;
 Window.large = LargeWindow;
 

-function contextMenu(e)
-{      
-       var t = e.getTarget()
-       var tObj = t.getHtmlAttribute("class")
-
-       if (tObj == 'QxWidget') {
-               clientContextMenu(e);
-       } else if (tObj == 'QxWindowPane') {
-               windowContextMenu(t, e);
-       }
-}
-
-
-window.application.main = function()
-{
-       with(w) {
-               setTop(0);
-               setLeft(0);
-               setWidth(docX());
-               setHeight(docY());
-       }
-
-       var doc = this.getClientWindow().getClientDocument();
-       doc.addEventListener("contextmenu", contextMenu);
-       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() 
-{
-       w.setWidth(docX());
-       w.setHeight(docY());
-}

 
 

diff --git a/swat/scripting/header_desktop.esp b/swat/scripting/header_desktop.esp
index a21ee733bb128e664e993a41dba272669bd433e6..9d02ab323bf1ba2e28c684abeac7690260eddbd2 100644 (file)
--- a/swat/scripting/header_desktop.esp
+++ b/swat/scripting/header_desktop.esp
@@ -17,15 +17,6 @@
 body {
   background-color:#3A6EA5;
 }
 body {
   background-color:#3A6EA5;
 }

-#toolbar {
-  background-color:ThreeDFace;
-  position:fixed;
-  bottom:0;
-  height:25px;
-  width:100%;
-  line-height:25px;
-  border-top:1px outset #000;
-}

 </style>
 
 </head>
 </style>
 
 </head>