updated JSObject to only mediate functions calls, fbbrowser does all the info fetching etc

4 files changed, 55 insertions, 22 deletions

diff --git a/src/JSObject.cpp b/src/JSObject.cpp
index e899b5f..5f9c4ab 100644
--- a/src/JSObject.cpp
+++ b/src/JSObject.cpp
@@ -7,7 +7,7 @@
 
 #include "JSObject.h"
 #include <QTime>
-#include <QNetworkInterface>
+
 //-------------------------------------------------------------------------------------------------------
 JSObject::JSObject(QWebFrame *parent) {
 	_parent = parent;
@@ -43,34 +43,26 @@ void JSObject::updateProgress(int i)
 //-------------------------------------------------------------------------------------------------------
 void JSObject::getMacAddress()
 {
-	QNetworkInterface *qNetI = new QNetworkInterface();
-	QList<QNetworkInterface> list;
-   	list=qNetI->allInterfaces();
-    QString str;
-	QString macAddress;
-	for (int i = 0; i < list.size(); ++i) {
-  		str = list.at(i).name();
-		macAddress = list.at(i).hardwareAddress();
-		qDebug() << str;
-		qDebug() << macAddress;
-	}
-
-	//TODO:: edit jsFunction name
+	emit getMAC();
+}
+//-------------------------------------------------------------------------------------------------------
+void JSObject::printMAC(QString& macAddress)
+{
 	QString code = QString("printMacAddress(\"%1\")").arg(macAddress);
 	_parent->evaluateJavaScript(code);
 }
 //-------------------------------------------------------------------------------------------------------
 void JSObject::showTime()
 {
-	qDebug() << "---- call: showTime_Slot";
-	QString time = QTime::currentTime().toString("hh:mm:ss");
-
-	//TODO:: edit jsFunction name
+	emit getTime();
+}
+//-------------------------------------------------------------------------------------------------------
+void JSObject::printTime(QString& time)
+{
 	QString code;
 	code = QString("printTime(\"%1\")").arg(time);
 	_parent->evaluateJavaScript(code);
 }
-//-------------------------------------------------------------------------------------------------------
 void JSObject::showDate()
 {
 	QString date = QDate::currentDate().toString("dd.MM.yyyy");
diff --git a/src/JSObject.h b/src/JSObject.h
index 1102610..427aae8 100644
--- a/src/JSObject.h
+++ b/src/JSObject.h
@@ -48,6 +48,8 @@ public:
 
 signals:
 	void requestFile(QString& filename);
+	void getMAC();
+	void getTime();
 	void signalQuitAll();
 	/*
 	// should be the last signal to be emited. 
@@ -83,19 +85,25 @@ public slots:
 	// slots which are emited by the jsObject signals
 
 	void quitAll();
+	// Slots for handling downloads.
 	void startDownload(QString filename);
 	void updateProgress(int i);
+	// Slots for handling MAC Adress stuff
+	void getMacAddress();
+	void printMAC(QString& macAddress);
+	// Slots for handling time stuff
+	void showTime();
+	void printTime(QString& time);
 
-	// System info stuff
+	// Not yet implemented.
 	void getSysInfo();
-	void getMacAddress();
 	void getIpAddress();
 	void getIntegratedHardwareDevices();
 	void getUsbDevices();
 	void getHardDrives();
 
 	// for testing reasons
-	void showTime();
+
 	void showDate();
 	void showHelloWorld();
 
diff --git a/src/fbbrowser.cpp b/src/fbbrowser.cpp
index 35f4d55..f797785 100644
--- a/src/fbbrowser.cpp
+++ b/src/fbbrowser.cpp
@@ -2,8 +2,10 @@
 #include "JSObject.h"
 #include "DownloadManager.h"
 
+#include <QDateTime>
 #include <QFile>
 #include <QFileInfo>
+#include <QNetworkInterface>
 #include <QtWebKit>
 // -------------------------------------------------------------------------------------------
 void fbbrowser::forwardDownloadRequest(QString& filename)
@@ -19,6 +21,29 @@ void fbbrowser::forwardUpdateProgress(int progress)
 	emit updateProgress(progress);
 }
 // -------------------------------------------------------------------------------------------
+void fbbrowser::getMAC()
+{
+	QNetworkInterface *qNetI = new QNetworkInterface();
+	QList<QNetworkInterface> list;
+   	list=qNetI->allInterfaces();
+    QString str;
+	QString macAddress;
+	for (int i = 0; i < list.size(); ++i) {
+  		str = list.at(i).name();
+		macAddress = list.at(i).hardwareAddress();
+		qDebug() << str;
+		qDebug() << macAddress;
+	}
+	emit printMAC(macAddress);
+}
+// -------------------------------------------------------------------------------------------
+void fbbrowser::getTime()
+{
+	qDebug() << "---- call: showTime_Slot";
+	QString time = QTime::currentTime().toString("hh:mm:ss");
+	emit printTime(time);
+}
+// -------------------------------------------------------------------------------------------
 void fbbrowser::quit()
 {
 	emit killApp();
@@ -54,6 +79,10 @@ fbbrowser::fbbrowser(const QUrl & url)
 	//jso->setParent(qwf);
 	QObject::connect(qwf, SIGNAL(javaScriptWindowObjectCleared()),
 					 jso, SLOT(attachToDOM()));
+	QObject::connect(jso, SIGNAL(getMAC()), this, SLOT(getMAC()));
+	QObject::connect(this, SIGNAL(printMAC(QString&)), jso, SLOT(printMAC(QString&)));
+	QObject::connect(jso, SIGNAL(getTime()), this, SLOT(getTime()));
+	QObject::connect(this, SIGNAL(printTime(QString&)), jso, SLOT(printTime(QString&)));
 	QObject::connect(jso, SIGNAL(requestFile(QString&)), this, SLOT(forwardDownloadRequest(QString&)));
 	QObject::connect(this, SIGNAL(updateProgress(int)), jso, SLOT(updateProgress(int)));
 	QObject::connect(jso, SIGNAL(signalQuitAll()), this, SLOT(quit()));
diff --git a/src/fbbrowser.h b/src/fbbrowser.h
index 6de9ba6..e54c38c 100644
--- a/src/fbbrowser.h
+++ b/src/fbbrowser.h
@@ -36,11 +36,15 @@ private:
 	DownloadManager* dm;
 
 signals:
+	void printMAC(QString& macAddress);
+	void printTime(QString& time);
 	void downloadFile(QUrl& fileUrl);
 	void updateProgress(int progress);
 	void killApp();
 
 public slots:
+	void getMAC();
+	void getTime();
 	void forwardUpdateProgress(int progress);
 	void forwardDownloadRequest(QString& filename);
 	void quit();