diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2013-02-15 17:18:58 +0100 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2013-02-15 17:18:58 +0100 |
commit | 036bd6c5ac265da394472806039ea42823fc4b89 (patch) | |
tree | 57422f10d5dd092d5db1bed40639eb2770aa1ab6 /src/bookmarks/bookmarkstoolbar.h | |
parent | Get sure rules with not supported filter options are ignored (diff) | |
download | rekonq-036bd6c5ac265da394472806039ea42823fc4b89.tar.xz |
Restores Bookmarks menu (in 2.x fashion)
Cleans up 1.x code about and create a unique bk menu to be shown in
rekonq tools menu, (eventually) in the toolbar and in (an ideal)
menubar
This work starts from Lindsay's review request about. Thanks :)
REVIEW: 108729
Diffstat (limited to 'src/bookmarks/bookmarkstoolbar.h')
-rw-r--r-- | src/bookmarks/bookmarkstoolbar.h | 43 |
1 files changed, 5 insertions, 38 deletions
diff --git a/src/bookmarks/bookmarkstoolbar.h b/src/bookmarks/bookmarkstoolbar.h index bca7864f..104debce 100644 --- a/src/bookmarks/bookmarkstoolbar.h +++ b/src/bookmarks/bookmarkstoolbar.h @@ -2,7 +2,7 @@ * * This file is a part of the rekonq project * -* Copyright (C) 2008-2012 by Andrea Diamantini <adjam7 at gmail dot com> +* Copyright (C) 2008-2013 by Andrea Diamantini <adjam7 at gmail dot com> * Copyright (C) 2010 by Yoann Laissus <yoann dot laissus at gmail dot com> * * @@ -24,6 +24,7 @@ * * ============================================================ */ + #ifndef BOOKMARKSTOOLBAR_H #define BOOKMARKSTOOLBAR_H @@ -32,45 +33,11 @@ #include "rekonq_defines.h" // KDE Includes -#include <KBookmarkMenu> - -/** - * This class represent the rekonq bookmarks menu. - * It's just a simple class inherited from KBookmarkMenu - * - */ -class BookmarkMenu : public KBookmarkMenu -{ - Q_OBJECT - -public: - BookmarkMenu(KBookmarkManager* manager, - KBookmarkOwner* owner, - KMenu* menu, - KActionCollection* actionCollection); - BookmarkMenu(KBookmarkManager *manager, - KBookmarkOwner *owner, - KMenu *parentMenu, - const QString &parentAddress); - ~BookmarkMenu(); - -protected: - virtual KMenu * contextMenu(QAction * act); - virtual void refill(); - virtual QAction* actionForBookmark(const KBookmark &bookmark); - -private: - void addOpenFolderInTabs(); - -}; - - -// ------------------------------------------------------------------------------ - - -// KDE Includes #include <KToolBar> +// Forward Declarations +class KMenu; + /** * This class manage the bookmark toolbar. |