diff options
| author | Jonathan Bauer | 2011-03-23 15:10:21 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2011-03-23 15:10:21 +0100 |
| commit | 6ea61ea34af9f0a248f183ceee5f5531eb4c69fe (patch) | |
| tree | 353ef9e79d8da041b6f7ad328187dd4b3519ada5 /src | |
| parent | download manager directory checks improvements... (diff) | |
| parent | Merge branch 'master' of git.openslx.org:lsfks/master-teamprojekt/fbgui (diff) | |
| download | fbgui-6ea61ea34af9f0a248f183ceee5f5531eb4c69fe.tar.gz fbgui-6ea61ea34af9f0a248f183ceee5f5531eb4c69fe.tar.xz fbgui-6ea61ea34af9f0a248f183ceee5f5531eb4c69fe.zip | |
Merge branch 'master' of git.openslx.org:lsfks/master-teamprojekt/fbgui
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 03c1789..40f105b 100644 --- a/src/fbgui.h +++ b/src/fbgui.h @@ -28,6 +28,7 @@ #define DEFAULT_DOWNLOAD_DIR "/tmp/fbgui/downloads" #define DEFAULT_CONFIG_PATH "/etc/fbgui.conf" #define DEFAULT_UPDATE_INTERVAL 1; +#define DEFAULT_QRC_HTML_DIR ":/html" #define DEFAULT_FILE_TRIGGER "/tmp/fbgui/trigger" diff --git a/src/javascriptinterface.cpp b/src/javascriptinterface.cpp index 8261582..0a92de6 100644 --- a/src/javascriptinterface.cpp +++ b/src/javascriptinterface.cpp @@ -70,8 +70,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) @@ -80,10 +82,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(); |