From 339f1fe47ae8f6dcd799a674cdab65693a810d5f Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 28 Apr 2011 00:04:20 +0200 Subject: - A new option to set/unset the current bookmark bar folder in the context menu - Fix drag and drop with a custom folder - Fix a regression which affects BK bar drag and drop (5a53d2bf91dd) Patch by Yoann Laissus, reviewed by me :) --- src/bookmarks/bookmarkscontextmenu.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'src/bookmarks/bookmarkscontextmenu.cpp') diff --git a/src/bookmarks/bookmarkscontextmenu.cpp b/src/bookmarks/bookmarkscontextmenu.cpp index a55f7777..25cb9f24 100644 --- a/src/bookmarks/bookmarkscontextmenu.cpp +++ b/src/bookmarks/bookmarkscontextmenu.cpp @@ -29,6 +29,11 @@ // Local Includes #include "bookmarkowner.h" +#include "bookmarkprovider.h" +#include "application.h" + +// KDE Includes +#include BookmarksContextMenu::BookmarksContextMenu(const KBookmark &bookmark, KBookmarkManager *manager, BookmarkOwner *owner, QWidget *parent) @@ -64,6 +69,15 @@ void BookmarksContextMenu::addFolderActions() { KBookmarkGroup group = bookmark().toGroup(); + if (bookmark().internalElement().attributeNode("toolbar").value() == "yes") + { + addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::UNSET_TOOLBAR_FOLDER)); + } + else + { + addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::SET_TOOLBAR_FOLDER)); + } + if (!group.first().isNull()) { KBookmark child = group.first(); @@ -105,6 +119,11 @@ void BookmarksContextMenu::addSeparatorActions() void BookmarksContextMenu::addNullActions() { + KBookmarkManager *manager = rApp->bookmarkProvider()->bookmarkManager(); + if (manager->toolbar().hasParent()) + { + addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::UNSET_TOOLBAR_FOLDER)); + } addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::BOOKMARK_PAGE)); addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::NEW_FOLDER)); addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::NEW_SEPARATOR)); -- cgit v1.2.1