diff options
| author | Niklas Goby | 2011-02-01 16:25:38 +0100 |
|---|---|---|
| committer | Niklas Goby | 2011-02-01 16:25:38 +0100 |
| commit | a1c5fea9ed618b296548560d5806d99448cca262 (patch) | |
| tree | 397eca35be1527b1d4e6b3952439f3e1ccd36a65 /src/fbbrowser.cpp | |
| parent | Alternative to getPath() function using QT classes (diff) | |
| download | fbgui-a1c5fea9ed618b296548560d5806d99448cca262.tar.gz fbgui-a1c5fea9ed618b296548560d5806d99448cca262.tar.xz fbgui-a1c5fea9ed618b296548560d5806d99448cca262.zip | |
i added jsObject
Please enter the commit message for your changes. Lines starting
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 4b2b66f..bee3b1d 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... @@ -97,7 +98,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) @@ -113,5 +115,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() + */ } |