From 72df64f423d579bcd2fd156e48007055faf57ca7 Mon Sep 17 00:00:00 2001 From: Niklas Date: Thu, 22 Sep 2011 13:49:46 +0200 Subject: the html gui is working now. problem solved: LogReceiver/NetworkDiscovery started to early. so javascript jquery was not usable. also put the js code into the html file. it seems that qt has a problem using the code if it is not in the html file. also implemented the fast version. if one interface is usable we now go on directly to the continue boot screen --- LogReceiver/html/continueBoot.html | 24 ++++++++++++++++++++++++ LogReceiver/html/js/nd-functions.js | 4 +++- LogReceiver/html/networkdiscovery.html | 31 +++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 LogReceiver/html/continueBoot.html (limited to 'LogReceiver/html') diff --git a/LogReceiver/html/continueBoot.html b/LogReceiver/html/continueBoot.html new file mode 100644 index 0000000..89020b7 --- /dev/null +++ b/LogReceiver/html/continueBoot.html @@ -0,0 +1,24 @@ + + + + + + + + + + + +
+
+
+

Continue Boot

+
+
+ +
+ + + diff --git a/LogReceiver/html/js/nd-functions.js b/LogReceiver/html/js/nd-functions.js index 7480763..ac8f273 100644 --- a/LogReceiver/html/js/nd-functions.js +++ b/LogReceiver/html/js/nd-functions.js @@ -3,6 +3,7 @@ var updateStatus = function (s){ }; var updateIfProgressBar = function (i, p){ + fbgui.notifyCall(); if (p >= 0 && p <= 100){ $("#"+i+"_progress").progressbar({ value: p }); }else{ @@ -11,10 +12,11 @@ var updateIfProgressBar = function (i, p){ }; var updateIfStatus = function(i, s){ - + }; var addInterface = function (i){ + fbgui.notifyCall(); $("#nd_progress_container").append( "
"+ " Interface: " +i+ diff --git a/LogReceiver/html/networkdiscovery.html b/LogReceiver/html/networkdiscovery.html index 9ae0c5b..5e7aa64 100644 --- a/LogReceiver/html/networkdiscovery.html +++ b/LogReceiver/html/networkdiscovery.html @@ -5,6 +5,37 @@ + + +
-- cgit v1.2.3-55-g7522