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
This commit is contained in:
Peter Penz 2007-11-30 19:19:38 +00:00
parent 0e6e4bf391
commit d6488887ec
2 changed files with 31 additions and 22 deletions

View file

@ -1129,24 +1129,27 @@ void DolphinMainWindow::setupActions()
sortByType->setText(i18nc("@action:inmenu Sort By", "Type")); sortByType->setText(i18nc("@action:inmenu Sort By", "Type"));
connect(sortByType, SIGNAL(triggered()), this, SLOT(sortByType())); connect(sortByType, SIGNAL(triggered()), this, SLOT(sortByType()));
KToggleAction* sortByRating = actionCollection()->add<KToggleAction>("sort_by_rating"); // TODO: Hided "sort by rating" and "sort by tags" as without caching the performance
sortByRating->setText(i18nc("@action:inmenu Sort By", "Rating")); // is too slow currently (Nepomuk will support caching in future releases).
//
KToggleAction* sortByTags = actionCollection()->add<KToggleAction>("sort_by_tags"); // KToggleAction* sortByRating = actionCollection()->add<KToggleAction>("sort_by_rating");
sortByTags->setText(i18nc("@action:inmenu Sort By", "Tags")); // sortByRating->setText(i18nc("@action:inmenu Sort By", "Rating"));
//
// KToggleAction* sortByTags = actionCollection()->add<KToggleAction>("sort_by_tags");
// sortByTags->setText(i18nc("@action:inmenu Sort By", "Tags"));
//
#ifdef HAVE_NEPOMUK #ifdef HAVE_NEPOMUK
if (MetaDataWidget::metaDataAvailable()) { // if (MetaDataWidget::metaDataAvailable()) {
connect(sortByRating, SIGNAL(triggered()), this, SLOT(sortByRating())); // connect(sortByRating, SIGNAL(triggered()), this, SLOT(sortByRating()));
connect(sortByTags, SIGNAL(triggered()), this, SLOT(sortByTags())); // connect(sortByTags, SIGNAL(triggered()), this, SLOT(sortByTags()));
} // }
else { // else {
sortByRating->setEnabled(false); // sortByRating->setEnabled(false);
sortByTags->setEnabled(false); // sortByTags->setEnabled(false);
} // }
#else #else
sortByRating->setEnabled(false); // sortByRating->setEnabled(false);
sortByTags->setEnabled(false); // sortByTags->setEnabled(false);
#endif #endif
QActionGroup* sortGroup = new QActionGroup(this); QActionGroup* sortGroup = new QActionGroup(this);
@ -1157,8 +1160,11 @@ void DolphinMainWindow::setupActions()
sortGroup->addAction(sortByOwner); sortGroup->addAction(sortByOwner);
sortGroup->addAction(sortByGroup); sortGroup->addAction(sortByGroup);
sortGroup->addAction(sortByType); 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<KToggleAction>("descending"); KToggleAction* sortDescending = actionCollection()->add<KToggleAction>("descending");
sortDescending->setText(i18nc("@action:inmenu Sort", "Descending")); sortDescending->setText(i18nc("@action:inmenu Sort", "Descending"));

View file

@ -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 Group"));
m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Type")); m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Type"));
#ifdef HAVE_NEPOMUK #ifdef HAVE_NEPOMUK
if (!Nepomuk::ResourceManager::instance()->init()) { // TODO: Hided "sort by rating" and "sort by tags" as without caching the performance
m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Rating")); // is too slow currently (Nepomuk will support caching in future releases).
m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Tags")); //
} // if (!Nepomuk::ResourceManager::instance()->init()) {
// m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Rating"));
// m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Tags"));
// }
#endif #endif
QHBoxLayout* sortingLayout = new QHBoxLayout(); QHBoxLayout* sortingLayout = new QHBoxLayout();