summaryrefslogtreecommitdiffstats
path: root/src/fbgui.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/fbgui.cpp')
-rw-r--r--src/fbgui.cpp21
1 files changed, 9 insertions, 12 deletions
diff --git a/src/fbgui.cpp b/src/fbgui.cpp
index 4dbbc58..d991556 100644
--- a/src/fbgui.cpp
+++ b/src/fbgui.cpp
@@ -10,7 +10,7 @@
#include <QtWebKit>
#include <QxtCore>
-QThread dmThread;
+//QThread dmThread;
QString binPath("");
QUrl baseURL("");
QString downloadPath("");
@@ -65,10 +65,11 @@ fbgui::fbgui()
QObject::connect(dm, SIGNAL(downloadQueueEmpty()), jsi, SLOT(callbackOnFinished()));
// move download manager to its own thread
- dm->moveToThread(&dmThread);
- dmThread.start();
+ //dm->moveToThread(&dmThread);
+ //dmThread.start();
- // show filler page
+ //_webView->page()->networkAccessManager()->setCookieJar(new QNetworkCookieJar);
+ // show page
_webView->load(QUrl("qrc:/html/preload.html"));
// start watching for fileToTriggerURL
watchForTrigger();
@@ -81,7 +82,7 @@ fbgui::fbgui()
showFullScreen();
}
fbgui::~fbgui(){
- dmThread.quit();
+ //dmThread.quit();
}
//-------------------------------------------------------------------------------------------
// Layout / actions setup
@@ -140,7 +141,7 @@ void fbgui::watchForTrigger()
if (file.exists()){
qxtLog->debug() << "[watcher] " << fileToTriggerURL << " exists already!";
// try to load URL
- if (checkHost()) loadURL();
+ loadURL();
}
else {
// create it
@@ -179,7 +180,7 @@ void fbgui::prepareURLLoad()
_watcher->disconnect(this);
_watcher->deleteLater();
// try to load URL
- if (checkHost()) loadURL();
+ loadURL();
}
//-------------------------------------------------------------------------------------------
// Preparations for URL load
@@ -254,7 +255,6 @@ QByteArray fbgui::generatePOSTData()
QFile file(serialLocation);
if (!file.open(QIODevice::ReadOnly)){
qxtLog->debug() << "[post] No such file: " << file.fileName();
- serial = "10-23-43-55-67"; // tests
}
// everything ok, read data
serial = file.readAll();
@@ -296,8 +296,5 @@ void fbgui::createDebugConsole()
//-------------------------------------------------------------------------------------------
void fbgui::toggleDebugConsole()
{
- if (_debugConsole->isVisible())
- _debugConsole->hide();
- else
- _debugConsole->show();
+ (_debugConsole->isVisible()) ? _debugConsole->hide() : _debugConsole->show();
}