summaryrefslogtreecommitdiff
path: root/src/webwindow
diff options
context:
space:
mode:
Diffstat (limited to 'src/webwindow')
-rw-r--r--src/webwindow/rekonqui.rc13
-rw-r--r--src/webwindow/webwindow.cpp10
2 files changed, 13 insertions, 10 deletions
diff --git a/src/webwindow/rekonqui.rc b/src/webwindow/rekonqui.rc
index ea068e56..190111d9 100644
--- a/src/webwindow/rekonqui.rc
+++ b/src/webwindow/rekonqui.rc
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE gui SYSTEM "kpartgui.dtd">
-<gui name="rekonq" version="67">
+<gui name="rekonq" version="68">
<!--- =========== Rekonq Menu ============= -->
<Menu name="rekonqMenu" noMerge="1">
@@ -41,15 +41,8 @@
</Menu>
<Separator/>
- <Menu name="bookmarksMenu" icon="bookmarks" noMerge="1">
- <text>&amp;Bookmarks</text>
- <Action name="bookmark_add" />
- <Separator/>
- <Action name="open_bookmarks_page" />
- <Action name="show_bookmarks_toolbar" />
- <Action name="bookmark_edit" />
- <!-- TODO: would we list all bookmarks, after a separator, here?? -->
- </Menu>
+ <Action name="bookmarksActionMenu" />
+
<Action name="open_history_page" />
<Action name="open_downloads_page" />
<Separator/>
diff --git a/src/webwindow/webwindow.cpp b/src/webwindow/webwindow.cpp
index faf919a7..75636dbd 100644
--- a/src/webwindow/webwindow.cpp
+++ b/src/webwindow/webwindow.cpp
@@ -62,7 +62,9 @@
#include <KToolBar>
#include <KToggleFullScreenAction>
#include <KShortcutsDialog>
+#include <KRun>
+// Qt Includes
#include <QLabel>
#include <QStyle>
#include <QTextDocument>
@@ -303,6 +305,14 @@ void WebWindow::setupActions()
// Edit bookmarks
a = KStandardAction::editBookmarks(BookmarkManager::self(), SLOT(slotEditBookmarks()), actionCollection());
+
+ // Bookmark Menu
+ KActionMenu *bmMenu = BookmarkManager::self()->bookmarkActionMenu(this);
+ bmMenu->setIcon(KIcon("bookmarks"));
+ bmMenu->setDelayed(false);
+ bmMenu->setShortcutConfigurable(true);
+ bmMenu->setShortcut(KShortcut(Qt::ALT + Qt::Key_B));
+ actionCollection()->addAction(QL1S("bookmarksActionMenu"), bmMenu);
// User Agent
a = new KAction(KIcon("preferences-web-browser-identification"), i18n("Browser Identification"), this);