Merge commit 'refs/merge-requests/173' of git://gitorious.org/rekonq/mainline into m173

1 files changed, 120 insertions, 0 deletions

diff --git a/src/bookmarks/bookmarkstoolbar.h b/src/bookmarks/bookmarkstoolbar.h
new file mode 100644
index 00000000..cf7b62cc
--- /dev/null
+++ b/src/bookmarks/bookmarkstoolbar.h
@@ -0,0 +1,120 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010 by Yoann Laissus <yoann dot laissus at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of
+* the License or (at your option) version 3 or any later version
+* accepted by the membership of KDE e.V. (or its successor approved
+* by the membership of KDE e.V.), which shall act as a proxy
+* defined in Section 14 of version 3 of the license.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* ============================================================ */
+
+#ifndef BOOKMARKSTOOLBAR_H
+#define BOOKMARKSTOOLBAR_H
+
+// Local Includes
+
+
+// Qt Includes
+
+
+// KDE Includes
+#include <KBookmarkMenu>
+#include <KToolBar>
+
+
+
+/**
+ * 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 <KToolBar>
+
+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);
+    void dragEnterEvent(QDragEnterEvent *event);
+    void dragMoveEvent(QDragMoveEvent *event);
+    void dragLeaveEvent(QDragLeaveEvent *event);
+    void dropEvent(QDropEvent *event);
+    void actionEvent(QActionEvent *event);
+
+private slots:
+    void actionHovered();
+    void menuDisplayed();
+    void menuHidden();
+    void hideMenu();
+    void dragDestroyed();
+
+private:
+    void startDrag();
+
+    bool m_filled;
+    KMenu *m_currentMenu;
+    QPoint m_startDragPos;
+    QAction *m_dragAction;
+    QAction *m_dropAction;
+};
+
+#endif // BOOKMARKSTOOLBAR_H