diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-09-11 12:11:42 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-09-11 12:11:42 +0200 |
| commit | e8f6b6380347f29e0981c1c92834fbf9b1a98696 (patch) | |
| tree | e0e4760237cfc40fcf9c639cf98d47493a0d2183 /src/mainview.cpp | |
| parent | Fix includes, as pointed out by Krazy (diff) | |
| parent | This commit aims to fix all troubles with favicons retrieving. (diff) | |
| download | rekonq-e8f6b6380347f29e0981c1c92834fbf9b1a98696.tar.xz | |
Merge branch 'iconFixes2'
Diffstat (limited to 'src/mainview.cpp')
| -rw-r--r-- | src/mainview.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mainview.cpp b/src/mainview.cpp index c9f46e5a..f020fb53 100644 --- a/src/mainview.cpp +++ b/src/mainview.cpp @@ -321,6 +321,7 @@ WebTab *MainView::newWebTab(bool focused) connect(tab->view(), SIGNAL(loadFinished(bool)), this, SLOT(webViewLoadFinished(bool))); connect(tab->view(), SIGNAL(titleChanged(const QString &)), this, SLOT(webViewTitleChanged(const QString &))); connect(tab->view(), SIGNAL(urlChanged(const QUrl &)), this, SLOT(webViewUrlChanged(const QUrl &))); + connect(tab->view(), SIGNAL(iconChanged()), this, SLOT(webViewIconChanged())); // connecting webPage signals with mainview connect(tab->view()->page(), SIGNAL(windowCloseRequested()), this, SLOT(windowCloseRequested())); @@ -631,6 +632,7 @@ void MainView::previousTab() setCurrentIndex(next); } + void MainView::openClosedTabs() { foreach (const HistoryItem &item, recentlyClosedTabs()) @@ -640,6 +642,7 @@ void MainView::openClosedTabs() m_recentlyClosedTabs.clear(); } + void MainView::openClosedTab() { KAction *action = qobject_cast<KAction *>(sender()); @@ -654,6 +657,7 @@ void MainView::openClosedTab() } } + void MainView::switchToTab() { // uses the sender to determine the tab index @@ -665,6 +669,7 @@ void MainView::switchToTab() setCurrentIndex( index ); } + QLabel *MainView::animatedLoading(int index, bool addMovie) { if (index == -1) |