Disable the "quick view" feature: I like the Previewer plasmoid, but I think after...

The i18n() string is still part of the code, so that it could be reactivated during the 4.2 cycle.

svn path=/trunk/KDE/kdebase/apps/; revision=886672

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index cf20644827b7a936bf94f3600822e31d54168a78..9fe6814623573bfc23fbc5490005de9134ddc19f 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -251,8 +251,10 @@ void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection)
         compareFilesAction->setEnabled(false);
     }
 
         compareFilesAction->setEnabled(false);
     }
 

+#if defined(QUICK_VIEW)

     const bool activeViewHasSelection = (activeViewContainer()->view()->selectedItemsCount() > 0);
     actionCollection()->action("quick_view")->setEnabled(activeViewHasSelection);
     const bool activeViewHasSelection = (activeViewContainer()->view()->selectedItemsCount() > 0);
     actionCollection()->action("quick_view")->setEnabled(activeViewHasSelection);

+#endif

 
     m_activeViewContainer->updateStatusBar();
 
 
     m_activeViewContainer->updateStatusBar();
 


@@ -1047,12 +1049,15 @@ void DolphinMainWindow::setupActions()
     compareFiles->setEnabled(false);
     connect(compareFiles, SIGNAL(triggered()), this, SLOT(compareFiles()));
 
     compareFiles->setEnabled(false);
     connect(compareFiles, SIGNAL(triggered()), this, SLOT(compareFiles()));
 

+    // disabled Quick View
+#if defined(QUICK_VIEW)

     KAction* quickView = actionCollection()->addAction("quick_view");
     quickView->setText(i18nc("@action:inmenu Tools", "Quick View"));
     quickView->setIcon(KIcon("view-preview"));
     quickView->setShortcut(Qt::CTRL + Qt::Key_Return);
     quickView->setEnabled(false);
     connect(quickView, SIGNAL(triggered()), this, SLOT(quickView()));
     KAction* quickView = actionCollection()->addAction("quick_view");
     quickView->setText(i18nc("@action:inmenu Tools", "Quick View"));
     quickView->setIcon(KIcon("view-preview"));
     quickView->setShortcut(Qt::CTRL + Qt::Key_Return);
     quickView->setEnabled(false);
     connect(quickView, SIGNAL(triggered()), this, SLOT(quickView()));

+#endif

 
     // setup 'Settings' menu
     m_showMenuBar = KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection());
 
     // setup 'Settings' menu
     m_showMenuBar = KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection());