diff options
author | Jonatan Pålsson <jonatan.palsson@pelagicore.com> | 2014-02-24 16:41:29 +0100 |
---|---|---|
committer | Jonatan Pålsson <jonatan.palsson@pelagicore.com> | 2014-02-24 16:41:29 +0100 |
commit | 91d66a9f3cd7d902002d2acb8cd25b847408a515 (patch) | |
tree | 0cb7567c56366d0e85b9b39ed65be4264417421d | |
parent | bb3b9154e00560accba508d8381afe777169994a (diff) | |
download | browser-poc-91d66a9f3cd7d902002d2acb8cd25b847408a515.tar.gz |
Now loading start page from config if set
-rw-r--r-- | browser/browserconfig.h | 5 | ||||
-rw-r--r-- | browser/browserview.cpp | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/browser/browserconfig.h b/browser/browserconfig.h index 6653abb..2614af0 100644 --- a/browser/browserconfig.h +++ b/browser/browserconfig.h @@ -21,7 +21,10 @@ class BrowserConfig : public QObject{ Q_OBJECT public: - enum BrowserConfigKey {CONFIG_CACHEPOLICY}; + enum BrowserConfigKey { + CONFIG_CACHEPOLICY, + CONFIG_STARTPAGE + }; static BrowserConfig* instance() { if (!BrowserConfig::m_config) diff --git a/browser/browserview.cpp b/browser/browserview.cpp index 60f57c0..1cc3b19 100644 --- a/browser/browserview.cpp +++ b/browser/browserview.cpp @@ -24,10 +24,12 @@ #include "../common/browserdefs.h" #include "browserpage.h" #include "userinput.h" +#include "browserconfig.h" BrowserView::BrowserView(cachemanager *cm, userinput *uip) : m_cacheManager (cm) { + QString startPage; m_cacheManager = cm; if (!this->scene()) { this->setScene(new QGraphicsScene()); @@ -40,7 +42,11 @@ BrowserView::BrowserView(cachemanager *cm, userinput *uip) m_webview.page()->setNetworkAccessManager(cm->getNetworkAccessManager()); - this->load("http://www.bmw.com"); + startPage = BrowserConfig::instance()->getValue<QString>(BrowserConfig::CONFIG_STARTPAGE); + if (startPage.compare("") == 0) + startPage = "http://www.bmw.com"; + + this->load(startPage); this->installEventFilter(this); @@ -78,6 +84,8 @@ bool BrowserView::load(const QString &a_Url) qDebug() << "No cacheManager present, defaulting to load(url)"; m_webview.load(a_Url); } + + BrowserConfig::instance()->setValue<QString>(BrowserConfig::CONFIG_STARTPAGE, a_Url); return true; } |