fixed URL loading from cmdline

3 files changed, 38 insertions, 21 deletions

diff --git a/src/fbgui.cpp b/src/fbgui.cpp
index 4ae9174..04a6f3b 100644
--- a/src/fbgui.cpp
+++ b/src/fbgui.cpp
@@ -5,17 +5,26 @@
 #include <iostream>
 #include <QUrl>
 
-fbgui::fbgui(QApplication *parent)
+void fbgui::setUrl(QUrl& url)
 {
-	// Test if parent is accessible?
-	qDebug() << "Still alive?";
-	qDebug() << "Parent name: " << parent->objectName();
-    /* Create the browser and connect to quit() */
-    fbb = new fbbrowser(QUrl("http://132.230.4.3/webkitTest.html"));
-    QObject::connect(fbb, SIGNAL(killApp()), parent, SLOT(quit()));
-    fbb->show();
+	qDebug() << "Set URL to: " << url.toString();
+	this->_url=url;
+}
+
+void fbgui::start()
+{
+    _fbb = new fbbrowser(_url);
+    QObject::connect(_fbb, SIGNAL(killApp()), this->parent(), SLOT(quit()));
+    _fbb->show();
+}
+
+fbgui::fbgui()
+{
+
+    _fbb = NULL;
+    _url = "";
 }
 fbgui::~fbgui()
 {
-	delete fbb;
+	delete _fbb;
 }
diff --git a/src/fbgui.h b/src/fbgui.h
index 1345812..852ef2a 100644
--- a/src/fbgui.h
+++ b/src/fbgui.h
@@ -10,11 +10,13 @@ class fbgui : public QObject
 	Q_OBJECT
 
 public:
-	fbgui(QApplication *parent);
+	fbgui();
 	~fbgui();
+	void setUrl(QUrl &url);
+	void start();
 
 private:
-	fbbrowser* fbb;
+	fbbrowser* _fbb;
 	QUrl _url;
 
 };
diff --git a/src/main.cpp b/src/main.cpp
index 95981e0..1f4a984 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5,6 +5,7 @@
 #include <iostream>
 #include "fbgui.h"
 
+
 QMap<QString, QString> options;
 void printHelp()
 {
@@ -23,10 +24,14 @@ 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];
+	//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";
@@ -56,9 +61,13 @@ int main(int argc, char *argv[])
 		exit(EXIT_SUCCESS);
 	}
 	//
-	QUrl url;
+
 	if (options.contains("url"))
-		url = options.value("url");
+	{
+		QUrl url = options.value("url");
+		gui->setUrl(url);
+	}
+
 	else
 	{
 		std::cout << "No URL specified. Exiting...";
@@ -66,11 +75,8 @@ int main(int argc, char *argv[])
 	}
 	// TODO: Read INI.
 
+	// Start fbgui.
+    gui->start();
 
-	// Init fbgui
-    fbgui *gui = new fbgui(app);
-    gui->setParent(app);
-    qDebug() << "Obj name: " << gui->parent()->objectName();
-    qDebug() << "Created fbgui...";
     return app->exec();
 }