diff options
| author | Niklas Goby | 2011-03-23 14:46:19 +0100 |
|---|---|---|
| committer | Niklas Goby | 2011-03-23 14:46:19 +0100 |
| commit | bad06ebac5cca429e0cf6421fc0f2e92c1a2d555 (patch) | |
| tree | 54aca49c444c1c171914ecf6506aaf108e19f674 /src | |
| parent | new files (diff) | |
| download | fbgui-bad06ebac5cca429e0cf6421fc0f2e92c1a2d555.tar.gz fbgui-bad06ebac5cca429e0cf6421fc0f2e92c1a2d555.tar.xz fbgui-bad06ebac5cca429e0cf6421fc0f2e92c1a2d555.zip | |
working jquery over qrc
Diffstat (limited to 'src')
| -rw-r--r-- | src/fbgui.h | 1 | ||||
| -rw-r--r-- | src/javascriptinterface.cpp | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/fbgui.h b/src/fbgui.h index 0e660a5..6a9e10b 100644 --- a/src/fbgui.h +++ b/src/fbgui.h @@ -29,6 +29,7 @@ #define DEFAULT_CONFIG_PATH "/etc/fbgui.conf" #define DEFAULT_UPDATE_INTERVAL 1; #define DEFAULT_FILE_TRIGGER "/tmp/trigger_fbgui" +#define DEFAULT_QRC_HTML_DIR ":/html" // Global settings diff --git a/src/javascriptinterface.cpp b/src/javascriptinterface.cpp index c3ac80c..ae976c6 100644 --- a/src/javascriptinterface.cpp +++ b/src/javascriptinterface.cpp @@ -69,8 +69,10 @@ void JavascriptInterface::quit(){ void JavascriptInterface::loadJQuery(){ QString js; + QString pathToJsDir(DEFAULT_QRC_HTML_DIR); + pathToJsDir.append("/js"); - QDir* qrcJSDir = new QDir(":/html/js/"); + QDir* qrcJSDir = new QDir(pathToJsDir); QFileInfoList fiList = qrcJSDir->entryInfoList(); QFileInfo fi; foreach(fi, fiList) @@ -79,10 +81,10 @@ void JavascriptInterface::loadJQuery(){ { qDebug()<< fi.fileName(); qxtLog->debug() << fi.fileName(); - if(fi.fileName()=="test.js") + if(fi.fileName()!="test.js") { QFile file; - file.setFileName(":/" + fi.fileName()); + file.setFileName(pathToJsDir + "/" + fi.fileName()); file.open(QIODevice::ReadOnly); js = file.readAll(); file.close(); |