diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2011-04-28 00:04:20 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2011-04-28 00:04:20 +0200 |
commit | 339f1fe47ae8f6dcd799a674cdab65693a810d5f (patch) | |
tree | aac7c2cbae17b06f87d419022ae918b85d3a5c27 /src/bookmarks/bookmarkscontextmenu.cpp | |
parent | Letting rekonq URL popup behaves as Chrome's and Firefox4 ones (diff) | |
download | rekonq-339f1fe47ae8f6dcd799a674cdab65693a810d5f.tar.xz |
- 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 :)
Diffstat (limited to 'src/bookmarks/bookmarkscontextmenu.cpp')
-rw-r--r-- | src/bookmarks/bookmarkscontextmenu.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
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 <KBookmarkManager> 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)); |