When "move_to_trash" is disabled and "delete" is enabled (e.g. non-local files),

[dolphin.git] / src / dolphinviewactionhandler.cpp

diff --git a/src/dolphinviewactionhandler.cpp b/src/dolphinviewactionhandler.cpp
index 87facace1a80822f43ca44bd32a4f508ac988d49..420db5404d66598aba7850e1a98e12a605dde92c 100644 (file)
--- a/src/dolphinviewactionhandler.cpp
+++ b/src/dolphinviewactionhandler.cpp
@@ -18,14 +18,15 @@
  ***************************************************************************/
 
 #include "dolphinviewactionhandler.h"
-#include <kdebug.h>
 
+#include "viewpropertiesdialog.h"
 #include "dolphinview.h"
 
 #include <konq_operations.h>
 
 #include <kaction.h>
 #include <kactioncollection.h>
+#include <kdebug.h>
 #include <klocale.h>
 #include <ktoggleaction.h>
 
@@ -68,7 +69,7 @@ void DolphinViewActionHandler::createActions()
     // This action doesn't appear in the GUI, it's for the shortcut only.
     // KNewMenu takes care of the GUI stuff.
     KAction* newDirAction = m_actionCollection->addAction("create_dir");
-    newDirAction->setText(i18n("Create Folder..."));
+    newDirAction->setText(i18nc("@action", "Create Folder..."));
     newDirAction->setShortcut(Qt::Key_F10);
     connect(newDirAction, SIGNAL(triggered()), SLOT(slotCreateDir()));
 
@@ -92,6 +93,17 @@ void DolphinViewActionHandler::createActions()
     deleteAction->setShortcut(Qt::SHIFT | Qt::Key_Delete);
     connect(deleteAction, SIGNAL(triggered()), this, SLOT(slotDeleteItems()));
 
+    // This action is useful for being enabled when "move_to_trash" should be
+    // disabled and "delete" is enabled (e.g. non-local files), so that Key_Del
+    // can be used for deleting the file (#76016). It needs to be a separate action
+    // so that the Edit menu isn't affected.
+    KAction* deleteWithTrashShortcut = m_actionCollection->addAction("delete_shortcut");
+    // TODO after message freeze, a more descriptive text, for the shortcuts editor.
+    deleteWithTrashShortcut->setText(i18nc("@action:inmenu File", "Delete"));
+    deleteWithTrashShortcut->setShortcut(QKeySequence::Delete);
+    deleteWithTrashShortcut->setEnabled(false);
+    connect(deleteWithTrashShortcut, SIGNAL(triggered()), this, SLOT(slotDeleteItems()));
+
     // View menu
 
     QActionGroup* viewModeActions = new QActionGroup(this);
@@ -132,6 +144,9 @@ void DolphinViewActionHandler::createActions()
     showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_Period);
     connect(showHiddenFiles, SIGNAL(triggered(bool)), this, SLOT(toggleShowHiddenFiles(bool)));
 
+    KAction* adjustViewProps = m_actionCollection->addAction("view_properties");
+    adjustViewProps->setText(i18nc("@action:inmenu View", "Adjust View Properties..."));
+    connect(adjustViewProps, SIGNAL(triggered()), this, SLOT(slotAdjustViewProperties()));
 }
 
 QActionGroup* DolphinViewActionHandler::createAdditionalInformationActionGroup()
@@ -471,3 +486,10 @@ void DolphinViewActionHandler::slotSortTriggered(QAction* action)
     const DolphinView::Sorting sorting = action->data().value<DolphinView::Sorting>();
     m_currentView->setSorting(sorting);
 }
+
+void DolphinViewActionHandler::slotAdjustViewProperties()
+{
+    emit actionBeingHandled();
+    ViewPropertiesDialog dlg(m_currentView);
+    dlg.exec();
+}