From bd32f05dab4832528e0c2304d722e5140ffd74e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Ander=20Pe=C3=B1alba?= Date: Fri, 15 Oct 2010 21:03:42 +0200 Subject: BookmarkOwner clean-up and minor bug fixed --- src/bookmarks/bookmarkowner.cpp | 61 ++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 40 deletions(-) (limited to 'src/bookmarks/bookmarkowner.cpp') diff --git a/src/bookmarks/bookmarkowner.cpp b/src/bookmarks/bookmarkowner.cpp index 77af9b1f..820e01b5 100644 --- a/src/bookmarks/bookmarkowner.cpp +++ b/src/bookmarks/bookmarkowner.cpp @@ -34,16 +34,14 @@ // Local Includes #include "application.h" #include "bookmarkprovider.h" +#include "mainview.h" #include "mainwindow.h" #include "webtab.h" -#include "mainview.h" // KDE Includes -#include #include #include #include -#include "iconmanager.h" // Qt Includes #include @@ -109,12 +107,6 @@ QString BookmarkOwner::currentUrl() const } -bool BookmarkOwner::supportsTabs() const -{ - return true; -} - - QList< QPair > BookmarkOwner::currentBookmarkList() const { QList< QPair > bkList; @@ -138,13 +130,9 @@ void BookmarkOwner::openBookmark(const KBookmark &bookmark, Qt::KeyboardModifiers keyboardModifiers) { if (keyboardModifiers & Qt::ControlModifier || mouseButtons & Qt::MidButton) - { openBookmarkInNewTab(bookmark); - } else - { openBookmark(bookmark); - } } @@ -171,13 +159,6 @@ void BookmarkOwner::openFolderinTabs(const KBookmarkGroup &bookmark) } -void BookmarkOwner::openBookmarkFolder(const KBookmark &bookmark) -{ - if (bookmark.isGroup()) - openFolderinTabs(bookmark.toGroup()); -} - - void BookmarkOwner::openBookmark(const KBookmark &bookmark) { emit openUrl(bookmark.url(), Rekonq::CurrentTab); @@ -196,9 +177,14 @@ void BookmarkOwner::openBookmarkInNewWindow(const KBookmark &bookmark) } +void BookmarkOwner::openBookmarkFolder(const KBookmarkGroup &bookmark) +{ + openFolderinTabs(bookmark); +} + + KBookmark BookmarkOwner::bookmarkCurrentPage(const KBookmark &bookmark) { - KBookmark newBk; KBookmarkGroup parent; if (!bookmark.isNull()) @@ -207,16 +193,16 @@ KBookmark BookmarkOwner::bookmarkCurrentPage(const KBookmark &bookmark) parent = bookmark.toGroup(); else parent = bookmark.parentGroup(); - - newBk = parent.addBookmark(currentTitle().replace('&', "&&"), KUrl(currentUrl()) ); - parent.moveBookmark(newBk, bookmark); } else { parent = Application::bookmarkProvider()->rootGroup(); - newBk = parent.addBookmark(currentTitle(), KUrl(currentUrl())); } + KBookmark newBk = parent.addBookmark(currentTitle().replace('&', "&&"), KUrl(currentUrl())); + if (!bookmark.isNull()) + parent.moveBookmark(newBk, bookmark); + m_manager->emitChanged(parent); return newBk; } @@ -225,7 +211,7 @@ KBookmark BookmarkOwner::bookmarkCurrentPage(const KBookmark &bookmark) KBookmarkGroup BookmarkOwner::newBookmarkFolder(const KBookmark &bookmark) { KBookmarkGroup newBk; - KBookmarkDialog *dialog = bookmarkDialog(m_manager, QApplication::activeWindow()); + KBookmarkDialog *dialog = bookmarkDialog(m_manager, 0); QString folderName = i18n("New folder"); if (!bookmark.isNull()) @@ -276,7 +262,7 @@ KBookmark BookmarkOwner::newSeparator(const KBookmark &bookmark) newBk = Application::bookmarkProvider()->rootGroup().createNewSeparator(); } - newBk.setIcon(("edit-clear")); + newBk.setIcon("edit-clear"); m_manager->emitChanged(newBk.parentGroup()); return newBk; @@ -298,8 +284,7 @@ void BookmarkOwner::editBookmark(KBookmark bookmark) return; bookmark.setFullText(bookmark.fullText().replace("&&", "&")); - KBookmarkDialog *dialog = bookmarkDialog(m_manager, QApplication::activeWindow()); - + KBookmarkDialog *dialog = bookmarkDialog(m_manager, 0); dialog->editBookmark(bookmark); bookmark.setFullText(bookmark.fullText().replace('&', "&&")); @@ -307,7 +292,7 @@ void BookmarkOwner::editBookmark(KBookmark bookmark) } -bool BookmarkOwner::deleteBookmark(KBookmark bookmark) +bool BookmarkOwner::deleteBookmark(const KBookmark &bookmark) { if (bookmark.isNull()) return false; @@ -333,7 +318,7 @@ bool BookmarkOwner::deleteBookmark(KBookmark bookmark) } if (KMessageBox::warningContinueCancel( - QApplication::activeWindow(), + 0, dialogText, dialogCaption, KStandardGuiItem::del(), @@ -349,9 +334,9 @@ bool BookmarkOwner::deleteBookmark(KBookmark bookmark) } -KAction* BookmarkOwner::createAction(const QString &text, - const QString &icon, const QString &help, const char *slot, - const KBookmark & bookmark) +KAction* BookmarkOwner::createAction(const QString &text, const QString &icon, + const QString &help, const char *slot, + const KBookmark &bookmark) { CustomBookmarkAction *act = new CustomBookmarkAction(bookmark, KIcon(icon), text, this); act->setHelpText(help); @@ -364,16 +349,12 @@ KAction* BookmarkOwner::createAction(const QString &text, CustomBookmarkAction::CustomBookmarkAction(const KBookmark &bookmark, const KIcon &icon, const QString &text, QObject *parent) - : KAction(icon, text, parent) - , m_bookmark(bookmark) + : KAction(icon, text, parent) + , m_bookmark(bookmark) { connect(this, SIGNAL(triggered()), this, SLOT(onActionTriggered())); } -CustomBookmarkAction::~CustomBookmarkAction() -{ -} - void CustomBookmarkAction::onActionTriggered() { emit triggered(m_bookmark); -- cgit v1.2.1 From a385a9c1d6c91c5c3fbf8615934952df985d3c8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Ander=20Pe=C3=B1alba?= Date: Sat, 16 Oct 2010 15:40:17 +0200 Subject: Function renamed --- src/bookmarks/bookmarkowner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/bookmarks/bookmarkowner.cpp') diff --git a/src/bookmarks/bookmarkowner.cpp b/src/bookmarks/bookmarkowner.cpp index 820e01b5..962d1c84 100644 --- a/src/bookmarks/bookmarkowner.cpp +++ b/src/bookmarks/bookmarkowner.cpp @@ -55,7 +55,7 @@ BookmarkOwner::BookmarkOwner(KBookmarkManager *manager, QObject *parent) } -KAction* BookmarkOwner::action(const KBookmark &bookmark, const BookmarkAction &bmAction) +KAction* BookmarkOwner::createAction(const KBookmark &bookmark, const BookmarkAction &bmAction) { switch (bmAction) { -- cgit v1.2.1 From 4323f070444d0d0bcdb96ea1c21e77a921db63e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Ander=20Pe=C3=B1alba?= Date: Sun, 7 Nov 2010 11:33:54 +0100 Subject: Variable renamed --- src/bookmarks/bookmarkowner.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/bookmarks/bookmarkowner.cpp') diff --git a/src/bookmarks/bookmarkowner.cpp b/src/bookmarks/bookmarkowner.cpp index 962d1c84..038a2bba 100644 --- a/src/bookmarks/bookmarkowner.cpp +++ b/src/bookmarks/bookmarkowner.cpp @@ -136,9 +136,9 @@ void BookmarkOwner::openBookmark(const KBookmark &bookmark, } -void BookmarkOwner::openFolderinTabs(const KBookmarkGroup &bookmark) +void BookmarkOwner::openFolderinTabs(const KBookmarkGroup &bkGoup) { - QList urlList = bookmark.groupUrlList(); + QList urlList = bkGoup.groupUrlList(); if (urlList.length() > 8) { -- cgit v1.2.1 From f55423c33944002c16a57c05d5be520c465ed4cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Ander=20Pe=C3=B1alba?= Date: Sun, 7 Nov 2010 11:36:11 +0100 Subject: Bug when a bookmark contains a '&' fixed in some cases --- src/bookmarks/bookmarkowner.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/bookmarks/bookmarkowner.cpp') diff --git a/src/bookmarks/bookmarkowner.cpp b/src/bookmarks/bookmarkowner.cpp index 038a2bba..c684897e 100644 --- a/src/bookmarks/bookmarkowner.cpp +++ b/src/bookmarks/bookmarkowner.cpp @@ -199,7 +199,7 @@ KBookmark BookmarkOwner::bookmarkCurrentPage(const KBookmark &bookmark) parent = Application::bookmarkProvider()->rootGroup(); } - KBookmark newBk = parent.addBookmark(currentTitle().replace('&', "&&"), KUrl(currentUrl())); + KBookmark newBk = parent.addBookmark(currentTitle(), KUrl(currentUrl())); if (!bookmark.isNull()) parent.moveBookmark(newBk, bookmark); @@ -283,10 +283,8 @@ void BookmarkOwner::editBookmark(KBookmark bookmark) if (bookmark.isNull()) return; - bookmark.setFullText(bookmark.fullText().replace("&&", "&")); KBookmarkDialog *dialog = bookmarkDialog(m_manager, 0); dialog->editBookmark(bookmark); - bookmark.setFullText(bookmark.fullText().replace('&', "&&")); delete dialog; } @@ -298,13 +296,12 @@ bool BookmarkOwner::deleteBookmark(const KBookmark &bookmark) return false; KBookmarkGroup bmg = bookmark.parentGroup(); - QString name = QString(bookmark.fullText()).replace("&&", "&"); QString dialogCaption, dialogText; if (bookmark.isGroup()) { dialogCaption = i18n("Bookmark Folder Deletion"); - dialogText = i18n("Are you sure you wish to remove the bookmark folder\n\"%1\"?", name); + dialogText = i18n("Are you sure you wish to remove the bookmark folder\n\"%1\"?", bookmark.fullText()); } else if (bookmark.isSeparator()) { @@ -314,7 +311,7 @@ bool BookmarkOwner::deleteBookmark(const KBookmark &bookmark) else { dialogCaption = i18n("Bookmark Deletion"); - dialogText = i18n("Are you sure you wish to remove the bookmark\n\"%1\"?", name); + dialogText = i18n("Are you sure you wish to remove the bookmark\n\"%1\"?", bookmark.fullText()); } if (KMessageBox::warningContinueCancel( -- cgit v1.2.1