diff options
| -rw-r--r-- | src/fbgui.conf | 1 | ||||
| -rw-r--r-- | src/fbgui.cpp | 4 | ||||
| -rw-r--r-- | src/fbgui.h | 3 | ||||
| -rw-r--r-- | src/sysInfo.cpp | 1 | ||||
| -rw-r--r-- | src/sysInfo.h | 2 | ||||
| -rwxr-xr-x | src/testApp.sh | 3 |
6 files changed, 9 insertions, 5 deletions
diff --git a/src/fbgui.conf b/src/fbgui.conf index 65c7c9e..f835e84 100644 --- a/src/fbgui.conf +++ b/src/fbgui.conf @@ -1,2 +1,3 @@ [default] url=http://132.230.4.3/test.html +downloadDirectory=./downloads/ diff --git a/src/fbgui.cpp b/src/fbgui.cpp index 97656f5..beb0aac 100644 --- a/src/fbgui.cpp +++ b/src/fbgui.cpp @@ -19,7 +19,7 @@ fbgui::fbgui(QApplication *parent) QWebView* webView = new QWebView(this); webView->load(baseURL); /* Connect fbb with app for killing the app from browser. */ - //QObject::connect(jso, SIGNAL(signalQuitAll()), parent, SLOT(quit())); + //QObject::connect(jso, SIGNAL(signalQuitAll()), this, SLOT(quit())); /* Init JavaScript interface */ JSObject* jso = new JSObject(webView->page()->mainFrame()); @@ -37,5 +37,5 @@ fbgui::fbgui(QApplication *parent) } void fbgui::quit(){ - //parent.quit(); + //parent->quit(); } diff --git a/src/fbgui.h b/src/fbgui.h index 70fa02b..5a6f014 100644 --- a/src/fbgui.h +++ b/src/fbgui.h @@ -13,8 +13,9 @@ class fbgui : public QMainWindow public: fbgui(QApplication *parent); - void quit(); +public slots: + void quit(); private: QApplication* _parent; }; diff --git a/src/sysInfo.cpp b/src/sysInfo.cpp index 575c801..1866c27 100644 --- a/src/sysInfo.cpp +++ b/src/sysInfo.cpp @@ -1,6 +1,7 @@ #include "sysInfo.h" #include <QString> #include <QTime> +#include <QNetworkInterface> extern bool debug; diff --git a/src/sysInfo.h b/src/sysInfo.h index b8e006f..43aa8ed 100644 --- a/src/sysInfo.h +++ b/src/sysInfo.h @@ -1,6 +1,8 @@ #ifndef SYSINFO_H #define SYSINFO_H +#include <QString> + class sysInfo { public: sysInfo(); diff --git a/src/testApp.sh b/src/testApp.sh index cd8a4e4..578472d 100755 --- a/src/testApp.sh +++ b/src/testApp.sh @@ -1,6 +1,6 @@ #!/bin/sh # If an argument is passed (=URL), set the URL. -# If no arg are passed, set the default test URL. +# If no arg is passed, set the default test URL. if [ $# = 0 ]; then url="http://132.230.4.3/test.html" else @@ -15,7 +15,6 @@ display_id=$(grep -n $(whoami) /etc/passwd| head -n 1|awk -F : '{print $1}') # Start QT's virtual framebuffer with proper displayID /usr/local/Trolltech/Qt-4.7.1/bin/qvfb -width 800 -height 600 -qwsdisplay :$display_id & -# Wait for it to load (needed?) Probably not ;o sleep 0.1 # Start fbgui. $working_path/fbgui -display QVFb:$display_id -d -u $url |