Merge branch 'Applications/19.04'

[dolphin.git] / src / views / dolphinviewactionhandler.cpp

diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index 2684816ef9f37ede65552d40e7b0a48716451e4f..6e5468cd59b43149100677258af31a38dc28aa35 100644 (file)
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -20,31 +20,23 @@
 
 #include "dolphinviewactionhandler.h"
 
-#include <config-baloo.h>
-
+#include "dolphindebug.h"
+#include "kitemviews/kfileitemmodel.h"
 #include "settings/viewpropertiesdialog.h"
-#include "views/dolphinview.h"
 #include "views/zoomlevelinfo.h"
 
-#include <QPointer>
-#include <QMenu>
-
+#ifdef HAVE_BALOO
+#include <Baloo/IndexerConfig>
+#endif
 #include <KActionCollection>
 #include <KActionMenu>
-#include <kitemviews/kfileitemmodel.h>
 #include <KLocalizedString>
 #include <KNewFileMenu>
-#include <KSelectAction>
-#include <KToggleAction>
 #include <KPropertiesDialog>
 #include <KProtocolManager>
-#include <QIcon>
 
-#include "dolphindebug.h"
-
-#ifdef HAVE_BALOO
-    #include <Baloo/IndexerConfig>
-#endif
+#include <QMenu>
+#include <QPointer>
 
 DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent) :
     QObject(parent),
@@ -103,7 +95,7 @@ void DolphinViewActionHandler::createActions()
     m_actionCollection->setDefaultShortcut(newDirAction, Qt::Key_F10);
     newDirAction->setIcon(QIcon::fromTheme(QStringLiteral("folder-new")));
     newDirAction->setEnabled(false);    // Will be enabled in slotWriteStateChanged(bool) if the current URL is writable
-    connect(newDirAction, &QAction::triggered, this, &DolphinViewActionHandler::createDirectory);
+    connect(newDirAction, &QAction::triggered, this, &DolphinViewActionHandler::createDirectoryTriggered);
 
     // File menu
 
@@ -130,7 +122,7 @@ void DolphinViewActionHandler::createActions()
     QAction* deleteWithTrashShortcut = m_actionCollection->addAction(QStringLiteral("delete_shortcut"));
     // The descriptive text is just for the shortcuts editor.
     deleteWithTrashShortcut->setText(i18nc("@action \"Move to Trash\" for non-local files, etc.", "Delete (using shortcut for Trash)"));
-    m_actionCollection->setDefaultShortcut(deleteWithTrashShortcut, QKeySequence::Delete);
+    m_actionCollection->setDefaultShortcuts(deleteWithTrashShortcut, KStandardShortcut::moveToTrash());
     deleteWithTrashShortcut->setEnabled(false);
     connect(deleteWithTrashShortcut, &QAction::triggered, this, &DolphinViewActionHandler::slotDeleteItems);
 
@@ -152,7 +144,7 @@ void DolphinViewActionHandler::createActions()
     viewModeActions->addAction(compactAction);
     viewModeActions->addAction(detailsAction);
     viewModeActions->setToolBarMode(KSelectAction::MenuMode);
-    connect(viewModeActions, static_cast<void(KSelectAction::*)(QAction*)>(&KSelectAction::triggered), this, &DolphinViewActionHandler::slotViewModeActionTriggered);
+    connect(viewModeActions, QOverload<QAction*>::of(&KSelectAction::triggered), this, &DolphinViewActionHandler::slotViewModeActionTriggered);
 
     KStandardAction::zoomIn(this,
                             &DolphinViewActionHandler::zoomIn,
@@ -180,6 +172,7 @@ void DolphinViewActionHandler::createActions()
     QActionGroup* sortByActionGroup = createFileItemRolesActionGroup(QStringLiteral("sort_by_"));
 
     KActionMenu* sortByActionMenu = m_actionCollection->add<KActionMenu>(QStringLiteral("sort"));
+    sortByActionMenu->setIcon(QIcon::fromTheme(QStringLiteral("view-sort")));
     sortByActionMenu->setText(i18nc("@action:inmenu View", "Sort By"));
     sortByActionMenu->setDelayed(false);