diff options
| author | Bernhard Beschow <bbeschow@cs.tu-berlin.de> | 2009-12-13 23:31:22 +0100 |
|---|---|---|
| committer | Bernhard Beschow <bbeschow@cs.tu-berlin.de> | 2009-12-14 03:10:27 +0100 |
| commit | c12d48542d1c153020e45d90efde078a220067ea (patch) | |
| tree | 42303c55d0d66fd5e940bbcfc1e7d2309b91bed2 /src/webview.cpp | |
| parent | move KWallet integration into WebPage (diff) | |
| download | rekonq-c12d48542d1c153020e45d90efde078a220067ea.tar.xz | |
clean up creation of WebView:
* remove pointer to messageBar in WebView, don't even hand messageBar over to WebView constructor
* add WalletWidget to messageBar outside of WebView constructor
* hide the walletBar, but not the whole messageBar
Diffstat (limited to 'src/webview.cpp')
| -rw-r--r-- | src/webview.cpp | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/src/webview.cpp b/src/webview.cpp index 97ec4984..b4b3cd70 100644 --- a/src/webview.cpp +++ b/src/webview.cpp @@ -38,7 +38,6 @@ #include "mainview.h" #include "webpage.h" #include "bookmarksmanager.h" -#include "walletwidget.h" // KDE Includes #include <KService> @@ -46,7 +45,6 @@ #include <KStandardShortcut> #include <KMenu> #include <KActionMenu> -#include <kwebwallet.h> // Qt Includes #include <QContextMenuEvent> @@ -58,15 +56,14 @@ #include <QLayout> -WebView::WebView(QWidget* parent, QWidget* messageWidget) +WebView::WebView(QWidget* parent) : KWebView(parent, false) , m_page( new WebPage(this) ) - , m_messageWidget(messageWidget) , m_progress(0) , m_mousePos(QPoint(0,0)) { setPage(m_page); - + 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))); @@ -76,32 +73,6 @@ WebView::WebView(QWidget* parent, QWidget* messageWidget) // 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 &))); - - if (messageWidget) - { - WalletWidget *walletBar = new WalletWidget(messageWidget); - messageWidget->layout()->addWidget(walletBar); - // kwallet - KWebWallet *w = m_page->wallet(); - if(w) - { - connect (w, SIGNAL(saveFormDataRequested(const QString &, const QUrl &)), - walletBar, SLOT(onSaveFormData(const QString &, const QUrl &))); - connect(walletBar, SIGNAL(saveFormDataAccepted(const QString &)), - w, SLOT(acceptSaveFormDataRequest(const QString &))); - connect(walletBar, SIGNAL(saveFormDataRejected(const QString &)), - w, SLOT(rejectSaveFormDataRequest(const QString &))); - - connect (w, SIGNAL(saveFormDataRequested(const QString &, const QUrl &)), - messageWidget, SLOT(show())); - connect(walletBar, SIGNAL(saveFormDataAccepted(const QString &)), - messageWidget, SLOT(hide())); - connect(walletBar, SIGNAL(saveFormDataRejected(const QString &)), - messageWidget, SLOT(hide())); - - } - } - } @@ -112,11 +83,6 @@ WebView::~WebView() WebPage *WebView::page() { - if(!m_page) - { - m_page = new WebPage(this); - setPage(m_page); - } return m_page; } |