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

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.cdt.core/fbbrowser.1294830673062.pdom
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.recording.prefs
	.metadata/.plugins/org.eclipse.epp.usagedata.recording/usagedata.csv
	src/fbgui.pro

5 files changed, 102 insertions, 3 deletions

diff --git a/src/fbbrowser.cpp b/src/fbbrowser.cpp
index d196f56..2bcc812 100644
--- a/src/fbbrowser.cpp
+++ b/src/fbbrowser.cpp
@@ -3,6 +3,7 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QtWebKit>
+#include "jsObject.h"
 
 // This function is not used at the moment.
 // TODO: Fix function or find another way...
@@ -104,7 +105,8 @@ fbbrowser::~fbbrowser()
 //
 void fbbrowser::addJSObject()
 {
-	view->page()->mainFrame()->addToJavaScriptWindowObject(QString("webkitTest"), this);
+	jsObject jso = new jsObject(this);
+	view->page()->mainFrame()->addToJavaScriptWindowObject(QString("jsObject"), jso);
 }
 
 void fbbrowser::writeText(QString text)
@@ -120,5 +122,15 @@ void fbbrowser::writeText(QString text)
 // This function needed now ?
 void fbbrowser::quitAll()
 {
-	//emit lastWindowClosed();
+	emit signalQuitAll();
+}
+
+void fbbrowser::getSysInfo()
+{
+	/*
+	QString time = QTime::currentTime().toString("hh:mm:ss");
+	QString date = QDate::currentDate().toString("dd.MM.yyyy");
+	QList<QHostAddress> ipList = QNetworkInterface::allAddresses();
+	QString macAddress = QNetworkInterface::hardwareAddress()
+	*/
 }
diff --git a/src/fbbrowser.h b/src/fbbrowser.h
index b5c84e9..c844002 100644
--- a/src/fbbrowser.h
+++ b/src/fbbrowser.h
@@ -42,6 +42,7 @@ private slots:
     void httpReqFinished();
 	void addJSObject();
     void saveData();
+    void getSysInfo();
 
 signals:
 	void signalQuitAll();
diff --git a/src/fbgui.pro b/src/fbgui.pro
index 3a8c518..5a4deea 100644
--- a/src/fbgui.pro
+++ b/src/fbgui.pro
@@ -1,14 +1,23 @@
 TEMPLATE = app
 TARGET = fbgui
-CONFIG += qt debug
+CONFIG += qt \
+    debug
 QT += core \
     gui \
     webkit \
     network
+<<<<<<< HEAD
 HEADERS += fbbrowser.h \
 	   downloadmanager.h
 SOURCES += fbgui.cpp \
     fbbrowser.cpp \
     downloadmanager.cpp
+=======
+HEADERS += jsObject.h \
+    fbbrowser.h
+SOURCES += jsObject.cpp \
+    fbgui.cpp \
+    fbbrowser.cpp
+>>>>>>> a1c5fea9ed618b296548560d5806d99448cca262
 FORMS += fbbrowser.ui
 RESOURCES += fbgui.qrc
diff --git a/src/jsObject.cpp b/src/jsObject.cpp
new file mode 100644
index 0000000..248be3e
--- /dev/null
+++ b/src/jsObject.cpp
@@ -0,0 +1,40 @@
+/*
+ * jsObject.cpp
+ *
+ *  Created on: Feb 1, 2011
+ *      Author: niklas
+ */
+
+#include "jsObject.h"
+
+jsObject::jsObject(const fbbrowser &browser ) {
+	this.browser = browser;
+
+}
+
+jsObject::~jsObject() {
+	// TODO Auto-generated destructor stub
+}
+
+void jsObject::performAction(Action a)
+{
+	switch (a)
+	{
+	case Action::QUIT :
+		browser.quitAll();
+		break;
+	case Action::SHOW_TIME :
+		break;
+	case Action::SHOW_DATE :
+		break;
+	case Action::SHOW_USB_DEVICES :
+		break;
+	case Action::SHOW_HARDDRIVES :
+		break;
+	case Action::SHOW_IP_ADDRESS :
+		break;
+	case Action::SHOW_MAC_ADDRESS :
+		break;
+	}
+
+}
diff --git a/src/jsObject.h b/src/jsObject.h
new file mode 100644
index 0000000..20ae403
--- /dev/null
+++ b/src/jsObject.h
@@ -0,0 +1,37 @@
+/*
+ * jsObject.h
+ *
+ *  Created on: Feb 1, 2011
+ *      Author: niklas
+ */
+
+#ifndef JSOBJECT_H_
+#define JSOBJECT_H_
+
+enum Action
+{
+	QUIT,
+	SHOW_USB_DEVICES,
+	SHOW_HARDDRIVES,
+	SHOW_MAC_ADDRESS,
+	SHOW_IP_ADDRESS,
+	SHOW_TIME,
+	SHOW_DATE
+};
+
+class jsObject {
+	Q_OBJECT
+
+public:
+	jsObject(const fbbrowser & browser);
+	virtual ~jsObject();
+
+private:
+	fbbrowser browser;
+
+slots:
+	void performAction(Action a));
+
+};
+
+#endif /* JSOBJECT_H_ */