diff options
| author | Jonathan Bauer | 2011-04-13 22:09:55 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2011-04-13 22:09:55 +0200 |
| commit | f3bff47bcd44df47f1ee0e740214919d2e6f7a84 (patch) | |
| tree | 77a7aa8f32b5b8ef02134d282d4556cd29e3c8a7 | |
| parent | skip trigger checks if trigger is already present (diff) | |
| download | fbgui-f3bff47bcd44df47f1ee0e740214919d2e6f7a84.tar.gz fbgui-f3bff47bcd44df47f1ee0e740214919d2e6f7a84.tar.xz fbgui-f3bff47bcd44df47f1ee0e740214919d2e6f7a84.zip | |
trigger watch fix & waiting cursor until URL
| -rw-r--r-- | src/fbgui.cpp | 9 | ||||
| -rw-r--r-- | src/main.cpp | 2 | ||||
| -rwxr-xr-x | src/testApp.sh | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/fbgui.cpp b/src/fbgui.cpp index f130347..1bfad79 100644 --- a/src/fbgui.cpp +++ b/src/fbgui.cpp @@ -171,6 +171,10 @@ void fbgui::checkForTrigger(const QString& dirname) QFileInfo fi(dirname + "/" + tfi.fileName()); if (fi.exists()){ qxtLog->debug() << "[watcher] " << fileToTriggerURL << " detected."; + // disconnect _watcher, his job is done + qxtLog->debug() << "[watcher] disconnected."; + _watcher->disconnect(this); + _watcher->deleteLater(); // memory problems with watcher // load URL if host exists if (checkHost()) loadURL(); } @@ -211,10 +215,7 @@ bool fbgui::checkHost() const */ void fbgui::loadURL() { - // disconnect _watcher, his job is done - //qxtLog->debug() << "[watcher] disconnected."; - //_watcher->disconnect(this); - //_watcher->deleteLater(); // memory problems with watcher + qxtLog->debug() << "[gui] Loading URL..."; QByteArray postData = generatePOSTData(); qxtLog->debug() << "[gui] POST data: " << postData; diff --git a/src/main.cpp b/src/main.cpp index c816157..a07a8f4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -174,7 +174,7 @@ int main(int argc, char *argv[]) qxtLog->debug() << "*******************************************"; // set invisible cursor - qApp->setOverrideCursor(QCursor(Qt::BlankCursor)); + qApp->setOverrideCursor(QCursor(Qt::WaitCursor)); // start fbgui fbgui gui; diff --git a/src/testApp.sh b/src/testApp.sh index 3f1fe82..c924500 100755 --- a/src/testApp.sh +++ b/src/testApp.sh @@ -13,7 +13,7 @@ # Note: all path are expected to be absolute. # clean /tmp/fbgui -#rm -rf /tmp/fbgui +rm -rf /tmp/fbgui # path to script (including script name) script_path="$(cd "${0%/*}" 2>/dev/null; echo "$PWD"/"${0##*/}")" |