diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2013-02-15 17:18:58 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2013-02-15 17:18:58 +0100 |
| commit | 036bd6c5ac265da394472806039ea42823fc4b89 (patch) | |
| tree | 57422f10d5dd092d5db1bed40639eb2770aa1ab6 /src/webwindow | |
| parent | Get sure rules with not supported filter options are ignored (diff) | |
| download | rekonq-036bd6c5ac265da394472806039ea42823fc4b89.tar.xz | |
Restores Bookmarks menu (in 2.x fashion)
Cleans up 1.x code about and create a unique bk menu to be shown in
rekonq tools menu, (eventually) in the toolbar and in (an ideal)
menubar
This work starts from Lindsay's review request about. Thanks :)
REVIEW: 108729
Diffstat (limited to 'src/webwindow')
| -rw-r--r-- | src/webwindow/rekonqui.rc | 13 | ||||
| -rw-r--r-- | src/webwindow/webwindow.cpp | 10 |
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>&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); |