From 84f972b4724557403db2665408efbb81abd44155 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 25 Mar 2011 00:46:27 +0100
Subject: preload page
---
src/fbgui.cpp | 2 +-
src/fbgui.qrc | 23 +++++++++++++----------
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 @@
-
-
- html/errorPage.html
- html/loadAbout.html
- html/js/jquery-1.4.4.min.js
- html/js/jquery-1.5.1.min.js
- html/js/jquery-ui-1.8.11.min.js
- html/js/test.js
-
-
+
+
+ html/errorPage.html
+ html/loadAbout.html
+ html/js/jquery-1.4.4.min.js
+ html/js/jquery-1.5.1.min.js
+ html/js/jquery-ui-1.8.11.min.js
+ html/js/test.js
+ html/bg.jpg
+ html/style.css
+ html/preload.html
+
+
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 $@
--
cgit v1.2.3-55-g7522