diff options
| author | Jonathan Bauer | 2011-03-23 15:25:05 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2011-03-23 15:25:05 +0100 |
| commit | 322853fcb7a2cdc84b5e9d2ecd87f216c31b4ea0 (patch) | |
| tree | ea8d1b4659be602cecbf0d40540856f5b7909ea7 /src | |
| parent | Merge branch 'master' of git.openslx.org:lsfks/master-teamprojekt/fbgui (diff) | |
| download | fbgui-322853fcb7a2cdc84b5e9d2ecd87f216c31b4ea0.tar.gz fbgui-322853fcb7a2cdc84b5e9d2ecd87f216c31b4ea0.tar.xz fbgui-322853fcb7a2cdc84b5e9d2ecd87f216c31b4ea0.zip | |
loadURL() called when trigger file found
Diffstat (limited to 'src')
| -rw-r--r-- | src/fbgui.cpp | 20 | ||||
| -rw-r--r-- | src/fbgui.h | 4 |
2 files changed, 16 insertions, 8 deletions
diff --git a/src/fbgui.cpp b/src/fbgui.cpp index 9be1925..1a13b1a 100644 --- a/src/fbgui.cpp +++ b/src/fbgui.cpp @@ -33,10 +33,10 @@ fbgui::fbgui() _webView = new QWebView(this); // file watcher, disabled for now. - //_webView->load(baseURL); //watchFileTrigger(); - // PBS test (working dont delete) + //--------------------------------------------------------------------------------------- + // PBS test begin QString serial; QFileInfo fi("/tmp/serial"); if (fi.exists()) @@ -53,12 +53,13 @@ fbgui::fbgui() else qxtLog->debug() << "No file /tmp/serial !"; // TODO append serial number to postData. - //QByteArray postData = "mac=d8:d3:85:80:81:8b&hardwarehash=12341234123412341234123412341234&bootisoID=1&serial="+serial; QNetworkRequest req(baseURL); QByteArray postData = "mac=d8:d3:85:80:81:8b&hardwarehash=12341234123412341234123412341234&bootisoID=1&serial="; _webView->load(req, QNetworkAccessManager::PostOperation, postData); + // PBS test end + //--------------------------------------------------------------------------------------- // debug console split or normal browser if (debugMode == 1) @@ -155,10 +156,7 @@ void fbgui::checkForTrigger(const QString& dirname) QFileInfo fi(dirname + "/" + tfi.fileName()); if (fi.exists()){ qxtLog->debug() << fileToTriggerURL << " found!"; - if (checkHost()){ - qxtLog->debug() << "Loading URL..."; - _webView->load(baseURL); - } + loadURL(); } else // do nothing / keep watching @@ -196,3 +194,11 @@ void fbgui::watchFileTrigger() QObject::connect(_watcher, SIGNAL(directoryChanged(const QString&)), this, SLOT(checkForTrigger(const QString&))); } } +//------------------------------------------------------------------------------------------- +void fbgui::loadURL(){ + // TODO POST data stuff comes here + if (checkHost()){ + qxtLog->debug() << "Loading URL..."; + _webView->load(baseURL); + } +} diff --git a/src/fbgui.h b/src/fbgui.h index 40f105b..77b339b 100644 --- a/src/fbgui.h +++ b/src/fbgui.h @@ -54,6 +54,7 @@ private: void createActions(); bool checkHost() const; void watchFileTrigger(); + void loadURL(); // widgets constituing the gui @@ -69,9 +70,10 @@ private: QFileSystemWatcher* _watcher; private slots: + void checkForTrigger(const QString& dirname); // slots for processing actions void toggleDebug(); - void checkForTrigger(const QString& dirname); + }; #endif // FBGUI_H |