summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2011-04-16 13:12:13 +0200
committerJonathan Bauer2011-04-16 13:12:13 +0200
commit4378d39ea8866b9446685cb6140bc632d22a9a16 (patch)
tree284d48dc626888b61c9a267a069026d0cdffa29b
parentfixes & misc (diff)
downloadfbgui-4378d39ea8866b9446685cb6140bc632d22a9a16.tar.gz
fbgui-4378d39ea8866b9446685cb6140bc632d22a9a16.tar.xz
fbgui-4378d39ea8866b9446685cb6140bc632d22a9a16.zip
cursor hidden by QWSServer, added loading animation for preload page, started preload-debug page
Diffstat
-rw-r--r--fbgui.conf2
-rw-r--r--src/downloadmanager.cpp1
-rw-r--r--src/fbgui.cpp3
-rw-r--r--src/fbgui.h1
-rw-r--r--src/html/preload-debug.html32
-rw-r--r--src/html/preload.html22
-rw-r--r--src/html/style.css65
-rw-r--r--src/main.cpp4
-rwxr-xr-xsrc/testApp.sh1
9 files changed, 127 insertions, 4 deletions
diff --git a/fbgui.conf b/fbgui.conf
index 168c1ac..e450443 100644
--- a/fbgui.conf
+++ b/fbgui.conf
@@ -2,5 +2,5 @@
pbs_url=http://132.230.4.27
download_directory=/tmp/fbgui
update_interval=5
-file_trigger=/tmp/fbgui/trigger
+file_trigger=/tmp/fbgui_trigger
serial_location=/serial
diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index 9faad88..aa0682c 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -83,6 +83,7 @@ void DownloadManager::processDownloadRequest(const QUrl& url)
// -------------------------------------------------------------------------------------------------------
void DownloadManager::startNextDownload()
{
+ QWSServer::instance()->setCursorVisible(false);
if (dlQ.isEmpty()){
emit downloadQueueEmpty();
qxtLog->debug() << "[dm] Download manager ready. (1)";
diff --git a/src/fbgui.cpp b/src/fbgui.cpp
index d991556..f27a698 100644
--- a/src/fbgui.cpp
+++ b/src/fbgui.cpp
@@ -220,7 +220,8 @@ void fbgui::loadURL()
QByteArray postData = generatePOSTData();
QNetworkRequest req(baseURL);
// show arrow cursor
- qApp->setOverrideCursor(QCursor(Qt::ArrowCursor));
+ QWSServer::instance()->setCursorVisible(true);
+ //qApp->setOverrideCursor(QCursor(Qt::ArrowCursor));
_webView->load(req, QNetworkAccessManager::PostOperation, postData);
}
}
diff --git a/src/fbgui.h b/src/fbgui.h
index 287b295..f3c2a77 100644
--- a/src/fbgui.h
+++ b/src/fbgui.h
@@ -19,6 +19,7 @@
#ifndef FBGUI_H
#define FBGUI_H
+#include <QWSServer>
#include <QtGui>
#include <QtWebKit>
#include <QxtCore>
diff --git a/src/html/preload-debug.html b/src/html/preload-debug.html
new file mode 100644
index 0000000..cc69aa1
--- /dev/null
+++ b/src/html/preload-debug.html
@@ -0,0 +1,32 @@
+<html>
+<head>
+<link rel="stylesheet" type="text/css" href="style.css">
+<script type="text/javascript">
+function gogo(){
+ fbgui.trigger();
+}
+function quitgui(){
+ fbgui.quit();
+}
+</script>
+</head>
+<body>
+<div id="top">
+ <h1>Preboot GUI</h1>
+ <input type="button" name="quit" value="quit"
+ style="font-size:75%"
+ onclick="quitgui()">
+ <p>Waiting on internet...i
+ <input type="button" name="go" value="click me"
+ style="font-size:75%"
+ onclick="gogo()">
+ </p>
+</div>
+<div id="container">
+ <div id="footer-spacer"></div>
+</div>
+<div id="footer">
+ <p>RZ Uni Freiburg, 2011</p>
+</div>
+</body>
+</html>
diff --git a/src/html/preload.html b/src/html/preload.html
index a01dbd7..bb63050 100644
--- a/src/html/preload.html
+++ b/src/html/preload.html
@@ -5,6 +5,18 @@
function gogo(){
fbgui.trigger();
}
+//simple script to rotate all spinners 45 degrees on each tick
+//this works differently from the css transforms, which is smooth
+var count = 0;
+function rotate() {
+ var elem4 = document.getElementById('div4');
+ elem4.style.MozTransform = 'scale(0.5) rotate('+count+'deg)';
+ elem4.style.WebkitTransform = 'scale(0.5) rotate('+count+'deg)';
+ if (count==360) { count = 0 }
+ count+=45;
+ window.setTimeout(rotate, 100);
+}
+window.setTimeout(rotate, 100);
</script>
</head>
<body>
@@ -13,6 +25,16 @@ function gogo(){
<p>Waiting on internet...
</p>
</div>
+<div id="div4">
+ <div class="bar1"></div>
+ <div class="bar2"></div>
+ <div class="bar3"></div>
+ <div class="bar4"></div>
+ <div class="bar5"></div>
+ <div class="bar6"></div>
+ <div class="bar7"></div>
+ <div class="bar8"></div>
+</div>
<div id="container">
<div id="footer-spacer"></div>
</div>
diff --git a/src/html/style.css b/src/html/style.css
index 8ebfa3d..817a7ee 100644
--- a/src/html/style.css
+++ b/src/html/style.css
@@ -30,3 +30,68 @@ h1, p{
#footer{
height:30px;
}
+/* position the bars and balls correctly (rotate them and translate them outward)*/
+.bar1 {
+ -moz-transform:rotate(0deg) translate(0, -40px);
+ -webkit-transform:rotate(0deg) translate(0, -40px);opacity:0.12;
+}
+.bar2 {
+ -moz-transform:rotate(45deg) translate(0, -40px);
+ -webkit-transform:rotate(45deg) translate(0, -40px);opacity:0.25;
+}
+.bar3 {
+ -moz-transform:rotate(90deg) translate(0, -40px);
+ -webkit-transform:rotate(90deg) translate(0, -40px);opacity:0.37;
+}
+.bar4 {
+ -moz-transform:rotate(135deg) translate(0, -40px);
+ -webkit-transform:rotate(135deg) translate(0, -40px);opacity:0.50;
+}
+.bar5 {
+ -moz-transform:rotate(180deg) translate(0, -40px);
+ -webkit-transform:rotate(180deg) translate(0, -40px);opacity:0.62;
+}
+.bar6 {
+ -moz-transform:rotate(225deg) translate(0, -40px);
+ -webkit-transform:rotate(225deg) translate(0, -40px);opacity:0.75;
+}
+.bar7 {
+ -moz-transform:rotate(270deg) translate(0, -40px);
+ -webkit-transform:rotate(270deg) translate(0, -40px);opacity:0.87;
+}
+.bar8 {
+ -moz-transform:rotate(315deg) translate(0, -40px);
+ -webkit-transform:rotate(315deg) translate(0, -40px);opacity:1;
+}
+#div4 {
+ position:absolute;
+ left:50%;
+ top:50%;
+ margin-left:-50px;
+ margin-top:-50px;
+ width:100px;
+ height:100px;
+ -moz-border-radius:100px;
+ -webkit-border-radius:100px;
+ -moz-transform:scale(0.5);
+ -webkit-transform:scale(0.5);
+ -webkit-animation-name: rotateThis;
+ -webkit-animation-duration:2s;
+ -webkit-animation-iteration-count:infinite;
+ -webkit-animation-timing-function:linear;
+}
+#div4 div {
+ width:20px;
+ height:20px;
+ background:#fff;
+ -moz-border-radius:40px;
+ -webkit-border-radius:40px;
+ position:absolute;
+ left:40px;
+ top:40px;
+}
+/* add a shadow to the first */
+#div4 div {
+ -moz-box-shadow:black 0 0 4px;
+ -webkit-box-shadow:black 0 0 4px;
+}
diff --git a/src/main.cpp b/src/main.cpp
index a07a8f4..7d73754 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -174,8 +174,8 @@ int main(int argc, char *argv[])
qxtLog->debug() << "*******************************************";
// set invisible cursor
- qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
-
+ //qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
+ QWSServer::instance()->setCursorVisible(false);
// start fbgui
fbgui gui;
gui.show();
diff --git a/src/testApp.sh b/src/testApp.sh
index c924500..9b46385 100755
--- a/src/testApp.sh
+++ b/src/testApp.sh
@@ -14,6 +14,7 @@
# clean /tmp/fbgui
rm -rf /tmp/fbgui
+rm /tmp/fbgui_trigger
# path to script (including script name)
script_path="$(cd "${0%/*}" 2>/dev/null; echo "$PWD"/"${0##*/}")"
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-05-17 07:53:40 +0200