don't use SPACE as shortcut for Quick View, as this conflicts with the Terminal Panel

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

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 49be1e02e740236f3618151894ce02c3b5ccc8ed..78e5ab31c3759acb717378689002515dcfd8c7f0 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1008,7 +1008,7 @@ void DolphinMainWindow::setupActions()
     KAction* quickView = actionCollection()->addAction("quick_view");
     quickView->setText(i18nc("@action:inmenu Tools", "Quick View"));
     quickView->setIcon(KIcon("view-preview"));
-    quickView->setShortcut(Qt::Key_Space);
+    quickView->setShortcut(Qt::CTRL + Qt::Key_Return);
     quickView->setEnabled(false);
     connect(quickView, SIGNAL(triggered()), this, SLOT(quickView()));