summaryrefslogtreecommitdiffstats
path: root/src/fbgui.cpp
diff options
context:
space:
mode:
authorNiklas Goby2011-03-16 19:09:08 +0100
committerNiklas Goby2011-03-16 19:09:08 +0100
commit432b03ceca63c71eab1ae218d743c31dedce48f5 (patch)
tree913d4ace363f45d24aba8b2fe30cb68f130c784e /src/fbgui.cpp
parentlogView now global, write(QString text) public function for appending text. (diff)
downloadfbgui-432b03ceca63c71eab1ae218d743c31dedce48f5.tar.gz
fbgui-432b03ceca63c71eab1ae218d743c31dedce48f5.tar.xz
fbgui-432b03ceca63c71eab1ae218d743c31dedce48f5.zip
some changes in the fbgui, ipWatcher
Diffstat (limited to 'src/fbgui.cpp')
-rw-r--r--src/fbgui.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/fbgui.cpp b/src/fbgui.cpp
index 8f738d3..3408b1e 100644
--- a/src/fbgui.cpp
+++ b/src/fbgui.cpp
@@ -1,6 +1,7 @@
#include "fbgui.h"
#include "downloadManager.h"
#include "javascriptInterface.h"
+//#include "ipWatcher.h"
#include <iostream>
#include <QUrl>
@@ -23,9 +24,21 @@ fbgui::fbgui()
/* debug console test */
if (debug) logView = new logViewer(this);
logView->write("fbgui initialization...");
+
+
+
/* initialize "browser" */
checkHost();
+
webView = new QWebView(this);
+
+ /*show info page until the client has received an IP address*/
+ /*
+ ipWatcher* ipw = new ipWatcher(QApplication::applicationDirPath());
+ while(!ipw->ipReceived()){
+ webView->load(QUrl("prc://html/loadAbout.html"));
+ }
+ */
webView->load(baseURL);
/* initialize javascript interface */