use KAction::setShortcut() instead of QAction::setShortcut()

[dolphin.git] / src / dolphinviewactionhandler.cpp

diff --git a/src/dolphinviewactionhandler.cpp b/src/dolphinviewactionhandler.cpp
index 0885cceb9535767e25ae9b5e6f9878d3b286b1ff..200d4e504d5fda8a07997ba20d7a3116a199e36a 100644 (file)
--- a/src/dolphinviewactionhandler.cpp
+++ b/src/dolphinviewactionhandler.cpp
@@ -86,7 +86,7 @@ void DolphinViewActionHandler::createActions()
     newDirAction->setIcon(KIcon("folder-new"));
     connect(newDirAction, SIGNAL(triggered()), this, SIGNAL(createDirectory()));
 
-    // Edit menu
+    // File menu
 
     KAction* rename = m_actionCollection->addAction("rename");
     rename->setText(i18nc("@action:inmenu File", "Rename..."));
@@ -143,6 +143,7 @@ void DolphinViewActionHandler::createActions()
 
     KToggleAction* showPreview = m_actionCollection->add<KToggleAction>("show_preview");
     showPreview->setText(i18nc("@action:intoolbar", "Preview"));
+    showPreview->setToolTip(i18nc("@info", "Show preview of files and folders"));
     showPreview->setIcon(KIcon("view-preview"));
     connect(showPreview, SIGNAL(triggered(bool)), this, SLOT(togglePreview(bool)));
 
@@ -262,31 +263,6 @@ QActionGroup* DolphinViewActionHandler::createSortByActionGroup()
     sortByType->setData(QVariant::fromValue(DolphinView::SortByType));
     sortByActionGroup->addAction(sortByType);
 
-    // TODO: Hid "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 = m_actionCollection->add<KToggleAction>("sort_by_rating");
-    // sortByRating->setData(QVariant::fromValue(DolphinView::SortByRating));
-    // sortByRating->setText(i18nc("@action:inmenu Sort By", "Rating"));
-    // sortByActionGroup->addAction(sortByRating);
-    //
-    // KToggleAction* sortByTags = m_actionCollection->add<KToggleAction>("sort_by_tags");
-    // sortByTags->setData(QVariant::fromValue(DolphinView::SortByTags));
-    // sortByTags->setText(i18nc("@action:inmenu Sort By", "Tags"));
-    // sortByActionGroup->addAction(sortByTags);
-    //
-#ifdef HAVE_NEPOMUK
-    // if (!MetaDataWidget::metaDataAvailable()) {
-    //     sortByRating->setEnabled(false);
-    //     sortByTags->setEnabled(false);
-    // }
-#else
-    // sortByRating->setEnabled(false);
-    // sortByTags->setEnabled(false);
-#endif
-
-
-
     return sortByActionGroup;
 }
 
@@ -449,6 +425,7 @@ KToggleAction* DolphinViewActionHandler::iconsModeAction()
 {
     KToggleAction* iconsView = m_actionCollection->add<KToggleAction>("icons");
     iconsView->setText(i18nc("@action:inmenu View Mode", "Icons"));
+    iconsView->setToolTip(i18nc("@info", "Icons view mode"));
     iconsView->setShortcut(Qt::CTRL | Qt::Key_1);
     iconsView->setIcon(KIcon("view-list-icons"));
     iconsView->setData(QVariant::fromValue(DolphinView::IconsView));
@@ -459,6 +436,7 @@ KToggleAction* DolphinViewActionHandler::detailsModeAction()
 {
     KToggleAction* detailsView = m_actionCollection->add<KToggleAction>("details");
     detailsView->setText(i18nc("@action:inmenu View Mode", "Details"));
+    detailsView->setToolTip(i18nc("@info", "Details view mode"));
     detailsView->setShortcut(Qt::CTRL | Qt::Key_2);
     detailsView->setIcon(KIcon("view-list-details"));
     detailsView->setData(QVariant::fromValue(DolphinView::DetailsView));
@@ -469,6 +447,7 @@ KToggleAction* DolphinViewActionHandler::columnsModeAction()
 {
     KToggleAction* columnView = m_actionCollection->add<KToggleAction>("columns");
     columnView->setText(i18nc("@action:inmenu View Mode", "Columns"));
+    columnView->setToolTip(i18nc("@info", "Columns view mode"));
     columnView->setShortcut(Qt::CTRL | Qt::Key_3);
     columnView->setIcon(KIcon("view-file-columns"));
     columnView->setData(QVariant::fromValue(DolphinView::ColumnView));
@@ -500,14 +479,6 @@ void DolphinViewActionHandler::slotSortingChanged(DolphinView::Sorting sorting)
     case DolphinView::SortByType:
         action = m_actionCollection->action("sort_by_type");
         break;
-#ifdef HAVE_NEPOMUK
-    case DolphinView::SortByRating:
-        action = m_actionCollection->action("sort_by_rating");
-        break;
-    case DolphinView::SortByTags:
-        action = m_actionCollection->action("sort_by_tags");
-        break;
-#endif
     default:
         break;
     }