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

1 files changed, 34 insertions, 2 deletions

diff --git a/src/bookmarks/bookmarkspanel.h b/src/bookmarks/bookmarkspanel.h
index f5376d98..ea33e265 100644
--- a/src/bookmarks/bookmarkspanel.h
+++ b/src/bookmarks/bookmarkspanel.h
@@ -31,10 +31,17 @@
 
 // Local Includes
 #include "rekonqprivate_export.h"
+#include "application.h"
+#include "urltreeview.h"
 
 // Qt Includes
 #include <QDockWidget>
 
+// KDE Includes
+#include <KBookmark>
+#include <KActionCollection>
+#include <KMenu>
+
 // Forward Declarations
 class KUrl;
 class QModelIndex;
@@ -49,13 +56,38 @@ public:
     ~BookmarksPanel();
 
 signals:
-    void openUrl(const KUrl &);
+    void openUrl(const KUrl &, const Rekonq::OpenType &);
+    void itemHovered(const QString &);
+    void saveExpFinished(const QString &);
+    void saveRequested();
 
 private slots:
-    void bookmarkActivated( const QModelIndex &index );
+    void contextMenuBk(const QPoint &pos);
+    void contextMenuBkGroup(const QPoint &pos, const bool emptyGroup = false);
+    void contextMenuBlank(const QPoint &pos);
+    void deleteBookmark();
+    void openAll();
+    void editBookmark();
+    void newBookmark();
+    void newBookmarkGroup();
+    void newSeparator();
+    void bookmarkPage();
+    void autoExpand(const QModelIndex &root = QModelIndex());
+    void onCollapse(const QModelIndex &index);
+    void onExpand(const QModelIndex &index);
+    void callAutoExpand();
 
 private:
     void setup();
+    void setupActions();
+    void contextMenuSeparator(const QPoint &pos);
+    KBookmark bookmarkForIndex(const QModelIndex &index);
+
+    UrlTreeView *m_treeView;
+    QStringList m_expList;
+    KActionCollection m_ac;
+    KMenu *menu;
+    bool expandLock;
 };
 
 #endif // BOOKMARKSPANEL_H