Allow folder creation on desktop via F10 shortcut

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

diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index a63263bf5822dcbbebb65e8e0c0b3c07775b7b34..af105512976b98b5c37bbb3a2f2c21a27588e592 100644 (file)
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -78,8 +78,12 @@ void DolphinViewActionHandler::createActions()
     // KNewFileMenu takes care of the GUI stuff.
     QAction* newDirAction = m_actionCollection->addAction(QStringLiteral("create_dir"));
     newDirAction->setText(i18nc("@action", "Create Folder..."));
     // KNewFileMenu takes care of the GUI stuff.
     QAction* newDirAction = m_actionCollection->addAction(QStringLiteral("create_dir"));
     newDirAction->setText(i18nc("@action", "Create Folder..."));

-    m_actionCollection->setDefaultShortcut(newDirAction, Qt::Key_F10);
-    newDirAction->setIcon(QIcon::fromTheme(QStringLiteral("folder-new")));
+       #if KCONFIG_VERSION >= QT_VERSION_CHECK(5, 74, 0)
+               m_actionCollection->setDefaultShortcuts(newDirAction, KStandardShortcut::createFolder());
+       #else
+           m_actionCollection->setDefaultShortcut(newDirAction, Qt::Key_F10);
+       #endif
+       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::createDirectoryTriggered);
 
     newDirAction->setEnabled(false);    // Will be enabled in slotWriteStateChanged(bool) if the current URL is writable
     connect(newDirAction, &QAction::triggered, this, &DolphinViewActionHandler::createDirectoryTriggered);
 


@@ -227,7 +231,8 @@ void DolphinViewActionHandler::createActions()
     sortByActionMenu->setText(i18nc("@action:inmenu View", "Sort By"));
     sortByActionMenu->setDelayed(false);
 
     sortByActionMenu->setText(i18nc("@action:inmenu View", "Sort By"));
     sortByActionMenu->setDelayed(false);
 

-    foreach (QAction* action, sortByActionGroup->actions()) {
+    const auto sortByActionGroupActions = sortByActionGroup->actions();
+    for (QAction* action : sortByActionGroupActions) {

         sortByActionMenu->addAction(action);
     }
 
         sortByActionMenu->addAction(action);
     }
 


@@ -261,7 +266,8 @@ void DolphinViewActionHandler::createActions()
     visibleRolesMenu->setIcon(QIcon::fromTheme(QStringLiteral("documentinfo")));
     visibleRolesMenu->setDelayed(false);
 
     visibleRolesMenu->setIcon(QIcon::fromTheme(QStringLiteral("documentinfo")));
     visibleRolesMenu->setDelayed(false);
 

-    foreach (QAction* action, visibleRolesGroup->actions()) {
+    const auto visibleRolesGroupActions = visibleRolesGroup->actions();
+    for (QAction* action : visibleRolesGroupActions) {

         visibleRolesMenu->addAction(action);
     }
 
         visibleRolesMenu->addAction(action);
     }
 


@@ -317,7 +323,7 @@ QActionGroup* DolphinViewActionHandler::createFileItemRolesActionGroup(const QSt
 #endif
 
     const QList<KFileItemModel::RoleInfo> rolesInfo = KFileItemModel::rolesInformation();
 #endif
 
     const QList<KFileItemModel::RoleInfo> rolesInfo = KFileItemModel::rolesInformation();

-    foreach (const KFileItemModel::RoleInfo& info, rolesInfo) {
+    for (const KFileItemModel::RoleInfo& info : rolesInfo) {

         if (!isSortGroup && info.role == "text") {
             // It should not be possible to hide the "text" role
             continue;
         if (!isSortGroup && info.role == "text") {
             // It should not be possible to hide the "text" role
             continue;


@@ -379,25 +385,25 @@ void DolphinViewActionHandler::slotViewModeActionTriggered(QAction* action)
 
 void DolphinViewActionHandler::slotRename()
 {
 
 void DolphinViewActionHandler::slotRename()
 {

-    emit actionBeingHandled();
+    Q_EMIT actionBeingHandled();

     m_currentView->renameSelectedItems();
 }
 
 void DolphinViewActionHandler::slotTrashActivated()
 {
     m_currentView->renameSelectedItems();
 }
 
 void DolphinViewActionHandler::slotTrashActivated()
 {

-    emit actionBeingHandled();
+    Q_EMIT actionBeingHandled();

     m_currentView->trashSelectedItems();
 }
 
 void DolphinViewActionHandler::slotDeleteItems()
 {
     m_currentView->trashSelectedItems();
 }
 
 void DolphinViewActionHandler::slotDeleteItems()
 {

-    emit actionBeingHandled();
+    Q_EMIT actionBeingHandled();

     m_currentView->deleteSelectedItems();
 }
 
 void DolphinViewActionHandler::togglePreview(bool show)
 {
     m_currentView->deleteSelectedItems();
 }
 
 void DolphinViewActionHandler::togglePreview(bool show)
 {

-    emit actionBeingHandled();
+    Q_EMIT actionBeingHandled();

     m_currentView->setPreviewsShown(show);
 }
 
     m_currentView->setPreviewsShown(show);
 }
 


@@ -496,7 +502,7 @@ void DolphinViewActionHandler::slotSortFoldersFirstChanged(bool foldersFirst)
 
 void DolphinViewActionHandler::toggleVisibleRole(QAction* action)
 {
 
 void DolphinViewActionHandler::toggleVisibleRole(QAction* action)
 {

-    emit actionBeingHandled();
+    Q_EMIT actionBeingHandled();

 
     const QByteArray toggledRole = action->data().toByteArray();
 
 
     const QByteArray toggledRole = action->data().toByteArray();
 


@@ -521,7 +527,7 @@ void DolphinViewActionHandler::slotVisibleRolesChanged(const QList<QByteArray>&
 {
     Q_UNUSED(previous)
 
 {
     Q_UNUSED(previous)
 

-    const QSet<QByteArray> checkedRoles = current.toSet();
+    const auto checkedRoles = QSet<QByteArray>(current.constBegin(), current.constEnd());

     QHashIterator<QByteArray, KToggleAction*> it(m_visibleRoles);
     while (it.hasNext()) {
         it.next();
     QHashIterator<QByteArray, KToggleAction*> it(m_visibleRoles);
     while (it.hasNext()) {
         it.next();


@@ -544,7 +550,7 @@ void DolphinViewActionHandler::slotGroupedSortingChanged(bool groupedSorting)
 
 void DolphinViewActionHandler::toggleShowHiddenFiles(bool show)
 {
 
 void DolphinViewActionHandler::toggleShowHiddenFiles(bool show)
 {

-    emit actionBeingHandled();
+    Q_EMIT actionBeingHandled();

     m_currentView->setHiddenFilesShown(show);
 }
 
     m_currentView->setHiddenFilesShown(show);
 }
 


@@ -654,7 +660,8 @@ void DolphinViewActionHandler::slotSortTriggered(QAction* action)
     for (QAction *groupAction : qAsConst(m_sortByActions)) {
         KActionMenu* actionMenu = qobject_cast<KActionMenu*>(groupAction);
         if (actionMenu) {
     for (QAction *groupAction : qAsConst(m_sortByActions)) {
         KActionMenu* actionMenu = qobject_cast<KActionMenu*>(groupAction);
         if (actionMenu) {

-            foreach (QAction* subAction, actionMenu->menu()->actions()) {
+            const auto actions = actionMenu->menu()->actions();
+            for (QAction* subAction : actions) {

                 subAction->setChecked(false);
             }
         } else if (groupAction->actionGroup()) {
                 subAction->setChecked(false);
             }
         } else if (groupAction->actionGroup()) {


@@ -670,7 +677,7 @@ void DolphinViewActionHandler::slotSortTriggered(QAction* action)
 
 void DolphinViewActionHandler::slotAdjustViewProperties()
 {
 
 void DolphinViewActionHandler::slotAdjustViewProperties()
 {

-    emit actionBeingHandled();
+    Q_EMIT actionBeingHandled();

     QPointer<ViewPropertiesDialog> dialog = new ViewPropertiesDialog(m_currentView);
     dialog->exec();
     delete dialog;
     QPointer<ViewPropertiesDialog> dialog = new ViewPropertiesDialog(m_currentView);
     dialog->exec();
     delete dialog;


@@ -678,7 +685,7 @@ void DolphinViewActionHandler::slotAdjustViewProperties()
 
 void DolphinViewActionHandler::slotDuplicate()
 {
 
 void DolphinViewActionHandler::slotDuplicate()
 {

-    emit actionBeingHandled();
+    Q_EMIT actionBeingHandled();

     m_currentView->duplicateSelectedItems();
 }
 
     m_currentView->duplicateSelectedItems();
 }