From 8830c32f2c4aea542003f71e14a43c712e2d91e0 Mon Sep 17 00:00:00 2001 From: Yoann Laissus Date: Thu, 2 Sep 2010 12:20:21 +0200 Subject: A little bunch of fixes : - Bookmarks saved with KMimeType::iconNameForUrl are now correctly displayed in the BK bar - Folder icons in the BK panel are fixed - Unset the current bookmark after a context menu deletition to avoid some bugs - Cleanup --- src/bookmarks/bookmarkstoolbar.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/bookmarks/bookmarkstoolbar.cpp') diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp index ddb70a65..26b9de39 100644 --- a/src/bookmarks/bookmarkstoolbar.cpp +++ b/src/bookmarks/bookmarkstoolbar.cpp @@ -30,6 +30,7 @@ #include "bookmarkstoolbar.moc" // Local Includes +#include "iconmanager.h" #include "bookmarkscontextmenu.h" #include "mainwindow.h" #include "application.h" @@ -66,7 +67,6 @@ BookmarkMenu::~BookmarkMenu() KMenu * BookmarkMenu::contextMenu(QAction *act) { - KBookmarkActionInterface* action = dynamic_cast(act); if (!action) return 0; @@ -91,6 +91,7 @@ QAction * BookmarkMenu::actionForBookmark(const KBookmark &bookmark) else { KBookmarkAction *action = new KBookmarkAction(bookmark, owner(), this); + action->setIcon(KIcon(Application::iconManager()->iconForUrl(bookmark.url()))); connect(action, SIGNAL(hovered()), this, SLOT(actionHovered())); return action; } -- cgit v1.2.1 From 5ae9ab782ec2a0d98c02c05b67b4198ce3c3e654 Mon Sep 17 00:00:00 2001 From: Yoann Laissus Date: Thu, 2 Sep 2010 12:42:34 +0200 Subject: Oops, fix compilation --- src/bookmarks/bookmarkstoolbar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/bookmarks/bookmarkstoolbar.cpp') diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp index 26b9de39..77bff7e6 100644 --- a/src/bookmarks/bookmarkstoolbar.cpp +++ b/src/bookmarks/bookmarkstoolbar.cpp @@ -91,7 +91,7 @@ QAction * BookmarkMenu::actionForBookmark(const KBookmark &bookmark) else { KBookmarkAction *action = new KBookmarkAction(bookmark, owner(), this); - action->setIcon(KIcon(Application::iconManager()->iconForUrl(bookmark.url()))); + action->setIcon(Application::iconManager()->iconForUrl(bookmark.url())); connect(action, SIGNAL(hovered()), this, SLOT(actionHovered())); return action; } -- cgit v1.2.1