Do not show links for unsupported protocols, ie. pre-4.4 resources which used URNs...

[dolphin.git] / src / dolphinviewactionhandler.cpp

diff --git a/src/dolphinviewactionhandler.cpp b/src/dolphinviewactionhandler.cpp
index 76989aa4dfbb3b835a883562cd9e7792e34b69ce..49a5f7e984246631315f3298286d76f7355c51ae 100644 (file)
--- a/src/dolphinviewactionhandler.cpp
+++ b/src/dolphinviewactionhandler.cpp
@@ -31,7 +31,6 @@
 #include <ktoggleaction.h>
 #include <krun.h>
 #include <kpropertiesdialog.h>
-#include <knewstuff2/engine.h>
 
 
 DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent)
@@ -87,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..."));
@@ -144,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)));
 
@@ -182,12 +182,12 @@ void DolphinViewActionHandler::createActions()
     findFile->setIcon(KIcon("edit-find"));
     connect(findFile, SIGNAL(triggered()), this, SLOT(slotFindFile()));
        
-       // Settings menu
-       
-       KAction* getServiceMenu = m_actionCollection->addAction("get_servicemenu");
-       getServiceMenu->setText(i18nc("@action:inmenu Settings", "Get Servicemenu..."));
-       getServiceMenu->setIcon(KIcon ("get-hot-new-stuff"));
-       connect(getServiceMenu, SIGNAL(triggered()), this, SLOT(slotGetServiceMenu()));
+    // Settings menu
+
+    KAction* getServiceMenu = m_actionCollection->addAction("get_servicemenu");
+    getServiceMenu->setText(i18nc("@action:inmenu Settings", "Get Service Menu..."));
+    getServiceMenu->setIcon(KIcon("get-hot-new-stuff"));
+    connect(getServiceMenu, SIGNAL(triggered()), this, SLOT(slotGetServiceMenu()));
 }
 
 QActionGroup* DolphinViewActionHandler::createAdditionalInformationActionGroup()
@@ -432,6 +432,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));
@@ -442,6 +443,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));
@@ -452,6 +454,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));
@@ -540,10 +543,3 @@ void DolphinViewActionHandler::slotProperties()
     dialog->raise();
     dialog->activateWindow();
 }
-
-void DolphinViewActionHandler::slotGetServiceMenu()
-{
-       KNS::Engine khns(m_currentView);
-       khns.init("servicemenu.knsrc");
-       khns.downloadDialogModal(m_currentView);
-}