diff options
| author | Yoann Laissus <yoann.laissus@gmail.com> | 2011-05-18 08:31:45 +0200 |
|---|---|---|
| committer | Yoann Laissus <yoann.laissus@gmail.com> | 2011-05-18 08:31:45 +0200 |
| commit | a68121bea99215c1cbaff6a5d4f5e624a1942be1 (patch) | |
| tree | ed45548aea5a25072967ee28111b5961bf79145c /src/bookmarks/bookmarkscontextmenu.cpp | |
| parent | connects tabMoved signal of TabBar to tabsChanged signal of MainView, (diff) | |
| parent | Add "comment" bookmark field in the bookmark panel (diff) | |
| download | rekonq-a68121bea99215c1cbaff6a5d4f5e624a1942be1.tar.xz | |
Merge branch 'bkFolder'
Diffstat (limited to 'src/bookmarks/bookmarkscontextmenu.cpp')
| -rw-r--r-- | src/bookmarks/bookmarkscontextmenu.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/bookmarks/bookmarkscontextmenu.cpp b/src/bookmarks/bookmarkscontextmenu.cpp index 25cb9f24..1def2592 100644 --- a/src/bookmarks/bookmarkscontextmenu.cpp +++ b/src/bookmarks/bookmarkscontextmenu.cpp @@ -36,9 +36,10 @@ #include <KBookmarkManager> -BookmarksContextMenu::BookmarksContextMenu(const KBookmark &bookmark, KBookmarkManager *manager, BookmarkOwner *owner, QWidget *parent) +BookmarksContextMenu::BookmarksContextMenu(const KBookmark &bookmark, KBookmarkManager *manager, BookmarkOwner *owner, bool nullForced, QWidget *parent) : KBookmarkContextMenu(bookmark, manager, owner, parent) , m_bmOwner(owner) + , m_nullForced(nullForced) { } @@ -132,17 +133,17 @@ void BookmarksContextMenu::addNullActions() void BookmarksContextMenu::addActions() { - if (bookmark().isGroup()) + if (bookmark().isNull() || m_nullForced) { - addFolderActions(); + addNullActions(); } else if (bookmark().isSeparator()) { addSeparatorActions(); } - else if (bookmark().isNull()) + else if (bookmark().isGroup()) { - addNullActions(); + addFolderActions(); } else { |