debug console now powered by qxt, custom engines, updated debug msgs. Download manager now uses notify(message) to send error/status to the javascript interface, checks for download errors (still some missing)

1 files changed, 16 insertions, 19 deletions

diff --git a/src/javascriptInterface.cpp b/src/javascriptInterface.cpp
index c4dd61b..1a9b470 100644
--- a/src/javascriptInterface.cpp
+++ b/src/javascriptInterface.cpp
@@ -5,26 +5,23 @@
 //-------------------------------------------------------------------------------------------------------
 javascriptInterface::javascriptInterface(QWebFrame *parent)
 {
+	qxtLog->debug() << "Initializing javascript interface...";
 	//TODO: check for better way to use evaluateJavaScript()
 	_parent = parent;
 }
 //-------------------------------------------------------------------------------------------------------
 javascriptInterface::~javascriptInterface() {}
 //-------------------------------------------------------------------------------------------------------
-QString javascriptInterface::getSysInfo(QString info)
-{
+QString javascriptInterface::getSysInfo(QString info){
 	sysInfo si;
-	if (debug) qDebug() << "Requested info: " << info << endl;
 	return si.getInfo(info);
 }
 //-------------------------------------------------------------------------------------------------------
-void javascriptInterface::attachToDOM()
-{
+void javascriptInterface::attachToDOM(){
 	_parent->addToJavaScriptWindowObject(QString("fbgui"), this);
 }
 //-------------------------------------------------------------------------------------------------------
-void javascriptInterface::startDownload(QString filename)
-{
+void javascriptInterface::startDownload(QString filename){
 	/* ignore if empty filename */
 	if (filename.isEmpty()){
 		_parent->evaluateJavaScript("alert(\"No filename!\")");
@@ -33,33 +30,33 @@ void javascriptInterface::startDownload(QString filename)
 	emit requestFile(filename);
 }
 //-------------------------------------------------------------------------------------------------------
-void javascriptInterface::downloadInfo(QString filename, double filesize)
-{
+void javascriptInterface::downloadInfo(QString filename, double filesize){
 	QString code = QString("downloadInfo('\%1', \%2)").arg(filename).arg(filesize);
 	_parent->evaluateJavaScript(code);
 }
 //-------------------------------------------------------------------------------------------------------
-void javascriptInterface::updateProgressBar(int percent, double speed, QString unit)
-{
+void javascriptInterface::notify(QString msg){
+
+	QString code = QString("notify('\%1')").arg(msg);
+	_parent->evaluateJavaScript(code);
+	return;
+}
+//-------------------------------------------------------------------------------------------------------
+void javascriptInterface::updateProgressBar(int percent, double speed, QString unit){
 	if (percent == 0) return;
 	QString code = QString("updateProgress(\%1, \%2, '\%3')").arg(percent).arg(speed).arg(unit);
-	if (debug) qDebug() << "To JS:  " << code;
 	_parent->evaluateJavaScript(code);
 }
 //-------------------------------------------------------------------------------------------------------
-void javascriptInterface::setCallbackOnDlQueueFinished(QString jsFunction)
-{
+void javascriptInterface::setCallbackOnDlQueueFinished(QString jsFunction){
 	callBackOnDownloadsFinished = jsFunction;
 }
 //-------------------------------------------------------------------------------------------------------
-void javascriptInterface::callbackOnDlQueueFinished()
-{
+void javascriptInterface::callbackOnDlQueueFinished(){
 	QString code = QString("\%1").arg(callBackOnDownloadsFinished);
 	_parent->evaluateJavaScript(code);
 }
 //-------------------------------------------------------------------------------------------------------
-void javascriptInterface::quit()
-{
-	if (debug) qDebug() << "Quit signal.";
+void javascriptInterface::quit(){
 	emit quitFbgui();
 }