diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2009-07-29 00:22:14 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2009-07-29 00:22:14 +0200 |
commit | d64b60a884452202d8d7dd5e4a13fcdcedbb6265 (patch) | |
tree | a1e04a251645179b11fdde71f5a1ecf70e906b18 /src/mainview.cpp | |
parent | Merge branch 'PrivateColor' (diff) | |
download | rekonq-d64b60a884452202d8d7dd5e4a13fcdcedbb6265.tar.xz |
Simplifying a bit web load progress process structure
Diffstat (limited to 'src/mainview.cpp')
-rw-r--r-- | src/mainview.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/mainview.cpp b/src/mainview.cpp index bc33c1c0..2382210b 100644 --- a/src/mainview.cpp +++ b/src/mainview.cpp @@ -305,20 +305,15 @@ void MainView::slotCurrentChanged(int index) this, SIGNAL(showStatusBarMessage(const QString&))); disconnect(oldWebView->page(), SIGNAL(linkHovered(const QString&, const QString&, const QString&)), this, SIGNAL(linkHovered(const QString&))); - disconnect(oldWebView, SIGNAL(loadProgress(int)), - this, SIGNAL(loadProgress(int))); } connect(webView->page(), SIGNAL(statusBarMessage(const QString&)), this, SIGNAL(showStatusBarMessage(const QString&))); connect(webView->page(), SIGNAL(linkHovered(const QString&, const QString&, const QString&)), this, SIGNAL(linkHovered(const QString&))); - connect(webView, SIGNAL(loadProgress(int)), - this, SIGNAL(loadProgress(int))); emit setCurrentTitle(webView->title()); m_urlBars->setCurrentIndex(index); - emit loadProgress(webView->progress()); emit showStatusBarMessage(webView->lastStatusBarText()); // set focus to the current webview @@ -531,6 +526,8 @@ void MainView::webViewLoadStarted() } } + emit browserLoading(true); + if (index != currentIndex()) return; @@ -552,13 +549,14 @@ void MainView::webViewLoadFinished(bool ok) } webViewIconChanged(); - + emit browserLoading(false); + // don't display messages for background tabs if (index != currentIndex()) { return; } - + if (ok) emit showStatusBarMessage(i18n("Done"), Rekonq::Success); else |