From 87ba6b6e04e2a655d72575874fc2ab8fef37ad4c Mon Sep 17 00:00:00 2001 From: Andreas Pakulat Date: Fri, 2 Nov 2007 20:50:05 +0000 Subject: [PATCH] Fix the conflict between cut and delete shortcuts BUG:151601 svn path=/trunk/KDE/kdebase/apps/; revision=732119 --- src/dolphinmainwindow.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 7b7242a8f..ff6af9913 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -1144,7 +1144,12 @@ void DolphinMainWindow::setupActions() SLOT(undo()), actionCollection()); - KStandardAction::cut(this, SLOT(cut()), actionCollection()); + //Need to remove shift+del from cut action, else the shortcut for deletejob + //doesn't work + KAction* cut = KStandardAction::cut(this, SLOT(cut()), actionCollection()); + KShortcut cutShortcut = cut->shortcut(); + cutShortcut.remove(Qt::SHIFT + Qt::Key_Delete, KShortcut::KeepEmpty); + cut->setShortcut(cutShortcut); KStandardAction::copy(this, SLOT(copy()), actionCollection()); KStandardAction::paste(this, SLOT(paste()), actionCollection()); -- 2.47.3