summaryrefslogtreecommitdiffstats
path: root/src/fbgui.cpp
diff options
context:
space:
mode:
authorJonathan Bauer2011-03-24 11:12:11 +0100
committerJonathan Bauer2011-03-24 11:12:11 +0100
commit43b40a5d98ce36ed094b7e266cb4889aa9f7e0fa (patch)
treef719978a81b7596c7a3e053c52c0bf7a6231c8d4 /src/fbgui.cpp
parent. (diff)
downloadfbgui-43b40a5d98ce36ed094b7e266cb4889aa9f7e0fa.tar.gz
fbgui-43b40a5d98ce36ed094b7e266cb4889aa9f7e0fa.tar.xz
fbgui-43b40a5d98ce36ed094b7e266cb4889aa9f7e0fa.zip
callback fix
Diffstat (limited to 'src/fbgui.cpp')
-rw-r--r--src/fbgui.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/fbgui.cpp b/src/fbgui.cpp
index 210368f..3154551 100644
--- a/src/fbgui.cpp
+++ b/src/fbgui.cpp
@@ -26,10 +26,10 @@ fbgui::fbgui()
sil->getInfoAboutNetworkInterface();
sil->getInfoAboutClassNet();
- // setup basic debug
+ // start basic console debug log
qxtLog->disableLoggerEngine("DEFAULT");
qxtLog->enableLogLevels(QxtLogger::DebugLevel);
- if (debugMode == 0){
+ if (debugMode == 0 || debugMode == 1){
qxtLog->addLoggerEngine("std_logger", new LoggerEngine_std);
qxtLog->initLoggerEngine("std_logger");
qxtLog->setMinimumLevel("std_logger", QxtLogger::DebugLevel);
@@ -37,7 +37,6 @@ fbgui::fbgui()
}
// base of the gui
-
_webView = new QWebView(this);
// debug console split or normal browser
if (debugMode == 1)
@@ -61,13 +60,12 @@ fbgui::fbgui()
QObject::connect(jsi, SIGNAL(requestFile(const QString&)), dm, SLOT(downloadFile(const QString&)));
QObject::connect(dm, SIGNAL(updateProgress(const int&, const double&, const QString&)),
jsi, SLOT(updateProgressBar(const int&, const double&, const QString&)));
- QObject::connect(dm, SIGNAL(downloadQueueEmpty()), jsi, SLOT(callbackOnDlQueueFinished()));
+ QObject::connect(dm, SIGNAL(downloadQueueEmpty()), jsi, SLOT(callbackOnFinished()));
createActions();
_webView->load(QUrl("qrc:/html/loadAbout.html"));
- // watch creation of fileToTriggerURL
- watchFileTrigger();
+ watchForTrigger();
// set properties
setWindowTitle("fbgui");
@@ -88,7 +86,7 @@ void fbgui::createActions()
//-------------------------------------------------------------------------------------------
-void fbgui::watchFileTrigger()
+void fbgui::watchForTrigger()
{
// check if the directory to fileToTriggerURL exists
QFileInfo fi(fileToTriggerURL);
@@ -194,7 +192,6 @@ void fbgui::setupDebugSplit()
pal.setColor(QPalette::Base, Qt::black);
_debugConsole->setPalette(pal);
_debugConsole->setTextColor(Qt::white);
- _debugConsole->insertPlainText("Debug console initialized.\n");
// enable custom logger engine
qxtLog->addLoggerEngine("fb_logger", new LoggerEngine_fb(_debugConsole));
//qxtLog->initLoggerEngine("fb_logger");