From 05710490e9e4da45c8c9caaf8a998b851bd99085 Mon Sep 17 00:00:00 2001 From: Yoann Laissus Date: Tue, 17 Aug 2010 12:43:07 +0200 Subject: - Drag and drop in the bookmark toolbar between root items only (for the moment) - Drag accepted from the panel - Move two classes to a separate file Partially fixed : CCBUG: 226479 --- src/bookmarks/bookmarksmanager.h | 74 +--------------------------------------- 1 file changed, 1 insertion(+), 73 deletions(-) (limited to 'src/bookmarks/bookmarksmanager.h') diff --git a/src/bookmarks/bookmarksmanager.h b/src/bookmarks/bookmarksmanager.h index b084b8ee..6f97e4ef 100644 --- a/src/bookmarks/bookmarksmanager.h +++ b/src/bookmarks/bookmarksmanager.h @@ -38,6 +38,7 @@ #include "application.h" #include "urlresolver.h" #include "bookmarkspanel.h" +#include "bookmarkstoolbar.h" // Qt Includes #include @@ -137,79 +138,6 @@ signals: void openUrl(const KUrl &, const Rekonq::OpenType &); }; -// ------------------------------------------------------------------------------ - - -// KDE Includes -#include - -/** - * 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 slots: - void actionHovered(); - -private: - void addOpenFolderInTabs(); - -}; - - -// ------------------------------------------------------------------------------ - -#include - -class BookmarkToolBar : public KToolBar -{ - Q_OBJECT - -public: -BookmarkToolBar(const QString &objectName, - QMainWindow *parentWindow, - Qt::ToolBarArea area, - bool newLine = false, - bool isMainToolBar = false, - bool readConfig = true); -~BookmarkToolBar(); - -virtual void setVisible(bool visible); - -protected: - bool eventFilter(QObject *watched, QEvent *event); - -private slots: - void actionHovered(); - void menuDisplayed(); - void menuHidden(); - void hideMenu(); - -private: - bool m_filled; - KMenu *m_currentMenu; -}; - // ------------------------------------------------------------------------------ -- cgit v1.2.1