updated communication between jso/dm/fbb

1 files changed, 19 insertions, 3 deletions

diff --git a/src/fbbrowser.cpp b/src/fbbrowser.cpp
index df4b7ed..37b3349 100644
--- a/src/fbbrowser.cpp
+++ b/src/fbbrowser.cpp
@@ -5,7 +5,21 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QtWebKit>
-
+// -------------------------------------------------------------------------------------------
+void fbbrowser::forwardDownloadRequest(QString& filename)
+{
+	// Forge URL for filename from baseUrl
+	// Erm fix this
+	QString qs = "http://132.230.4.3/";
+	qs.append(filename);
+	QUrl url(qs);
+	emit downloadFile(url);
+}
+// -------------------------------------------------------------------------------------------
+void fbbrowser::forwardUpdateProgress(int progress)
+{
+	emit updateProgress(progress);
+}
 // -------------------------------------------------------------------------------------------
 void fbbrowser::quit()
 {
@@ -42,12 +56,14 @@ fbbrowser::fbbrowser(const QUrl & url)
 	//jso->setParent(qwf);
 	QObject::connect(qwf, SIGNAL(javaScriptWindowObjectCleared()),
 					 jso, SLOT(attachToDOM()));
+	QObject::connect(jso, SIGNAL(requestFile(QString&)), this, SLOT(forwardDownloadRequest(QString&)));
+	QObject::connect(this, SIGNAL(updateProgress(int)), jso, SLOT(updateProgress(int)));
 	QObject::connect(jso, SIGNAL(signalQuitAll()), this, SLOT(quit()));
 
 	// Initialize Download Manager.
 	dm = new DownloadManager();
-	QObject::connect(jso, SIGNAL(downloadFile(QUrl&)), dm, SLOT(downloadFile(QUrl&)));
-	QObject::connect(dm, SIGNAL(updateProgress(int)), jso, SLOT(updateProgress(int)));
+	QObject::connect(this, SIGNAL(downloadFile(QUrl&)), dm, SLOT(downloadFile(QUrl&)));
+	QObject::connect(dm, SIGNAL(updateProgress(int)), this, SLOT(forwardUpdateProgress(int)));
 
 	// Remove the window decoration, form to fullscreen, central view?
 	mw->setWindowFlags(Qt::SplashScreen);