diff options
author | Yoann Laissus <yoann.laissus@gmail.com> | 2010-12-20 20:48:18 +0100 |
---|---|---|
committer | Yoann Laissus <yoann.laissus@gmail.com> | 2010-12-20 20:51:10 +0100 |
commit | 03c624f2b2e718ca6164402d55b5dca8c3a819dd (patch) | |
tree | 426bdbdacdbb79ba59b983cccad74af2cffccabd /src/bookmarks/bookmarkprovider.cpp | |
parent | Ctrl+Shift+P shortcut for Private browsing (diff) | |
download | rekonq-03c624f2b2e718ca6164402d55b5dca8c3a819dd.tar.xz |
- Bookmark folders can now be dragged and dropped in the toolbar.
- Drop a bookmark folder in the WebView no longer crash rekonq but open this folder in new tabs
- Fix some crash when a single bookmark is dropped in the WebView (incorrect URL)
- Port the drag icon to IconManager
CCBUG: 226479
Diffstat (limited to 'src/bookmarks/bookmarkprovider.cpp')
-rw-r--r-- | src/bookmarks/bookmarkprovider.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/bookmarks/bookmarkprovider.cpp b/src/bookmarks/bookmarkprovider.cpp index fe038b2a..2a9dbe2e 100644 --- a/src/bookmarks/bookmarkprovider.cpp +++ b/src/bookmarks/bookmarkprovider.cpp @@ -231,6 +231,7 @@ void BookmarkProvider::fillBookmarkBar(BookmarkToolBar *toolBar) connect(menuAction->menu(), SIGNAL(aboutToHide()), toolBar, SLOT(menuHidden())); toolBar->toolBar()->addAction(menuAction); + toolBar->toolBar()->widgetForAction(menuAction)->installEventFilter(toolBar); } else if (bookmark.isSeparator()) { @@ -239,8 +240,6 @@ void BookmarkProvider::fillBookmarkBar(BookmarkToolBar *toolBar) else { KBookmarkAction *action = new KBookmarkAction(bookmark, m_owner, this); - //action->s - //action->setIconText(action->iconText().replace('&', "&&&")); action->setIcon(Application::iconManager()->iconForUrl( KUrl(bookmark.url()) )); connect(action, SIGNAL(hovered()), toolBar, SLOT(actionHovered())); toolBar->toolBar()->addAction(action); |