Implemented one of the most often requested features for Dolphin: allow that the command 'Delete' is shown in the context menu to bypass the trash. Like in Konqueror the default setting is that the 'Delete' command is not shown. TODO: currently this is a custom setting of Dolphin. Konqueror uses the global settings from KDE for this -> should this be changed to use the global setting instead?

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

1 files changed, 6 insertions, 5 deletions

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 2585a7b82..7a0ff6c6a 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -994,10 +994,11 @@ void DolphinMainWindow::setupActions()
     connect(menu, SIGNAL(aboutToShow()),

             this, SLOT(updateNewMenu()));

 

-    QAction* action = actionCollection()->addAction("new_window");

-    action->setIcon(KIcon("window_new"));

-    action->setText(i18n("New &Window"));

-    connect(action, SIGNAL(triggered()), this, SLOT(openNewMainWindow()));

+    QAction* newWindow = actionCollection()->addAction("new_window");

+    newWindow->setIcon(KIcon("window_new"));

+    newWindow->setText(i18n("New &Window"));

+    newWindow->setShortcut(Qt::CTRL | Qt::Key_N);

+    connect(newWindow, SIGNAL(triggered()), this, SLOT(openNewMainWindow()));

 

     QAction* rename = actionCollection()->addAction("rename");

     rename->setText(i18n("Rename"));

@@ -1012,7 +1013,7 @@ void DolphinMainWindow::setupActions()
 

     QAction* deleteAction = actionCollection()->addAction("delete");

     deleteAction->setText(i18n("Delete"));

-    deleteAction->setShortcut(Qt::ALT | Qt::Key_Delete);

+    deleteAction->setShortcut(Qt::SHIFT | Qt::Key_Delete);

     deleteAction->setIcon(KIcon("editdelete"));

     connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItems()));