fbgui.conf default paths checks, update interval modifiable (only in .conf), (re)moved header filename parsing, cleanup, cleanupss

1 files changed, 9 insertions, 20 deletions

diff --git a/src/javascriptInterface.cpp b/src/javascriptInterface.cpp
index f8b8ef6..d57ce44 100644
--- a/src/javascriptInterface.cpp
+++ b/src/javascriptInterface.cpp
@@ -1,17 +1,11 @@
-/*
- * jsObject.cpp javascriptInterface
- *
- *  Created on: Feb 1, 2011
- *      Author: niklas
- */
 #include "fbgui.h"
 #include "javascriptInterface.h"
 #include "sysInfo.h"
 
-
 //-------------------------------------------------------------------------------------------------------
-javascriptInterface::javascriptInterface(QWebFrame *parent) {
-	// check for better way to use evaluateJavaScript()
+javascriptInterface::javascriptInterface(QWebFrame *parent)
+{
+	//TODO: check for better way to use evaluateJavaScript()
 	_parent = parent;
 }
 //-------------------------------------------------------------------------------------------------------
@@ -26,30 +20,24 @@ QString javascriptInterface::getSysInfo(QString info)
 //-------------------------------------------------------------------------------------------------------
 void javascriptInterface::attachToDOM()
 {
-	//_parent->addToJavaScriptWindowObject(QString("jsObject"), this);
 	_parent->addToJavaScriptWindowObject(QString("fbgui"), this);
 }
 //-------------------------------------------------------------------------------------------------------
 void javascriptInterface::startDownload(QString filename)
 {
-	/* return if no filename in input field */
-	//if (debug) qDebug() << "javascriptInterace: requesting download: " << filename;
-	if (filename.isEmpty())
-	{
+	/* ignore if empty filename */
+	if (filename.isEmpty()){
 		_parent->evaluateJavaScript("alert(\"No filename!\")");
 		return;
 	}
-	//if (debug) qDebug() << "Request download: " << baseURL.resolved(QUrl(filename)).toString();
 	emit requestFile(filename);
-
 }
 //-------------------------------------------------------------------------------------------------------
 void javascriptInterface::updateProgressBar(QString current, int i)
 {
-	if (i == 0)
-		return;
+	if (i == 0) return;
 	QString code = QString("updateProgress('\%1', \%2)").arg(current).arg(i);
-	qDebug() << "To JS:  " << code;
+	if (debug) qDebug() << "To JS:  " << code;
 	_parent->evaluateJavaScript(code);
 }
 //-------------------------------------------------------------------------------------------------------
@@ -57,12 +45,13 @@ void javascriptInterface::setCallbackOnDlQueueFinished(QString jsFunction)
 {
 	callBackOnDownloadsFinished = jsFunction;
 }
+//-------------------------------------------------------------------------------------------------------
 void javascriptInterface::callbackOnDlQueueFinished()
 {
 	QString code = QString("\%1").arg(callBackOnDownloadsFinished);
-	qDebug() << "to JS: " << code;
 	_parent->evaluateJavaScript(code);
 }
+//-------------------------------------------------------------------------------------------------------
 void javascriptInterface::quit()
 {
 	if (debug) qDebug() << "Quit signal.";