diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2012-11-11 09:40:36 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2012-12-10 02:48:06 +0100 |
| commit | 4f1dae7834becb7d7105a0cc9945d9a0c04383b8 (patch) | |
| tree | be823d81fe7ab1cc199b11bc5b32823d3cc9bdf7 /src/bookmarks/bookmarkowner.cpp | |
| parent | Clean up previous commit about adblock and fix enable/disable feature (diff) | |
| download | rekonq-4f1dae7834becb7d7105a0cc9945d9a0c04383b8.tar.xz | |
WARNING: BIG COMMIT
This commit reviews and partially fix the Q/K action mess
in rekonq code.
We now store actions in different actioncollections
(one for each tab && one for each window).
Related to this code review, you can find also fixes for
some triggered actions NOT working (well) before:
- fullscreen
- bookmark all tabs
- new (clean) tab
Diffstat (limited to 'src/bookmarks/bookmarkowner.cpp')
| -rw-r--r-- | src/bookmarks/bookmarkowner.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/bookmarks/bookmarkowner.cpp b/src/bookmarks/bookmarkowner.cpp index aba4ec69..54a34b36 100644 --- a/src/bookmarks/bookmarkowner.cpp +++ b/src/bookmarks/bookmarkowner.cpp @@ -239,12 +239,17 @@ KBookmark BookmarkOwner::bookmarkCurrentPage(const KBookmark &bookmark) } -KBookmarkGroup BookmarkOwner::newBookmarkFolder(const KBookmark &bookmark) +KBookmarkGroup BookmarkOwner::newBookmarkFolder(const KBookmark &bookmark, const QString &name) { KBookmarkGroup newBk; KBookmarkDialog *dialog = bookmarkDialog(m_manager, 0); - QString folderName = i18n("New folder"); + QString folderName; + if (name.isEmpty()) + folderName = i18n("New folder"); + else + folderName = name; + if (!bookmark.isNull()) { if (bookmark.isGroup()) |