diff options
| author | Jonathan Bauer | 2011-03-25 00:46:27 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2011-03-25 00:46:27 +0100 |
| commit | 84f972b4724557403db2665408efbb81abd44155 (patch) | |
| tree | 83d88100f590bd45b96c845e267212d7327db4f6 | |
| parent | usage info update (diff) | |
| download | fbgui-84f972b4724557403db2665408efbb81abd44155.tar.gz fbgui-84f972b4724557403db2665408efbb81abd44155.tar.xz fbgui-84f972b4724557403db2665408efbb81abd44155.zip | |
preload page
| -rw-r--r-- | src/fbgui.cpp | 2 | ||||
| -rw-r--r-- | src/fbgui.qrc | 23 | ||||
| -rwxr-xr-x | src/testApp.sh | 2 |
3 files changed, 15 insertions, 12 deletions
diff --git a/src/fbgui.cpp b/src/fbgui.cpp index c5d3385..8f4aae6 100644 --- a/src/fbgui.cpp +++ b/src/fbgui.cpp @@ -51,7 +51,7 @@ fbgui::fbgui() // show filler page - _webView->load(QUrl("qrc:/html/loadAbout.html")); + _webView->load(QUrl("qrc:/html/preload.html")); // start watching for fileToTriggerURL watchForTrigger(); diff --git a/src/fbgui.qrc b/src/fbgui.qrc index 9f9f54b..4435c47 100644 --- a/src/fbgui.qrc +++ b/src/fbgui.qrc @@ -1,10 +1,13 @@ -<!DOCTYPE RCC><RCC version="1.0"> - <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> +<RCC> + <qresource prefix="/"> + <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> + <file>html/bg.jpg</file> + <file>html/style.css</file> + <file>html/preload.html</file> + </qresource> +</RCC> diff --git a/src/testApp.sh b/src/testApp.sh index 0ae691e..9cf6e0a 100755 --- a/src/testApp.sh +++ b/src/testApp.sh @@ -19,7 +19,7 @@ working_path=`dirname "$script_path"` display_id=$(grep -n $(whoami) /etc/passwd| head -n 1|awk -F : '{print $1}') # Start QT's virtual framebuffer with proper display_id -/usr/local/Trolltech/Qt-4.7.2/bin/qvfb -width 1024 -height 768 -qwsdisplay :$display_id & +/usr/local/Trolltech/Qt-4.7.2/bin/qvfb -width 800 -height 600 -qwsdisplay :$display_id & sleep 0.2 # Start fbgui connecting to QVFb with display_id from above. $working_path/fbgui -display QVFb:$display_id $@ |