From a1c5fea9ed618b296548560d5806d99448cca262 Mon Sep 17 00:00:00 2001 From: Niklas Goby Date: Tue, 1 Feb 2011 16:25:38 +0100 Subject: i added jsObject Please enter the commit message for your changes. Lines starting --- src/fbbrowser.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'src/fbbrowser.cpp') 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 #include #include +#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 ipList = QNetworkInterface::allAddresses(); + QString macAddress = QNetworkInterface::hardwareAddress() + */ } -- cgit v1.2.3-55-g7522