summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--swat/desktop/index.esp7
-rw-r--r--swat/scripting/client/desktop.js20
2 files changed, 20 insertions, 7 deletions
diff --git a/swat/desktop/index.esp b/swat/desktop/index.esp
index 21ca766f59..ee4290f234 100644
--- 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/regedit.js"></script>
<script type="text/javascript">
@@ -115,7 +116,7 @@ function showReg()
regWin.setVisible('true');
}
-function startSwat()
+function startMenu()
{
var sMenu = new QxMenu;
with(sMenu) {
@@ -204,8 +205,4 @@ function startSwat()
}
</script>
-<div id="toolbar">
-<h3><a href="javascript:startSwat()">SWAT (Start)</a></h3>
-</div>
-
<% page_footer(); %>
diff --git a/swat/scripting/client/desktop.js b/swat/scripting/client/desktop.js
index b1c77dc613..6383e58bda 100644
--- a/swat/scripting/client/desktop.js
+++ b/swat/scripting/client/desktop.js
@@ -35,9 +35,8 @@ function docX()
function docY()
{
var y;
- // Less 25px to not cover the toolbar
if (browser != "mshtml") {
- y = window.innerHeight - 25;
+ y = window.innerHeight;
} 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 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()