From 988c4960aa3ca0e173b62fb8d2c31ef83f55275d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonatan=20P=C3=A5lsson?= Date: Fri, 14 Mar 2014 07:39:51 +0100 Subject: Moved IUserInput and IWebPageWindow instantiations to respective browserview --- browser/browser.cpp | 29 +++++++++++------------------ browser/browser.h | 5 +---- browser/browser.pro | 5 +++++ browser/browserhelper.cpp | 14 +------------- browser/browserview.cpp | 2 +- browser/browserview.h | 2 +- browser/userinput.cpp | 2 -- browser/webpagewindow.cpp | 21 --------------------- 8 files changed, 20 insertions(+), 60 deletions(-) diff --git a/browser/browser.cpp b/browser/browser.cpp index d681d31..701cc68 100644 --- a/browser/browser.cpp +++ b/browser/browser.cpp @@ -19,9 +19,11 @@ #include "browserview.h" #include "userinput.h" #include "networkmanager.h" +#include "iwebpagewindow_adaptor.h" +#include "iuserinput_adaptor.h" -browser::browser(cachemanager *manager, userinput *uip, networkmanager *nm, QObject *parent) : - QObject(parent), m_cacheManager (manager), m_userInput (uip), m_networkManager(nm) +browser::browser(cachemanager *manager, networkmanager *nm, QObject *parent) : + QObject(parent), m_cacheManager (manager), m_networkManager(nm) { qDebug() << __PRETTY_FUNCTION__; } @@ -31,6 +33,12 @@ conn::brw::ERROR_IDS browser::createPageWindow(int a_eDeviceId, const conn::brw: Q_UNUSED(a_eDeviceId); + userinput *m_userInput = new userinput(); + new IUserInputAdaptor(m_userInput); + + webpagewindow *wpw = new webpagewindow(); + new IWebPageWindowAdaptor(wpw); + BrowserView *bvi = new BrowserView(m_cacheManager, m_userInput); bvi->setGeometry(a_oGeometry.i32X, a_oGeometry.i32Y, a_oGeometry.i32Width, @@ -59,7 +67,7 @@ conn::brw::ERROR_IDS browser::createPageWindow(int a_eDeviceId, const conn::brw: connect(bvi, SIGNAL(onContentSizeChanged(uint, uint)),wpw,SIGNAL(onContentSizeChanged(uint,uint))); connect(bvi, SIGNAL(onFaviconReceived()), wpw, SIGNAL(onFaviconReceived())); - connect(m_userInput, SIGNAL(inputText(QString)), this, SLOT(inputText(QString))); + connect(m_userInput, SIGNAL(inputText(QString)), bvi, SLOT(inputText(QString))); connect(bvi, SIGNAL(onSelect(const QString &, const conn::brw::SelectableOptionList &, bool)), m_userInput, SIGNAL(onSelect(const QString &, const conn::brw::SelectableOptionList &, bool))); connect(m_userInput, SIGNAL(selectIndexes(QList)), bvi, SLOT(onSelectIndexes(QList))); @@ -87,21 +95,6 @@ conn::brw::ERROR_IDS browser::createPageWindow(int a_eDeviceId, const conn::brw: return conn::brw::EID_NO_ERROR; } -void browser::setView(QString viewpath) { - qDebug() << __PRETTY_FUNCTION__ << viewpath; - - if(viewpath.contains("/IUserInput")) - wpw->webitem = webviewhash.value(viewpath.remove("/IUserInput")); - else - wpw->webitem = webviewhash.value(viewpath); -} - -void browser::inputText(QString input) { - qDebug() << __PRETTY_FUNCTION__ << input; - - wpw->webitem->inputText(input); -} - conn::brw::ERROR_IDS browser::destroyPageWindow(conn::brw::OBJECT_HANDLE a_hPageWindowHandle) { qDebug() << __PRETTY_FUNCTION__ << a_hPageWindowHandle; diff --git a/browser/browser.h b/browser/browser.h index 625dc34..5f70954 100644 --- a/browser/browser.h +++ b/browser/browser.h @@ -29,7 +29,7 @@ class browser : public QObject, protected QDBusContext { Q_OBJECT public: - explicit browser(cachemanager *, userinput *, networkmanager *, QObject *parent = 0); + explicit browser(cachemanager *, networkmanager *, QObject *parent = 0); webpagewindow *wpw; @@ -43,9 +43,6 @@ public Q_SLOTS: conn::brw::ERROR_IDS destroyPageWindow(qlonglong a_hPageWindowHandle); conn::brw::ERROR_IDS getPageWindows(conn::brw::ObjectHandleList &a_oPageWindowIds); - void inputText(QString input); - void setView(QString viewpath); - private: QHash windowhash; QHash webviewhash; diff --git a/browser/browser.pro b/browser/browser.pro index 6f68f31..0451cf3 100644 --- a/browser/browser.pro +++ b/browser/browser.pro @@ -85,3 +85,8 @@ system("$$[QT_INSTALL_PREFIX]/bin/qdbusxml2cpp -i networkmanager.h\ -l networkmanager\ -a inetworkmanager_adaptor\ ../common/INetworkManager.xml") + +system("$$[QT_INSTALL_PREFIX]/bin/qdbusxml2cpp -i webpagewindow.h\ + -l webpagewindow\ + -a iwebpagewindow_adaptor\ + ../common/IWebPageWindow.xml") diff --git a/browser/browserhelper.cpp b/browser/browserhelper.cpp index ed97e63..ce65614 100644 --- a/browser/browserhelper.cpp +++ b/browser/browserhelper.cpp @@ -15,8 +15,6 @@ #include "browserhelper.h" #include "ibookmarkmanager_adaptor.h" -#include "iuserinput_adaptor.h" -#include "iwebpagewindow_adaptor.h" #include "ibrowser_adaptor.h" #include "icachemanager_adaptor.h" #include "ierrorlogger_adaptor.h" @@ -49,9 +47,6 @@ browserhelper::browserhelper(QString instanceId, QObject *parent) : exit(1); } - userinput *ui = new userinput(); - new IUserInputAdaptor(ui); - cachemanager *cm = new cachemanager(); new ICacheManagerAdaptor(cm); if(!connection->registerObject("/Browser/ICacheManager", cm)) { @@ -66,7 +61,7 @@ browserhelper::browserhelper(QString instanceId, QObject *parent) : exit(1); } - browser *br = new browser(cm, ui, nm); + browser *br = new browser(cm, nm); new IBrowserAdaptor(br); if(!connection->registerObject("/Browser/IBrowser", br)) { qDebug() << "failed register object IBrowser"; @@ -79,13 +74,6 @@ browserhelper::browserhelper(QString instanceId, QObject *parent) : qDebug() << "failed register object IBookmarkManager"; exit(1); } - - wpw = new webpagewindow(); - new IWebPageWindowAdaptor(wpw); - br->wpw = wpw; - - connect(wpw, SIGNAL(setOutputWebview(QString)), br, SLOT(setView(QString))); - connect(ui, SIGNAL(setOutputWebview(QString)), br, SLOT(setView(QString))); } void browserhelper::registertypes() { diff --git a/browser/browserview.cpp b/browser/browserview.cpp index 54b1365..1e2263d 100644 --- a/browser/browserview.cpp +++ b/browser/browserview.cpp @@ -75,7 +75,6 @@ BrowserView::BrowserView(cachemanager *cm, userinput *uip) this, SIGNAL (onInputText(QString, QString, int, int, int, int, int))); connect(&m_inputHandler, SIGNAL(onScroll(uint,uint)), this, SLOT(scrollPositionChanged(uint,uint))); connect(&m_inputHandler, SIGNAL(onSelect(const QString &, const conn::brw::SelectableOptionList &, bool)), this, SIGNAL(onSelect(const QString &, const conn::brw::SelectableOptionList &, bool))); - } bool BrowserView::load(const QString &a_Url) @@ -181,6 +180,7 @@ void BrowserView::scroll (conn::brw::SCROLL_DIRECTION dir, conn::brw::SCROLL_TYP void BrowserView::inputText (QString input) { QString entryStr = "window.document.activeElement.value = '" + input + "';"; + qDebug() << "About to input:" << input; m_webview.page()->mainFrame()->evaluateJavaScript(entryStr); } diff --git a/browser/browserview.h b/browser/browserview.h index 9773fcc..b142798 100644 --- a/browser/browserview.h +++ b/browser/browserview.h @@ -101,7 +101,6 @@ public: void pageReload() { m_webview.reload(); } void pageStop() { m_webview.stop(); } void scroll (conn::brw::SCROLL_DIRECTION dir, conn::brw::SCROLL_TYPE type); - void inputText (QString input); QSize contentSize(); void setZoomFactor(double); double getZoomFactor(); @@ -145,6 +144,7 @@ protected slots: void scrollPositionChanged(uint x, uint y); void contentSizeChanged(const QSize&); void onSelectIndexes(QList); + void inputText (QString input); private: QGraphicsWebView m_webview; diff --git a/browser/userinput.cpp b/browser/userinput.cpp index 33f8f0d..3c419c7 100644 --- a/browser/userinput.cpp +++ b/browser/userinput.cpp @@ -24,8 +24,6 @@ userinput::userinput(QObject *parent) : conn::brw::ERROR_IDS userinput::inputText(conn::brw::DIALOG_RESULT a_eResult, const QString &a_strInputValue) { qDebug() << __PRETTY_FUNCTION__ << a_eResult << a_strInputValue; - emit setOutputWebview(message().path()); - if(a_eResult == conn::brw::DR_OK) { emit inputText(a_strInputValue); diff --git a/browser/webpagewindow.cpp b/browser/webpagewindow.cpp index 1c5726e..2c0c700 100644 --- a/browser/webpagewindow.cpp +++ b/browser/webpagewindow.cpp @@ -67,8 +67,6 @@ conn::brw::ERROR_IDS webpagewindow::getPageIcon(QString iconPath, QString &iconF conn::brw::ERROR_IDS webpagewindow::back() { qDebug() << __PRETTY_FUNCTION__; - emit setOutputWebview(message().path()); - webitem->goBack(); return conn::brw::EID_NO_ERROR; } @@ -76,8 +74,6 @@ conn::brw::ERROR_IDS webpagewindow::back() { conn::brw::ERROR_IDS webpagewindow::forward() { qDebug() << __PRETTY_FUNCTION__; - emit setOutputWebview(message().path()); - webitem->goForward(); return conn::brw::EID_NO_ERROR; } @@ -89,8 +85,6 @@ conn::brw::ERROR_IDS webpagewindow::load(const QString &a_Url) { if(a_Url == "" || a_Url == "http://") return conn::brw::EID_INVALID_ARGUMENT; - emit setOutputWebview(message().path()); - bool ret = webitem->load(a_Url); if(ret) return conn::brw::EID_NO_ERROR; @@ -101,8 +95,6 @@ conn::brw::ERROR_IDS webpagewindow::load(const QString &a_Url) { conn::brw::ERROR_IDS webpagewindow::reload() { qDebug() << __PRETTY_FUNCTION__; - emit setOutputWebview(message().path()); - webitem->pageReload(); return conn::brw::EID_NO_ERROR; } @@ -135,7 +127,6 @@ conn::brw::ERROR_IDS webpagewindow::getBrowserActionsState(conn::brw::BrowserAct conn::brw::ERROR_IDS webpagewindow::getContentSize(uint &a_u32Width, uint &a_u32Height) { qDebug() << __PRETTY_FUNCTION__; - emit setOutputWebview(message().path()); QSize contentSize = webitem->contentSize(); a_u32Width = contentSize.width(); @@ -147,8 +138,6 @@ conn::brw::ERROR_IDS webpagewindow::getContentSize(uint &a_u32Width, uint &a_u32 conn::brw::ERROR_IDS webpagewindow::getGeometry(conn::brw::Rect &a_sRect) { qDebug() << __PRETTY_FUNCTION__; - emit setOutputWebview(message().path()); - QRect rect = webitem->geometry(); a_sRect.i32X = rect.x(); a_sRect.i32Y = rect.y(); @@ -161,8 +150,6 @@ conn::brw::ERROR_IDS webpagewindow::getGeometry(conn::brw::Rect &a_sRect) { conn::brw::ERROR_IDS webpagewindow::setGeometry(const conn::brw::Rect & a_sRect) { qDebug() << __PRETTY_FUNCTION__; - emit setOutputWebview(message().path()); - webitem->setGeometry(a_sRect.i32X, a_sRect.i32Y, a_sRect.i32Width, a_sRect.i32Height); @@ -172,8 +159,6 @@ conn::brw::ERROR_IDS webpagewindow::setGeometry(const conn::brw::Rect & a_sRect) conn::brw::ERROR_IDS webpagewindow::scroll(conn::brw::SCROLL_DIRECTION a_eScrollDirection, conn::brw::SCROLL_TYPE a_eScrollType) { qDebug() << __PRETTY_FUNCTION__; - emit setOutputWebview(message().path()); - webitem->scroll(a_eScrollDirection, a_eScrollType); return conn::brw::EID_NO_ERROR; } @@ -181,16 +166,12 @@ conn::brw::ERROR_IDS webpagewindow::scroll(conn::brw::SCROLL_DIRECTION a_eScroll bool webpagewindow::getVisible() { qDebug() << __PRETTY_FUNCTION__; - emit setOutputWebview(message().path()); - return webitem->property("visible").toBool(); } conn::brw::ERROR_IDS webpagewindow::setVisible(bool a_bVisible) { qDebug() << __PRETTY_FUNCTION__ << a_bVisible; - emit setOutputWebview(message().path()); - webitem->setProperty("visible", a_bVisible); return conn::brw::EID_NO_ERROR; } @@ -198,8 +179,6 @@ conn::brw::ERROR_IDS webpagewindow::setVisible(bool a_bVisible) { conn::brw::ERROR_IDS webpagewindow::stop() { qDebug() << __PRETTY_FUNCTION__; - emit setOutputWebview(message().path()); - webitem->pageStop(); return conn::brw::EID_NO_ERROR; } -- cgit v1.2.1