diff options
| author | Niklas Goby | 2011-03-23 12:17:23 +0100 |
|---|---|---|
| committer | Niklas Goby | 2011-03-23 12:17:23 +0100 |
| commit | 187e4acf79cf325e60d433069e560189b1aa35dd (patch) | |
| tree | bd015da70bc029303e22cf1badc201888767f0cb | |
| parent | commented (working) watchdhcp for now til logic ist complete, java interface ... (diff) | |
| download | fbgui-187e4acf79cf325e60d433069e560189b1aa35dd.tar.gz fbgui-187e4acf79cf325e60d433069e560189b1aa35dd.tar.xz fbgui-187e4acf79cf325e60d433069e560189b1aa35dd.zip | |
some tries with the qrc and jquery delivery
| -rw-r--r-- | src/fbgui.qrc | 4 | ||||
| -rw-r--r-- | src/javascriptinterface.cpp | 29 | ||||
| -rw-r--r-- | src/javascriptinterface.h | 2 |
3 files changed, 35 insertions, 0 deletions
diff --git a/src/fbgui.qrc b/src/fbgui.qrc index 8a2d434..9f9f54b 100644 --- a/src/fbgui.qrc +++ b/src/fbgui.qrc @@ -2,5 +2,9 @@ <qresource> <file>html/errorPage.html</file> <file>html/loadAbout.html</file> + <file>html/js/jquery-1.4.4.min.js</file> + <file>html/js/jquery-1.5.1.min.js</file> + <file>html/js/jquery-ui-1.8.11.min.js</file> + <file>html/js/test.js</file> </qresource> </RCC> diff --git a/src/javascriptinterface.cpp b/src/javascriptinterface.cpp index 001753c..b395a6e 100644 --- a/src/javascriptinterface.cpp +++ b/src/javascriptinterface.cpp @@ -18,6 +18,7 @@ const QString JavascriptInterface::getSysInfo(const QString& info){ //------------------------------------------------------------------------------------------------------- void JavascriptInterface::attachToDOM(){ _parent->addToJavaScriptWindowObject(QString("fbgui"), this); + loadJQuery(); } //------------------------------------------------------------------------------------------------------- void JavascriptInterface::notify(const QString& msg){ @@ -63,3 +64,31 @@ void JavascriptInterface::callbackOnDlQueueFinished(){ void JavascriptInterface::quit(){ emit quitFbgui(); } +//------------------------------------------------------------------------------------------------------- +void JavascriptInterface::loadJQuery(){ + + QString js; + + QDir* qrcJSDir = new QDir(":/html/js/"); + QFileInfoList fiList = qrcJSDir->entryInfoList(); + QFileInfo fi; + foreach(fi, fiList) + { + if(fi.suffix() == "js") + { + qDebug()<< fi.fileName(); + qxtLog->debug() << fi.fileName(); + if(fi.fileName()=="test.js") + { + QFile file; + file.setFileName(":/" + fi.fileName()); + file.open(QIODevice::ReadOnly); + js = file.readAll(); + file.close(); + + _parent->evaluateJavaScript(js); + qDebug()<< "evaluated " + fi.fileName(); + } + } + } +} diff --git a/src/javascriptinterface.h b/src/javascriptinterface.h index fe42a94..d51dccb 100644 --- a/src/javascriptinterface.h +++ b/src/javascriptinterface.h @@ -27,6 +27,8 @@ private: QWebFrame* _parent; QString _callBackOnDownloadsFinished; + void loadJQuery(); + public: JavascriptInterface(QWebFrame* parent); ~JavascriptInterface(); |