- The bookmark toolbar is now a real toolbar, not an action.

It fixes the problem of the submenu if there are too much items to fit on the bar
- Improve a bit the new redesign of BookmarkOwner
- Reenable the bookmark menu by default (because the icon in the bar is on the left)

1 files changed, 14 insertions, 14 deletions

diff --git a/src/bookmarks/bookmarkowner.h b/src/bookmarks/bookmarkowner.h
index abb65c36..e0c2a8ad 100644
--- a/src/bookmarks/bookmarkowner.h
+++ b/src/bookmarks/bookmarkowner.h
@@ -119,24 +119,24 @@ signals:
     void openUrl(const KUrl &, const Rekonq::OpenType &);
 
 public slots:
-    void bookmarkSelected(const KBookmark &bookmark);
-
-    void openBookmark();
-    void openBookmarkInNewTab();
-    void openBookmarkInNewWindow();
-    void openBookmarkFolder();
-    void bookmarkCurrentPage();
-    void newBookmarkFolder();
-    void newSeparator();
-    void copyLink();
-    void editBookmark();
-    bool deleteBookmark();
+    void setCurrentBookmark(const KBookmark &bookmark);
+
+    void openBookmark(const KBookmark &bookmark = KBookmark());
+    void openBookmarkInNewTab(const KBookmark &bookmark = KBookmark());
+    void openBookmarkInNewWindow(const KBookmark &bookmark = KBookmark());
+    void openBookmarkFolder(const KBookmark &bookmark = KBookmark());
+    void bookmarkCurrentPage(const KBookmark &bookmark = KBookmark());
+    void newBookmarkFolder(const KBookmark &bookmark = KBookmark());
+    void newSeparator(const KBookmark &bookmark = KBookmark());
+    void copyLink(const KBookmark &bookmark = KBookmark());
+    void editBookmark(KBookmark bookmark = KBookmark());
+    bool deleteBookmark(KBookmark bookmark = KBookmark());
 
 private:
     KBookmarkManager *m_manager;
 
-    QVector<KAction*> actions;
-    KBookmark selected;
+    QVector<KAction*> m_actions;
+    KBookmark m_currentBookmark;
 
     void setupActions();
     void createAction(const BookmarkAction &action,