baseUrl is now global variable

5 files changed, 40 insertions, 32 deletions

diff --git a/src/fbbrowser.cpp b/src/fbbrowser.cpp
index 6833119..527ef65 100644
--- a/src/fbbrowser.cpp
+++ b/src/fbbrowser.cpp
@@ -49,22 +49,22 @@ void fbbrowser::quit()
 	emit killApp();
 }
 // -------------------------------------------------------------------------------------------
-fbbrowser::fbbrowser(const QUrl & url)
+fbbrowser::fbbrowser()
 {
+	// Initialise Browser Window.
 	mw = new QMainWindow(this);
 	view = new QWebView(mw);
- 	baseUrl = url;
-	// Create QNetworkAccessManager which is needed to send/receive requests.
+
+	// Prepare loading of baseUrl.
+	// Maybe possible to let DM take care of these steps?
 	manager = new QNetworkAccessManager(this);
-	// Create a QNetworkRequest object and set its URL.
-	request.setUrl(url);
-	// Let the manager send the request and receive the reply.
+	request.setUrl(baseUrl);
     reply = manager->get(request);
 	// TODO: error differentiation
 	if(reply->error() == QNetworkReply::NoError)
 	{
-		qDebug() << "Loading: " << url.toString();
-		view->load(url);
+		qDebug() << "Loading: " << baseUrl.toString();
+		view->load(baseUrl);
 	}
 	else 
 	{
diff --git a/src/fbbrowser.h b/src/fbbrowser.h
index e54c38c..7def71f 100644
--- a/src/fbbrowser.h
+++ b/src/fbbrowser.h
@@ -8,6 +8,8 @@
 #include "JSObject.h"
 #include "DownloadManager.h"
 
+extern QUrl baseUrl;
+
 class QWebView;
 class QWebFrame;
 class JSObject;
@@ -18,7 +20,7 @@ class fbbrowser : public QWidget
     Q_OBJECT
 
 public:
-    fbbrowser(const QUrl& url);
+    fbbrowser();
     ~fbbrowser();
 
 private:
@@ -26,7 +28,6 @@ private:
     QWebView *view;
     QWebFrame* qwf;
 
-    QUrl baseUrl;
     QNetworkRequest request;
     QNetworkReply *reply;
     QNetworkAccessManager *manager;
diff --git a/src/fbgui.cpp b/src/fbgui.cpp
index 25bec8c..2303844 100644
--- a/src/fbgui.cpp
+++ b/src/fbgui.cpp
@@ -3,22 +3,32 @@
 
 #include <iostream>
 #include <QUrl>
+#include <QMap>
 
-void fbgui::setUrl(QUrl& url)
+QUrl baseUrl;
+
+// Function not yet used, depends how settings will be loaded.
+void fbgui::setOption(QString key, QString value)
 {
-	this->_url=url;
+	if (!_options.contains(key))
+		_options.insert(key, value);
+	else
+	{
+		// temp, find a better way for this
+		_options.remove(key);
+		_options.insert(key, value);
+	}
 }
 
 void fbgui::startBrowser()
 {
-    _fbb = new fbbrowser(_url);
-    QObject::connect(_fbb, SIGNAL(killApp()), this->parent(), SLOT(quit()));
+	_fbb = new fbbrowser();
+	QObject::connect(_fbb, SIGNAL(killApp()), this->parent(), SLOT(quit()));
 }
 
 fbgui::fbgui()
 {
-    _fbb = NULL;
-    _url = "";
+	_fbb = NULL;
 }
 fbgui::~fbgui()
 {
diff --git a/src/fbgui.h b/src/fbgui.h
index ab0d4b1..49f66a0 100644
--- a/src/fbgui.h
+++ b/src/fbgui.h
@@ -2,8 +2,8 @@
 #define FBGUI_H
 
 #include <QtCore>
+#include "fbbrowser.h"
 
-class fbbrowser;
 class fbgui : public QObject
 {
 	Q_OBJECT
@@ -11,12 +11,14 @@ class fbgui : public QObject
 public:
 	fbgui();
 	~fbgui();
-	void setUrl(QUrl &url);
+	void setOption(QString key, QString value);
 	void startBrowser();
 
+
 private:
+	QMap<QString, QString> _options;
+	// stuff
 	fbbrowser* _fbb;
-	QUrl _url;
 
 };
 
diff --git a/src/main.cpp b/src/main.cpp
index f8c0880..4172d79 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,12 +1,16 @@
 #include <QApplication>
+#include <QSettings>
 #include <QtCore>
 #include <getopt.h>
 #include <cstdlib>
 #include <iostream>
 #include "fbgui.h"
 
+extern QUrl baseUrl;
 
+// temporary settings testing stuff
 QMap<QString, QString> options;
+
 void printHelp()
 {
     // Prints usage information.
@@ -24,16 +28,8 @@ int main(int argc, char *argv[])
     app->setApplicationName("fbgui");
     app->setObjectName("test");
 
-	// Initialise fbgui
-    fbgui *gui = new fbgui();
-    gui->setParent(app);
 
     /* Parse cmdline argus. */
-
-	//qDebug() << "Received " << argc << "arguments:";
-	//for (int i = 0; i < argc; i++)
-	//	qDebug() << i + 1 << ": " << argv[i];
-
 	int longIndex = 0;
 	static const char *optString = "u:h";
 	static const struct option longOpts[] =
@@ -64,11 +60,8 @@ int main(int argc, char *argv[])
 	//
 
 	if (options.contains("url"))
-	{
-		QUrl url = options.value("url");
-		gui->setUrl(url);
-	}
-
+		// TODO: also check in conf before settings this.
+		baseUrl = options.value("url");
 	else
 	{
 		std::cout << "No URL specified. Exiting...";
@@ -77,6 +70,8 @@ int main(int argc, char *argv[])
 	// TODO: Read INI.
 
 	// Start fbgui.
+    fbgui *gui = new fbgui();
+    gui->setParent(app);
     gui->startBrowser();
 
     return app->exec();