From eaa82c1922c7cc133458c65ecbe8eb2ab6adc03d Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 6 Dec 2009 23:36:15 +0100 Subject: KWebWallet integration --- src/webview.cpp | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) (limited to 'src/webview.cpp') diff --git a/src/webview.cpp b/src/webview.cpp index c25b8903..78c4caf8 100644 --- a/src/webview.cpp +++ b/src/webview.cpp @@ -38,6 +38,7 @@ #include "mainview.h" #include "webpage.h" #include "bookmarksmanager.h" +#include "walletwidget.h" // KDE Includes #include @@ -45,6 +46,7 @@ #include #include #include +#include // Qt Includes #include @@ -56,22 +58,36 @@ WebView::WebView(QWidget* parent) - : KWebView(parent, false) - , m_page(new WebPage(this)) - , m_progress(0) - , m_mousePos(QPoint(0,0)) + : KWebView(parent, false) + , m_page( new WebPage(this) ) + , m_walletBar( new WalletWidget(this) ) + , m_progress(0) + , m_mousePos(QPoint(0,0)) { setPage(m_page); - connect(page(), SIGNAL(statusBarMessage(const QString&)), this, SLOT(setStatusBarText(const QString&))); + connect(m_page, SIGNAL(statusBarMessage(const QString&)), this, SLOT(setStatusBarText(const QString&))); connect(this, SIGNAL(loadProgress(int)), this, SLOT(updateProgress(int))); connect(this, SIGNAL(loadFinished(bool)), this, SLOT(loadFinished(bool))); connect(this, SIGNAL(linkMiddleOrCtrlClicked(const KUrl &)), this, SLOT(loadInNewTab(const KUrl &)) ); - connect(this, SIGNAL(linkShiftClicked(const KUrl &)), this, SLOT(downloadRequest(const KUrl &))); - connect(page(), SIGNAL(downloadRequested(const QNetworkRequest &)), this, SLOT(downloadRequest(const QNetworkRequest &r))); + // download system + connect(this, SIGNAL(linkShiftClicked(const KUrl &)), m_page, SLOT(downloadUrl(const KUrl &))); + connect(m_page, SIGNAL(downloadRequested(const QNetworkRequest &)), m_page, SLOT(downloadRequest(const QNetworkRequest &r))); + + // kwallet + KWebWallet *w = m_page->wallet(); + if(w) + { + connect (w, SIGNAL(saveFormDataRequested(const QString &, const QUrl &)), + m_walletBar, SLOT(onSaveFormData(const QString &, const QUrl &))); + connect(m_walletBar, SIGNAL(saveFormDataAccepted(const QString &)), + w, SLOT(acceptSaveFormDataRequest(const QString &))); + connect(m_walletBar, SIGNAL(saveFormDataRejected(const QString &)), + w, SLOT(rejectSaveFormDataRequest(const QString &))); + } } @@ -433,15 +449,9 @@ void WebView::loadInNewTab(const KUrl &url) { Application::instance()->loadUrl(url, Rekonq::NewCurrentTab); } - - -void WebView::downloadRequest(const KUrl &url) -{ - m_page->downloadRequest(QNetworkRequest(url)); -} -void WebView::downloadRequest(const QNetworkRequest &request) +QWidget *WebView::walletBar() { - m_page->downloadRequest(request); + return m_walletBar; } -- cgit v1.2.1