diff options
| author | Jonathan Bauer | 2011-02-01 16:49:59 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2011-02-01 16:49:59 +0100 |
| commit | cbd71522f60cc2058634b6fd9068e5ba9af7b779 (patch) | |
| tree | ac74c5ff47339c498183c4dd3d050cd154a6923a /src/fbbrowser.cpp | |
| parent | deleted .metadata (diff) | |
| parent | i added jsObject (diff) | |
| download | fbgui-cbd71522f60cc2058634b6fd9068e5ba9af7b779.tar.gz fbgui-cbd71522f60cc2058634b6fd9068e5ba9af7b779.tar.xz fbgui-cbd71522f60cc2058634b6fd9068e5ba9af7b779.zip | |
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
Diffstat (limited to 'src/fbbrowser.cpp')
| -rw-r--r-- | src/fbbrowser.cpp | 16 |
1 files changed, 14 insertions, 2 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() + */ } |