From d6488887ecf69d7f192b94de8dce34fae0b7eb76 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Fri, 30 Nov 2007 19:19:38 +0000 Subject: [PATCH] Hide the "Sort by Rating" and "Sort by Tags" menu entries for KDE 4.0, as currently the performance is too slow. Nepomuk will support caching in future versions, so hopefully we can provide those entries again in KDE 4.1. svn path=/trunk/KDE/kdebase/apps/; revision=743363 --- src/dolphinmainwindow.cpp | 42 ++++++++++++++++++++---------------- src/viewpropertiesdialog.cpp | 11 ++++++---- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 5a7f32797..872042eb2 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -1129,24 +1129,27 @@ void DolphinMainWindow::setupActions() sortByType->setText(i18nc("@action:inmenu Sort By", "Type")); connect(sortByType, SIGNAL(triggered()), this, SLOT(sortByType())); - KToggleAction* sortByRating = actionCollection()->add("sort_by_rating"); - sortByRating->setText(i18nc("@action:inmenu Sort By", "Rating")); - - KToggleAction* sortByTags = actionCollection()->add("sort_by_tags"); - sortByTags->setText(i18nc("@action:inmenu Sort By", "Tags")); - + // TODO: Hided "sort by rating" and "sort by tags" as without caching the performance + // is too slow currently (Nepomuk will support caching in future releases). + // + // KToggleAction* sortByRating = actionCollection()->add("sort_by_rating"); + // sortByRating->setText(i18nc("@action:inmenu Sort By", "Rating")); + // + // KToggleAction* sortByTags = actionCollection()->add("sort_by_tags"); + // sortByTags->setText(i18nc("@action:inmenu Sort By", "Tags")); + // #ifdef HAVE_NEPOMUK - if (MetaDataWidget::metaDataAvailable()) { - connect(sortByRating, SIGNAL(triggered()), this, SLOT(sortByRating())); - connect(sortByTags, SIGNAL(triggered()), this, SLOT(sortByTags())); - } - else { - sortByRating->setEnabled(false); - sortByTags->setEnabled(false); - } + // if (MetaDataWidget::metaDataAvailable()) { + // connect(sortByRating, SIGNAL(triggered()), this, SLOT(sortByRating())); + // connect(sortByTags, SIGNAL(triggered()), this, SLOT(sortByTags())); + // } + // else { + // sortByRating->setEnabled(false); + // sortByTags->setEnabled(false); + // } #else - sortByRating->setEnabled(false); - sortByTags->setEnabled(false); + // sortByRating->setEnabled(false); + // sortByTags->setEnabled(false); #endif QActionGroup* sortGroup = new QActionGroup(this); @@ -1157,8 +1160,11 @@ void DolphinMainWindow::setupActions() sortGroup->addAction(sortByOwner); sortGroup->addAction(sortByGroup); sortGroup->addAction(sortByType); - sortGroup->addAction(sortByRating); - sortGroup->addAction(sortByTags); + + // TODO: Hided "sort by rating" and "sort by tags" as without caching the performance + // is too slow currently (Nepomuk will support caching in future releases). + //sortGroup->addAction(sortByRating); + //sortGroup->addAction(sortByTags); KToggleAction* sortDescending = actionCollection()->add("descending"); sortDescending->setText(i18nc("@action:inmenu Sort", "Descending")); diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp index 05b4a4838..cd4490aad 100644 --- a/src/viewpropertiesdialog.cpp +++ b/src/viewpropertiesdialog.cpp @@ -110,10 +110,13 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Group")); m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Type")); #ifdef HAVE_NEPOMUK - if (!Nepomuk::ResourceManager::instance()->init()) { - m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Rating")); - m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Tags")); - } + // TODO: Hided "sort by rating" and "sort by tags" as without caching the performance + // is too slow currently (Nepomuk will support caching in future releases). + // + // if (!Nepomuk::ResourceManager::instance()->init()) { + // m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Rating")); + // m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Tags")); + // } #endif QHBoxLayout* sortingLayout = new QHBoxLayout(); -- 2.47.3