diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-08-28 19:24:19 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-08-28 19:24:19 +0200 |
| commit | f0c11eadaa4b77a4e36130b014b62cd6200c8211 (patch) | |
| tree | 556625dc98766a444ea2b916e76446c2cb379357 /src/mainview.cpp | |
| parent | Merge commit 'refs/merge-requests/192' of git://gitorious.org/rekonq/mainline (diff) | |
| download | rekonq-f0c11eadaa4b77a4e36130b014b62cd6200c8211.tar.xz | |
Switching to "KDE" icon cache. While this "brute force" change can be dangerous,
it seems let everything work as expected (at least here).
It also lets us to retrieve icons when sites are not visited (eg: search engines or old bookmarks)
It also contains fixes & improvements for icons management in History & Bookmarks classes.
More code to maintain, but more things working.Let's see what'll happen...
Diffstat (limited to 'src/mainview.cpp')
| -rw-r--r-- | src/mainview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mainview.cpp b/src/mainview.cpp index dc759c9e..75d98b39 100644 --- a/src/mainview.cpp +++ b/src/mainview.cpp @@ -38,6 +38,7 @@ #include "tabbar.h" #include "urlbar.h" #include "sessionmanager.h" +#include "iconmanager.h" // KDE Includes #include <KUrl> @@ -322,7 +323,6 @@ WebTab *MainView::newWebTab(bool focused) // connecting webview with mainview connect(tab->view(), SIGNAL(loadStarted()), this, SLOT(webViewLoadStarted())); connect(tab->view(), SIGNAL(loadFinished(bool)), this, SLOT(webViewLoadFinished(bool))); - connect(tab->view(), SIGNAL(iconChanged()), this, SLOT(webViewIconChanged())); connect(tab->view(), SIGNAL(titleChanged(const QString &)), this, SLOT(webViewTitleChanged(const QString &))); connect(tab->view(), SIGNAL(urlChanged(const QUrl &)), this, SLOT(webViewUrlChanged(const QUrl &))); @@ -576,7 +576,7 @@ void MainView::webViewIconChanged() int index = indexOf(view->parentWidget()); if (-1 != index) { - KIcon icon = Application::icon(view->url()); + KIcon icon = Application::iconManager()->iconForUrl(view->url()); QLabel *label = animatedLoading(index, false); QMovie *movie = label->movie(); delete movie; @@ -725,7 +725,7 @@ void MainView::detachTab(int index, MainWindow *toWindow) w = Application::instance()->newMainWindow(false); else w = toWindow; - w->mainView()->addTab(tab, Application::icon(u), label); + w->mainView()->addTab(tab, Application::iconManager()->iconForUrl(u), label); w->mainView()->widgetBar()->insertWidget(0, bar); w->mainView()->updateTabBar(); } |