From f4d682fe3b5994af0ecdcb5e656ba3f782f59d59 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 2 Oct 2009 00:37:22 +0200 Subject: preferred --> favorites --- src/homepage.cpp | 8 ++++---- src/homepage.h | 2 +- src/mainwindow.cpp | 10 +++++----- src/mainwindow.h | 4 ++-- src/webview.cpp | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/homepage.cpp b/src/homepage.cpp index 58e1e849..e3af4cc2 100644 --- a/src/homepage.cpp +++ b/src/homepage.cpp @@ -81,8 +81,8 @@ QString HomePage::rekonqHomePage(const KUrl &url) speed = fillHistory(); if(url == KUrl("about:bookmarks")) speed = fillBookmarks(); - if(url == KUrl("about:home") || url == KUrl("about:preferred")) - speed = fillPreferred(); + if(url == KUrl("about:home") || url == KUrl("about:favorites")) + speed = fillFavorites(); QString html = QString(QLatin1String(file.readAll())) .arg(imagesPath) @@ -94,7 +94,7 @@ QString HomePage::rekonqHomePage(const KUrl &url) } -QString HomePage::fillPreferred() +QString HomePage::fillFavorites() { QStringList names = ReKonfig::previewNames(); QStringList urls = ReKonfig::previewUrls(); @@ -166,7 +166,7 @@ QString HomePage::homePageMenu() menu += "
  • Last Visited Sites
  • "; menu += "
  • History
  • "; menu += "
  • Bookmarks
  • "; - menu += "
  • Preferred
  • "; + menu += "
  • Favorites
  • "; menu += ""; return menu; } diff --git a/src/homepage.h b/src/homepage.h index c4a7a0e2..af5185c8 100644 --- a/src/homepage.h +++ b/src/homepage.h @@ -51,7 +51,7 @@ public: QString homePageMenu(); private: - QString fillPreferred(); + QString fillFavorites(); QString lastVisitedSites(); QString fillHistory(); QString fillBookmarks(); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 4ac97e3c..b7996a3a 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -363,10 +363,10 @@ void MainWindow::setupActions() bmMenu->setDelayed(false); actionCollection()->addAction(QLatin1String("bookmarksActionMenu"), bmMenu); - // Add to preferred - a = new KAction(KIcon("rating"), i18n("Add to Preferred"), this); - actionCollection()->addAction(QLatin1String("add_to_preferred"), a); - connect(a, SIGNAL(triggered(bool)), this, SLOT(addPreferredLink())); + // Add to favorites + a = new KAction(KIcon("rating"), i18n("Add to Favorites"), this); + actionCollection()->addAction(QLatin1String("add_to_favorites"), a); + connect(a, SIGNAL(triggered(bool)), this, SLOT(addFavoriteLink())); } @@ -1048,7 +1048,7 @@ void MainWindow::slotOpenActionUrl(QAction *action) } -void MainWindow::addPreferredLink() +void MainWindow::addFavoriteLink() { QString name = currentTab()->title(); QString url = currentTab()->url().pathOrUrl(); diff --git a/src/mainwindow.h b/src/mainwindow.h index f1bc6bc8..b8352b4c 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -140,8 +140,8 @@ private slots: void slotAboutToShowBackMenu(); void slotOpenActionUrl(QAction *action); - // add link to the preferred shown in the rekonq homepage - void addPreferredLink(); + // add link to the favorites shown in the rekonq homepage + void addFavoriteLink(); private: MainView *m_view; diff --git a/src/webview.cpp b/src/webview.cpp index 0f92cff4..417da6bc 100644 --- a/src/webview.cpp +++ b/src/webview.cpp @@ -281,7 +281,7 @@ void WebView::contextMenuEvent(QContextMenuEvent *event) menu.addAction(mainwindow->actionByName(KStandardAction::name(KStandardAction::SaveAs))); menu.addAction(mainwindow->actionByName("page_source")); - menu.addAction(mainwindow->actionByName("add_to_preferred")); + menu.addAction(mainwindow->actionByName("add_to_favorites")); QAction *addBookmarkAction = Application::bookmarkProvider()->actionByName("rekonq_add_bookmark"); menu.addAction(addBookmarkAction); -- cgit v1.2.1