diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Messages.sh | 2 | ||||
| -rw-r--r-- | src/bookmarks/bookmarkscontextmenu.cpp | 18 | ||||
| -rw-r--r-- | src/bookmarks/bookmarkstoolbar.cpp | 1 |
4 files changed, 18 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bfd945ad..06176df7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ PROJECT( rekonq ) # Informations to update before to release this package. # rekonq info -SET(REKONQ_VERSION "0.5.60" ) +SET(REKONQ_VERSION "0.5.80" ) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h ) diff --git a/src/Messages.sh b/src/Messages.sh index 86f846c8..ccad97fc 100644 --- a/src/Messages.sh +++ b/src/Messages.sh @@ -1,5 +1,5 @@ #! /bin/sh -$EXTRACTRC *.ui */*ui >> rc.cpp || exit 1 +$EXTRACTRC *.ui */*ui *.rc >> rc.cpp || exit 1 $XGETTEXT *.cpp */*.cpp -o $podir/rekonq.pot rm -f rc.cpp diff --git a/src/bookmarks/bookmarkscontextmenu.cpp b/src/bookmarks/bookmarkscontextmenu.cpp index a473966a..da986fd2 100644 --- a/src/bookmarks/bookmarkscontextmenu.cpp +++ b/src/bookmarks/bookmarkscontextmenu.cpp @@ -69,10 +69,22 @@ void BookmarksContextMenu::addBookmarkActions() void BookmarksContextMenu::addFolderActions() { - if (!bookmark().toGroup().first().isNull()) + KBookmarkGroup group = bookmark().toGroup(); + + if (!group.first().isNull()) { - addAction(bmOwner->action(BookmarkOwner::OPEN_FOLDER)); - addSeparator(); + KBookmark child = group.first(); + + while (child.isGroup() || child.isSeparator()) + { + child = group.next(child); + } + + if (!child.isNull()) + { + addAction(bmOwner->action(BookmarkOwner::OPEN_FOLDER)); + addSeparator(); + } } addAction(bmOwner->action(BookmarkOwner::BOOKMARK_PAGE)); diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp index 20a76be9..68529bd1 100644 --- a/src/bookmarks/bookmarkstoolbar.cpp +++ b/src/bookmarks/bookmarkstoolbar.cpp @@ -124,6 +124,7 @@ void BookmarkMenu::refill() void BookmarkMenu::addOpenFolderInTabs() { + // TODO: Needs to be ported to the new BookmarkOwner API KAction *action; KBookmarkGroup group = manager()->findByAddress(parentAddress()).toGroup(); |