commented (working) watchdhcp for now til logic ist complete, java interface has getSession that read the session id from the pbs

4 files changed, 16 insertions, 8 deletions

diff --git a/src/fbgui.cpp b/src/fbgui.cpp
index 1130f68..bf4a12c 100644
--- a/src/fbgui.cpp
+++ b/src/fbgui.cpp
@@ -7,6 +7,7 @@
 #include <QtWebKit>
 #include <QxtCore>
 
+QString sessionID("");
 QUrl baseURL(DEFAULT_URL);
 QString binPath("");
 QString downloadPath("/tmp/fbgui/downloads");
@@ -29,8 +30,8 @@ fbgui::fbgui()
 	// base of the gui
 	createActions();
 	_webView = new QWebView(this);
-
-	watchDHCP();
+	_webView->load(baseURL);
+	//watchDHCP();
 
 	// debug console split or normal browser
 	if (debugMode == 1)
diff --git a/src/fbgui.h b/src/fbgui.h
index bd297f4..52f244f 100644
--- a/src/fbgui.h
+++ b/src/fbgui.h
@@ -31,6 +31,7 @@
 
 
 // Global settings
+extern QString sessionID;
 extern QString binPath;
 extern QString downloadPath;
 extern QUrl baseURL;
diff --git a/src/javascriptinterface.cpp b/src/javascriptinterface.cpp
index 7f1b949..001753c 100644
--- a/src/javascriptinterface.cpp
+++ b/src/javascriptinterface.cpp
@@ -20,6 +20,17 @@ void JavascriptInterface::attachToDOM(){
 	_parent->addToJavaScriptWindowObject(QString("fbgui"), this);
 }
 //-------------------------------------------------------------------------------------------------------
+void JavascriptInterface::notify(const QString& msg){
+
+	QString code = QString("notify('\%1')").arg(msg);
+	_parent->evaluateJavaScript(code);
+}
+//-------------------------------------------------------------------------------------------------------
+void JavascriptInterface::getSession(const QString& session){
+	qxtLog->debug() << "Received session id: " << session;
+	sessionID = session;
+}
+//-------------------------------------------------------------------------------------------------------
 void JavascriptInterface::startDownload(const QString& filename){
 	// ignore if empty filename
 	if (filename.isEmpty()){
@@ -34,12 +45,6 @@ void JavascriptInterface::downloadInfo(const QString& filename, const double& fi
 	_parent->evaluateJavaScript(code);
 }
 //-------------------------------------------------------------------------------------------------------
-void JavascriptInterface::notify(const QString& msg){
-
-	QString code = QString("notify('\%1')").arg(msg);
-	_parent->evaluateJavaScript(code);
-}
-//-------------------------------------------------------------------------------------------------------
 void JavascriptInterface::updateProgressBar(const int& percent, const double& speed, const QString& unit){
 	if (percent == 0) return;
 	QString code = QString("updateProgress(\%1, \%2, '\%3')").arg(percent).arg(speed).arg(unit);
diff --git a/src/javascriptinterface.h b/src/javascriptinterface.h
index 9b4303c..fe42a94 100644
--- a/src/javascriptinterface.h
+++ b/src/javascriptinterface.h
@@ -37,6 +37,7 @@ signals:
 
 public slots:
 	void attachToDOM();
+	void getSession(const QString& session);
 	void startDownload(const QString& filename);
 	void setCallbackOnDlQueueFinished(QString& fctOnDownloadsFinished);
 	void callbackOnDlQueueFinished();