Merge branch 'master' of git.openslx.org:lsfks/master-teamprojekt/fbgui

4 files changed, 46 insertions, 0 deletions

diff --git a/src/fbgui.cpp b/src/fbgui.cpp
index 4aca2cc..206680f 100644
--- a/src/fbgui.cpp
+++ b/src/fbgui.cpp
@@ -37,12 +37,23 @@ fbgui::fbgui()
 	//watchDHCP();
 
 	// PBS test (working dont delete)
+	QString serial;
 	QFileInfo fi("/tmp/serial");
 	if (fi.exists())
+	{
 		qxtLog->debug() << "Found /tmp/serial !";
+
+		// If the file exists, than read the data
+		QFile file;
+		file.setFileName("/tmp/serial");
+		file.open(QIODevice::ReadOnly);
+		serial = file.readAll();
+		file.close();
+	}
 	else
 		qxtLog->debug() << "No file /tmp/serial !";
 	// TODO append serial number to postData.
+	//QByteArray postData = "mac=d8:d3:85:80:81:8b&hardwarehash=12341234123412341234123412341234&bootisoID=1&serial="+serial;
 
 	QNetworkRequest req(baseURL);
 	QByteArray postData = "mac=d8:d3:85:80:81:8b&hardwarehash=12341234123412341234123412341234&bootisoID=1&serial=";
diff --git a/src/fbgui.qrc b/src/fbgui.qrc
index 8a2d434..9f9f54b 100644
--- a/src/fbgui.qrc
+++ b/src/fbgui.qrc
@@ -2,5 +2,9 @@
  <qresource>
      <file>html/errorPage.html</file>
      <file>html/loadAbout.html</file>
+     <file>html/js/jquery-1.4.4.min.js</file>
+     <file>html/js/jquery-1.5.1.min.js</file>
+     <file>html/js/jquery-ui-1.8.11.min.js</file>
+     <file>html/js/test.js</file>
  </qresource>
  </RCC>
diff --git a/src/javascriptinterface.cpp b/src/javascriptinterface.cpp
index 6b8fe9c..8261582 100644
--- a/src/javascriptinterface.cpp
+++ b/src/javascriptinterface.cpp
@@ -18,6 +18,7 @@ const QString JavascriptInterface::getSysInfo(const QString& info){
 //-------------------------------------------------------------------------------------------------------
 void JavascriptInterface::attachToDOM(){
 	_parent->addToJavaScriptWindowObject(QString("fbgui"), this);
+	loadJQuery();
 }
 //-------------------------------------------------------------------------------------------------------
 void JavascriptInterface::notify(const QString& msg){
@@ -65,3 +66,31 @@ void JavascriptInterface::callbackOnDlQueueFinished(){
 void JavascriptInterface::quit(){
 	emit quitFbgui();
 }
+//-------------------------------------------------------------------------------------------------------
+void JavascriptInterface::loadJQuery(){
+
+	QString js;
+
+	QDir* qrcJSDir = new QDir(":/html/js/");
+	QFileInfoList fiList = qrcJSDir->entryInfoList();
+	QFileInfo fi;
+	foreach(fi, fiList)
+	{
+		if(fi.suffix() == "js")
+		{
+			qDebug()<< fi.fileName();
+			qxtLog->debug() << fi.fileName();
+			if(fi.fileName()=="test.js")
+			{
+				QFile file;
+				file.setFileName(":/" + fi.fileName());
+				file.open(QIODevice::ReadOnly);
+				js = file.readAll();
+				file.close();
+
+				_parent->evaluateJavaScript(js);
+				qDebug()<< "evaluated " + fi.fileName();
+			}
+		}
+	}
+}
diff --git a/src/javascriptinterface.h b/src/javascriptinterface.h
index fe42a94..d51dccb 100644
--- a/src/javascriptinterface.h
+++ b/src/javascriptinterface.h
@@ -27,6 +27,8 @@ private:
 	QWebFrame* _parent;
 	QString _callBackOnDownloadsFinished;
 
+	void loadJQuery();
+
 public:
 	JavascriptInterface(QWebFrame* parent);
 	~JavascriptInterface();