diff options
| author | Pierre Rossi <pierre.rossi@nokia.com> | 2010-09-14 19:53:17 +0200 |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@nokia.com> | 2010-09-14 23:14:36 +0200 |
| commit | 56c8c25d6a5be302e99de869ea52b1fad763998d (patch) | |
| tree | cf40c99203ed7cd074884e93d57296838df48a0f /src | |
| parent | Upgraded download i18n script to automagically grab translation strings (diff) | |
| download | rekonq-56c8c25d6a5be302e99de869ea52b1fad763998d.tar.xz | |
Wallet/previewbar: adjust the already existing bar's target.
Diffstat (limited to 'src')
| -rw-r--r-- | src/previewselectorbar.h | 2 | ||||
| -rw-r--r-- | src/webtab.cpp | 25 |
2 files changed, 16 insertions, 11 deletions
diff --git a/src/previewselectorbar.h b/src/previewselectorbar.h index 214514db..9f8c78cc 100644 --- a/src/previewselectorbar.h +++ b/src/previewselectorbar.h @@ -45,6 +45,8 @@ public: PreviewSelectorBar(int index, QWidget *parent); ~PreviewSelectorBar(); + inline void setIndex(int index) { m_previewIndex = index; } + private slots: void clicked(); diff --git a/src/webtab.cpp b/src/webtab.cpp index 02c94d32..cce09953 100644 --- a/src/webtab.cpp +++ b/src/webtab.cpp @@ -129,19 +129,20 @@ void WebTab::createWalletBar(const QString &key, const QUrl &url) if (blackList.contains(urlString)) return; + KWebWallet *wallet = page()->wallet(); if(_walletBar.isNull()) { _walletBar = new WalletBar(this); - KWebWallet *wallet = page()->wallet(); _walletBar.data()->onSaveFormData(key, url); qobject_cast<QVBoxLayout *>(layout())->insertWidget(0, _walletBar.data() ); - - connect(_walletBar.data(), SIGNAL(saveFormDataAccepted(const QString &)), - wallet, SLOT(acceptSaveFormDataRequest(const QString &))); - connect(_walletBar.data(), SIGNAL(saveFormDataRejected(const QString &)), - wallet, SLOT(rejectSaveFormDataRequest(const QString &))); } else { + disconnect(wallet); _walletBar.data()->notifyUser(); } + + connect(_walletBar.data(), SIGNAL(saveFormDataAccepted(const QString &)), + wallet, SLOT(acceptSaveFormDataRequest(const QString &)), Qt::UniqueConnection); + connect(_walletBar.data(), SIGNAL(saveFormDataRejected(const QString &)), + wallet, SLOT(rejectSaveFormDataRequest(const QString &)), Qt::UniqueConnection); } @@ -150,14 +151,16 @@ void WebTab::createPreviewSelectorBar(int index) if(_previewSelectorBar.isNull()) { _previewSelectorBar = new PreviewSelectorBar(index, this); qobject_cast<QVBoxLayout *>(layout())->insertWidget(0, _previewSelectorBar.data()); - - connect(page(), SIGNAL(loadStarted()), _previewSelectorBar.data(), SLOT(loadProgress())); - connect(page(), SIGNAL(loadProgress(int)), _previewSelectorBar.data(), SLOT(loadProgress())); - connect(page(), SIGNAL(loadFinished(bool)), _previewSelectorBar.data(), SLOT(loadFinished())); - connect(page()->mainFrame(), SIGNAL(urlChanged(QUrl)), _previewSelectorBar.data(), SLOT(verifyUrl())); } else { + disconnect(_previewSelectorBar.data()); + _previewSelectorBar.data()->setIndex(index); _previewSelectorBar.data()->notifyUser(); } + + connect(page(), SIGNAL(loadStarted()), _previewSelectorBar.data(), SLOT(loadProgress()), Qt::UniqueConnection); + connect(page(), SIGNAL(loadProgress(int)), _previewSelectorBar.data(), SLOT(loadProgress()), Qt::UniqueConnection); + connect(page(), SIGNAL(loadFinished(bool)), _previewSelectorBar.data(), SLOT(loadFinished()), Qt::UniqueConnection); + connect(page()->mainFrame(), SIGNAL(urlChanged(QUrl)), _previewSelectorBar.data(), SLOT(verifyUrl()), Qt::UniqueConnection); } |