Combine the zoom menu entries into one Line

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

diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index ef30e91c9f46fd9b97102ab40d34383de44a1050..e504fd831ab5effbf81c392be6fad2b825213f48 100644 (file)
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -7,13 +7,12 @@
 
 #include "dolphinviewactionhandler.h"
 
 
 #include "dolphinviewactionhandler.h"
 

-#include "dolphindebug.h"

 #include "kitemviews/kfileitemlisttostring.h"
 #include "kitemviews/kfileitemmodel.h"
 #include "selectionmode/actiontexthelper.h"
 #include "settings/viewpropertiesdialog.h"
 #include "views/zoomlevelinfo.h"
 #include "kitemviews/kfileitemlisttostring.h"
 #include "kitemviews/kfileitemmodel.h"
 #include "selectionmode/actiontexthelper.h"
 #include "settings/viewpropertiesdialog.h"
 #include "views/zoomlevelinfo.h"

-#include "kconfig_version.h"
+#include "views/zoomwidgetaction.h"

 
 #if HAVE_BALOO
 #include <Baloo/IndexerConfig>
 
 #if HAVE_BALOO
 #include <Baloo/IndexerConfig>


@@ -30,18 +29,18 @@
 #include <QMenu>
 #include <QPointer>
 
 #include <QMenu>
 #include <QPointer>
 

-DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, SelectionMode::ActionTextHelper* actionTextHelper, QObject* parent) :
-    QObject(parent),
-    m_actionCollection(collection),
-    m_currentView(nullptr),
-    m_sortByActions(),
-    m_visibleRoles()
+DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection *collection, SelectionMode::ActionTextHelper *actionTextHelper, QObject *parent)
+    : QObject(parent)
+    , m_actionCollection(collection)
+    , m_currentView(nullptr)
+    , m_sortByActions()
+    , m_visibleRoles()

 {
     Q_ASSERT(m_actionCollection);
     createActions(actionTextHelper);
 }
 
 {
     Q_ASSERT(m_actionCollection);
     createActions(actionTextHelper);
 }
 

-void DolphinViewActionHandler::setCurrentView(DolphinView* view)
+void DolphinViewActionHandler::setCurrentView(DolphinView *view)

 {
     Q_ASSERT(view);
 
 {
     Q_ASSERT(view);
 


@@ -51,36 +50,26 @@ void DolphinViewActionHandler::setCurrentView(DolphinView* view)
 
     m_currentView = view;
 
 
     m_currentView = view;
 

-    connect(view, &DolphinView::modeChanged,
-            this, &DolphinViewActionHandler::updateViewActions);
-    connect(view, &DolphinView::previewsShownChanged,
-            this, &DolphinViewActionHandler::slotPreviewsShownChanged);
-    connect(view, &DolphinView::sortOrderChanged,
-            this, &DolphinViewActionHandler::slotSortOrderChanged);
-    connect(view, &DolphinView::sortFoldersFirstChanged,
-            this, &DolphinViewActionHandler::slotSortFoldersFirstChanged);
-    connect(view, &DolphinView::sortHiddenLastChanged,
-            this, &DolphinViewActionHandler::slotSortHiddenLastChanged);
-    connect(view, &DolphinView::visibleRolesChanged,
-            this, &DolphinViewActionHandler::slotVisibleRolesChanged);
-    connect(view, &DolphinView::groupedSortingChanged,
-            this, &DolphinViewActionHandler::slotGroupedSortingChanged);
-    connect(view, &DolphinView::hiddenFilesShownChanged,
-            this, &DolphinViewActionHandler::slotHiddenFilesShownChanged);
-    connect(view, &DolphinView::sortRoleChanged,
-            this, &DolphinViewActionHandler::slotSortRoleChanged);
-    connect(view, &DolphinView::zoomLevelChanged,
-            this, &DolphinViewActionHandler::slotZoomLevelChanged);
-    connect(view, &DolphinView::writeStateChanged,
-            this, &DolphinViewActionHandler::slotWriteStateChanged);
-    connect(view, &DolphinView::selectionModeRequested,
-            this, [this]() { Q_EMIT setSelectionMode(true); });
-    connect(view, &DolphinView::selectionChanged,
-            this, &DolphinViewActionHandler::slotSelectionChanged);
+    connect(view, &DolphinView::modeChanged, this, &DolphinViewActionHandler::updateViewActions);
+    connect(view, &DolphinView::previewsShownChanged, this, &DolphinViewActionHandler::slotPreviewsShownChanged);
+    connect(view, &DolphinView::sortOrderChanged, this, &DolphinViewActionHandler::slotSortOrderChanged);
+    connect(view, &DolphinView::sortFoldersFirstChanged, this, &DolphinViewActionHandler::slotSortFoldersFirstChanged);
+    connect(view, &DolphinView::sortHiddenLastChanged, this, &DolphinViewActionHandler::slotSortHiddenLastChanged);
+    connect(view, &DolphinView::visibleRolesChanged, this, &DolphinViewActionHandler::slotVisibleRolesChanged);
+    connect(view, &DolphinView::groupedSortingChanged, this, &DolphinViewActionHandler::slotGroupedSortingChanged);
+    connect(view, &DolphinView::hiddenFilesShownChanged, this, &DolphinViewActionHandler::slotHiddenFilesShownChanged);
+    connect(view, &DolphinView::sortRoleChanged, this, &DolphinViewActionHandler::slotSortRoleChanged);
+    connect(view, &DolphinView::zoomLevelChanged, this, &DolphinViewActionHandler::slotZoomLevelChanged);
+    connect(view, &DolphinView::writeStateChanged, this, &DolphinViewActionHandler::slotWriteStateChanged);
+    slotWriteStateChanged(view->isFolderWritable());
+    connect(view, &DolphinView::selectionModeChangeRequested, this, [this](bool enabled) {
+        Q_EMIT selectionModeChangeTriggered(enabled);
+    });
+    connect(view, &DolphinView::selectionChanged, this, &DolphinViewActionHandler::slotSelectionChanged);

     slotSelectionChanged(m_currentView->selectedItems());
 }
 
     slotSelectionChanged(m_currentView->selectedItems());
 }
 

-DolphinView* DolphinViewActionHandler::currentView()
+DolphinView *DolphinViewActionHandler::currentView()

 {
     return m_currentView;
 }
 {
     return m_currentView;
 }


@@ -89,83 +78,93 @@ void DolphinViewActionHandler::createActions(SelectionMode::ActionTextHelper *ac
 {
     // This action doesn't appear in the GUI, it's for the shortcut only.
     // KNewFileMenu takes care of the GUI stuff.
 {
     // This action doesn't appear in the GUI, it's for the shortcut only.
     // KNewFileMenu takes care of the GUI stuff.

-    QAction* newDirAction = m_actionCollection->addAction(QStringLiteral("create_dir"));
-    newDirAction->setText(i18nc("@action", "Create Folder..."));
+    QAction *newDirAction = m_actionCollection->addAction(QStringLiteral("create_dir"));
+    newDirAction->setText(i18nc("@action", "Create Folder…"));

     m_actionCollection->setDefaultShortcuts(newDirAction, KStandardShortcut::createFolder());
     newDirAction->setIcon(QIcon::fromTheme(QStringLiteral("folder-new")));
     m_actionCollection->setDefaultShortcuts(newDirAction, KStandardShortcut::createFolder());
     newDirAction->setIcon(QIcon::fromTheme(QStringLiteral("folder-new")));

-    newDirAction->setEnabled(false);    // Will be enabled in slotWriteStateChanged(bool) if the current URL is writable
+    newDirAction->setEnabled(false); // Will be enabled in slotWriteStateChanged(bool) if the current URL is writable

     connect(newDirAction, &QAction::triggered, this, &DolphinViewActionHandler::createDirectoryTriggered);
 
     connect(newDirAction, &QAction::triggered, this, &DolphinViewActionHandler::createDirectoryTriggered);
 

+    QAction *newFileAction = m_actionCollection->addAction(QStringLiteral("create_file"));
+    newFileAction->setText(i18nc("@action", "Create File…"));
+    newFileAction->setIcon(QIcon::fromTheme(QStringLiteral("document-new")));
+    newFileAction->setEnabled(false); // Will be enabled in slotWriteStateChanged(bool) if the current URL is writable
+    connect(newFileAction, &QAction::triggered, this, &DolphinViewActionHandler::createFileTriggered);
+

     // File menu
 
     auto renameAction = KStandardAction::renameFile(this, &DolphinViewActionHandler::slotRename, m_actionCollection);
     // File menu
 
     auto renameAction = KStandardAction::renameFile(this, &DolphinViewActionHandler::slotRename, m_actionCollection);

-    renameAction->setWhatsThis(xi18nc("@info:whatsthis", "This renames the "
-        "items in your current selection.<nl/>Renaming multiple items "
-        "at once amounts to their new names differing only in a number."));
+    renameAction->setWhatsThis(xi18nc("@info:whatsthis",
+                                      "This renames the "
+                                      "items in your current selection.<nl/>Renaming multiple items "
+                                      "at once results in their new names differing only in a number."));

 
     auto trashAction = KStandardAction::moveToTrash(this, &DolphinViewActionHandler::slotTrashActivated, m_actionCollection);
     auto trashShortcuts = trashAction->shortcuts();
 
     auto trashAction = KStandardAction::moveToTrash(this, &DolphinViewActionHandler::slotTrashActivated, m_actionCollection);
     auto trashShortcuts = trashAction->shortcuts();

+    trashAction->setAutoRepeat(false);

     if (!trashShortcuts.contains(QKeySequence::Delete)) {
         trashShortcuts.append(QKeySequence::Delete);
         m_actionCollection->setDefaultShortcuts(trashAction, trashShortcuts);
     }
     if (!trashShortcuts.contains(QKeySequence::Delete)) {
         trashShortcuts.append(QKeySequence::Delete);
         m_actionCollection->setDefaultShortcuts(trashAction, trashShortcuts);
     }

-    trashAction->setWhatsThis(xi18nc("@info:whatsthis", "This moves the "
-        "items in your current selection to the <filename>Trash"
-        "</filename>.<nl/>The trash is a temporary storage where "
-        "items can be deleted from if disk space is needed."));
+    trashAction->setWhatsThis(xi18nc("@info:whatsthis",
+                                     "This moves the "
+                                     "items in your current selection to the <filename>Trash"
+                                     "</filename>.<nl/>The trash is a temporary storage location where "
+                                     "items can be deleted later if disk space is needed."));

 
     auto deleteAction = KStandardAction::deleteFile(this, &DolphinViewActionHandler::slotDeleteItems, m_actionCollection);
     auto deleteShortcuts = deleteAction->shortcuts();
 
     auto deleteAction = KStandardAction::deleteFile(this, &DolphinViewActionHandler::slotDeleteItems, m_actionCollection);
     auto deleteShortcuts = deleteAction->shortcuts();

+    deleteAction->setAutoRepeat(false);

     if (!deleteShortcuts.contains(Qt::SHIFT | Qt::Key_Delete)) {
         deleteShortcuts.append(Qt::SHIFT | Qt::Key_Delete);
         m_actionCollection->setDefaultShortcuts(deleteAction, deleteShortcuts);
     }
     if (!deleteShortcuts.contains(Qt::SHIFT | Qt::Key_Delete)) {
         deleteShortcuts.append(Qt::SHIFT | Qt::Key_Delete);
         m_actionCollection->setDefaultShortcuts(deleteAction, deleteShortcuts);
     }

-    deleteAction->setWhatsThis(xi18nc("@info:whatsthis", "This deletes "
-        "the items in your current selection completely. They can "
-        "not be recovered by normal means."));
+    deleteAction->setWhatsThis(xi18nc("@info:whatsthis",
+                                      "This deletes "
+                                      "the items in your current selection permanently. They "
+                                      "cannot be recovered by normal means."));

 
     // This action is useful for being enabled when KStandardAction::MoveToTrash should be
     // disabled and KStandardAction::DeleteFile 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.
 
     // This action is useful for being enabled when KStandardAction::MoveToTrash should be
     // disabled and KStandardAction::DeleteFile 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.

-    QAction* deleteWithTrashShortcut = m_actionCollection->addAction(QStringLiteral("delete_shortcut"));
+    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->setDefaultShortcuts(deleteWithTrashShortcut, KStandardShortcut::moveToTrash());
     deleteWithTrashShortcut->setEnabled(false);
     connect(deleteWithTrashShortcut, &QAction::triggered, this, &DolphinViewActionHandler::slotDeleteItems);
 
     // 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->setDefaultShortcuts(deleteWithTrashShortcut, KStandardShortcut::moveToTrash());
     deleteWithTrashShortcut->setEnabled(false);
     connect(deleteWithTrashShortcut, &QAction::triggered, this, &DolphinViewActionHandler::slotDeleteItems);
 

-    QAction* duplicateAction = m_actionCollection->addAction(QStringLiteral("duplicate"));
+    QAction *duplicateAction = m_actionCollection->addAction(QStringLiteral("duplicate"));

     duplicateAction->setText(i18nc("@action:inmenu File", "Duplicate Here"));
     duplicateAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-duplicate")));
     m_actionCollection->setDefaultShortcut(duplicateAction, Qt::CTRL | Qt::Key_D);
     duplicateAction->setEnabled(false);
     connect(duplicateAction, &QAction::triggered, this, &DolphinViewActionHandler::slotDuplicate);
 
     duplicateAction->setText(i18nc("@action:inmenu File", "Duplicate Here"));
     duplicateAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-duplicate")));
     m_actionCollection->setDefaultShortcut(duplicateAction, Qt::CTRL | Qt::Key_D);
     duplicateAction->setEnabled(false);
     connect(duplicateAction, &QAction::triggered, this, &DolphinViewActionHandler::slotDuplicate);
 

-    QAction *propertiesAction = m_actionCollection->addAction( QStringLiteral("properties") );
+    QAction *propertiesAction = m_actionCollection->addAction(QStringLiteral("properties"));

     // Well, it's the File menu in dolphinmainwindow and the Edit menu in dolphinpart... :)
     // Well, it's the File menu in dolphinmainwindow and the Edit menu in dolphinpart... :)

-    propertiesAction->setText( i18nc("@action:inmenu File", "Properties") );
+    propertiesAction->setText(i18nc("@action:inmenu File", "Properties"));

     propertiesAction->setWhatsThis(xi18nc("@info:whatsthis properties",
     propertiesAction->setWhatsThis(xi18nc("@info:whatsthis properties",

-        "This shows a complete list of properties of the currently "
-        "selected items in a new window.<nl/>If nothing is selected the "
-        "window will be about the currently viewed folder instead.<nl/>"
-        "You can configure advanced options there like managing "
-        "read- and write-permissions."));
+                                          "This shows a complete list of properties of the currently "
+                                          "selected items in a new window.<nl/>If nothing is selected the "
+                                          "window will be about the currently viewed folder instead.<nl/>"
+                                          "You can configure advanced options there like managing "
+                                          "read- and write-permissions."));

     propertiesAction->setIcon(QIcon::fromTheme(QStringLiteral("document-properties")));
     m_actionCollection->setDefaultShortcuts(propertiesAction, {Qt::ALT | Qt::Key_Return, Qt::ALT | Qt::Key_Enter});
     connect(propertiesAction, &QAction::triggered, this, &DolphinViewActionHandler::slotProperties);
 
     propertiesAction->setIcon(QIcon::fromTheme(QStringLiteral("document-properties")));
     m_actionCollection->setDefaultShortcuts(propertiesAction, {Qt::ALT | Qt::Key_Return, Qt::ALT | Qt::Key_Enter});
     connect(propertiesAction, &QAction::triggered, this, &DolphinViewActionHandler::slotProperties);
 

-    QAction *copyPathAction = m_actionCollection->addAction( QStringLiteral("copy_location") );
+    QAction *copyPathAction = m_actionCollection->addAction(QStringLiteral("copy_location"));

     copyPathAction->setText(i18nc("@action:incontextmenu", "Copy Location"));
     copyPathAction->setText(i18nc("@action:incontextmenu", "Copy Location"));

-    copyPathAction->setWhatsThis(i18nc("@info:whatsthis copy_location",
-                                          "This will copy the path of the first selected item into the clipboard."
-                                ));
+    copyPathAction->setWhatsThis(i18nc("@info:whatsthis copy_location", "This will copy the path of the first selected item into the clipboard."));

 
     copyPathAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-copy-path")));
     m_actionCollection->setDefaultShortcuts(copyPathAction, {Qt::CTRL | Qt::ALT | Qt::Key_C});
     connect(copyPathAction, &QAction::triggered, this, &DolphinViewActionHandler::slotCopyPath);
 
     if (actionTextHelper) {
 
     copyPathAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-copy-path")));
     m_actionCollection->setDefaultShortcuts(copyPathAction, {Qt::CTRL | Qt::ALT | Qt::Key_C});
     connect(copyPathAction, &QAction::triggered, this, &DolphinViewActionHandler::slotCopyPath);
 
     if (actionTextHelper) {

+        // The "…" at the end make clear that they won't trigger their respective actions directly.

         actionTextHelper->registerTextWhenNothingIsSelected(trashAction, i18nc("@action:inmenu File", "Move to Trash…"));
         actionTextHelper->registerTextWhenNothingIsSelected(deleteAction, i18nc("@action:inmenu File", "Delete…"));
         actionTextHelper->registerTextWhenNothingIsSelected(duplicateAction, i18nc("@action:inmenu File", "Duplicate Here…"));
         actionTextHelper->registerTextWhenNothingIsSelected(trashAction, i18nc("@action:inmenu File", "Move to Trash…"));
         actionTextHelper->registerTextWhenNothingIsSelected(deleteAction, i18nc("@action:inmenu File", "Delete…"));
         actionTextHelper->registerTextWhenNothingIsSelected(duplicateAction, i18nc("@action:inmenu File", "Duplicate Here…"));


@@ -193,45 +192,56 @@ void DolphinViewActionHandler::createActions(SelectionMode::ActionTextHelper *ac
                                       // actions in slotSelectionChanged() after the static ones above.
 
     // View menu
                                       // actions in slotSelectionChanged() after the static ones above.
 
     // View menu

-    KToggleAction* iconsAction = iconsModeAction();
-    KToggleAction* compactAction = compactModeAction();
-    KToggleAction* detailsAction = detailsModeAction();
+    KToggleAction *iconsAction = iconsModeAction();
+    KToggleAction *compactAction = compactModeAction();
+    KToggleAction *detailsAction = detailsModeAction();

 
     iconsAction->setWhatsThis(xi18nc("@info:whatsthis Icons view mode",
 
     iconsAction->setWhatsThis(xi18nc("@info:whatsthis Icons view mode",

-        "<para>This switches to a view mode that focuses on the folder "
-        "and file icons. This mode makes it easy to distinguish folders "
-        "from files and to detect items with distinctive <emphasis>"
-        "file types</emphasis>.</para><para> This mode is handy to "
-        "browse through pictures when the <interface>Preview"
-        "</interface> option is enabled.</para>"));
+                                     "<para>This switches to a view mode that focuses on the folder "
+                                     "and file icons. This mode makes it easy to distinguish folders "
+                                     "from files and to detect items with distinctive <emphasis>"
+                                     "file types</emphasis>.</para><para> This mode is handy to "
+                                     "browse through pictures when the <interface>Preview"
+                                     "</interface> option is enabled.</para>"));

     compactAction->setWhatsThis(xi18nc("@info:whatsthis Compact view mode",
     compactAction->setWhatsThis(xi18nc("@info:whatsthis Compact view mode",

-        "<para>This switches to a compact view mode that lists the folders "
-        "and files in columns with the names beside the icons.</para><para>"
-        "This helps to keep the overview in folders with many items.</para>"));
+                                       "<para>This switches to a compact view mode that lists the folders "
+                                       "and files in columns with the names beside the icons.</para><para>"
+                                       "This helps to give you an overview in folders with many items.</para>"));

     detailsAction->setWhatsThis(xi18nc("@info:whatsthis Details view mode",
     detailsAction->setWhatsThis(xi18nc("@info:whatsthis Details view mode",

-        "<para>This switches to a list view mode that focuses on folder "
-        "and file details.</para><para>Click on a detail in the column "
-        "header to sort the items by it. Click again to sort the other "
-        "way around. To select which details should be displayed click "
-        "the header with the right mouse button.</para><para>You can "
-        "view the contents of a folder without leaving the current "
-        "location by clicking to the left of it. This way you can view "
-        "the contents of multiple folders in the same list.</para>"));
-
-    KSelectAction* viewModeActions = m_actionCollection->add<KSelectAction>(QStringLiteral("view_mode"));
-    viewModeActions->setText(i18nc("@action:intoolbar", "View Mode"));
+                                       "<para>This switches to a list view mode that focuses on folder "
+                                       "and file details.</para><para>Click on a detail in the column "
+                                       "header to sort the items by it. Click again to sort the other "
+                                       "way around. To select which details should be displayed click "
+                                       "the header with the right mouse button.</para><para>You can "
+                                       "view the contents of a folder without leaving the current "
+                                       "location by clicking the region to the left of it. This way you can "
+                                       "view the contents of multiple folders in the same list.</para>"));
+
+    KSelectAction *viewModeActions = m_actionCollection->add<KSelectAction>(QStringLiteral("view_mode"));
+    viewModeActions->setText(i18nc("@action:intoolbar", "Change View Mode"));
+    viewModeActions->setWhatsThis(xi18nc("@info:whatsthis View Mode Toolbutton", "This cycles through all view modes."));

     viewModeActions->addAction(iconsAction);
     viewModeActions->addAction(compactAction);
     viewModeActions->addAction(detailsAction);
     viewModeActions->setToolBarMode(KSelectAction::MenuMode);
     viewModeActions->addAction(iconsAction);
     viewModeActions->addAction(compactAction);
     viewModeActions->addAction(detailsAction);
     viewModeActions->setToolBarMode(KSelectAction::MenuMode);

-    connect(viewModeActions, &KSelectAction::triggered, this, &DolphinViewActionHandler::slotViewModeActionTriggered);
+    viewModeActions->setToolButtonPopupMode(QToolButton::ToolButtonPopupMode::MenuButtonPopup);
+    connect(viewModeActions, &KSelectAction::actionTriggered, this, &DolphinViewActionHandler::slotViewModeActionTriggered);
+    connect(viewModeActions, &KSelectAction::triggered, this, [this, viewModeActions, iconsAction, compactAction, detailsAction]() {
+        // Loop through the actions when button is clicked
+        const auto currentAction = viewModeActions->currentAction();
+        if (currentAction == iconsAction) {
+            slotViewModeActionTriggered(compactAction);
+        } else if (currentAction == compactAction) {
+            slotViewModeActionTriggered(detailsAction);
+        } else if (currentAction == detailsAction) {
+            slotViewModeActionTriggered(iconsAction);
+        }
+    });

 
 

-    QAction* zoomInAction = KStandardAction::zoomIn(this,
-                            &DolphinViewActionHandler::zoomIn,
-                            m_actionCollection);
+    QAction *zoomInAction = KStandardAction::zoomIn(this, &DolphinViewActionHandler::zoomIn, m_actionCollection);

     zoomInAction->setWhatsThis(i18nc("@info:whatsthis zoom in", "This increases the icon size."));
 
     zoomInAction->setWhatsThis(i18nc("@info:whatsthis zoom in", "This increases the icon size."));
 

-    QAction* zoomResetAction = m_actionCollection->addAction(QStringLiteral("view_zoom_reset"));
+    QAction *zoomResetAction = m_actionCollection->addAction(QStringLiteral("view_zoom_reset"));

     zoomResetAction->setText(i18nc("@action:inmenu View", "Reset Zoom Level"));
     zoomResetAction->setToolTip(i18n("Zoom To Default"));
     zoomResetAction->setWhatsThis(i18nc("@info:whatsthis zoom reset", "This resets the icon size to default."));
     zoomResetAction->setText(i18nc("@action:inmenu View", "Reset Zoom Level"));
     zoomResetAction->setToolTip(i18n("Zoom To Default"));
     zoomResetAction->setWhatsThis(i18nc("@info:whatsthis zoom reset", "This resets the icon size to default."));


@@ -239,62 +249,57 @@ void DolphinViewActionHandler::createActions(SelectionMode::ActionTextHelper *ac
     m_actionCollection->setDefaultShortcuts(zoomResetAction, {Qt::CTRL | Qt::Key_0});
     connect(zoomResetAction, &QAction::triggered, this, &DolphinViewActionHandler::zoomReset);
 
     m_actionCollection->setDefaultShortcuts(zoomResetAction, {Qt::CTRL | Qt::Key_0});
     connect(zoomResetAction, &QAction::triggered, this, &DolphinViewActionHandler::zoomReset);
 

-    QAction* zoomOutAction = KStandardAction::zoomOut(this,
-                             &DolphinViewActionHandler::zoomOut,
-                             m_actionCollection);
+    QAction *zoomOutAction = KStandardAction::zoomOut(this, &DolphinViewActionHandler::zoomOut, m_actionCollection);

     zoomOutAction->setWhatsThis(i18nc("@info:whatsthis zoom out", "This reduces the icon size."));
 
     zoomOutAction->setWhatsThis(i18nc("@info:whatsthis zoom out", "This reduces the icon size."));
 

-    KActionMenu* zoomMenu = m_actionCollection->add<KActionMenu>(QStringLiteral("zoom"));
-    zoomMenu->setText(i18nc("@action:inmenu menu of zoom actions", "Zoom"));
-    zoomMenu->setIcon(QIcon::fromTheme(QStringLiteral("zoom")));
-    zoomMenu->setPopupMode(QToolButton::InstantPopup);
-    zoomMenu->addAction(zoomInAction);
-    zoomMenu->addAction(zoomResetAction);
-    zoomMenu->addAction(zoomOutAction);
+    ZoomWidgetAction *zoomWidgetAction = new ZoomWidgetAction(zoomInAction, zoomResetAction, zoomOutAction, m_actionCollection);
+    m_actionCollection->addAction(QStringLiteral("zoom"), zoomWidgetAction);

 
 

-    KToggleAction* showPreview = m_actionCollection->add<KToggleAction>(QStringLiteral("show_preview"));
+    KToggleAction *showPreview = m_actionCollection->add<KToggleAction>(QStringLiteral("show_preview"));

     showPreview->setText(i18nc("@action:intoolbar", "Show Previews"));
     showPreview->setToolTip(i18nc("@info", "Show preview of files and folders"));
     showPreview->setText(i18nc("@action:intoolbar", "Show Previews"));
     showPreview->setToolTip(i18nc("@info", "Show preview of files and folders"));

-    showPreview->setWhatsThis(xi18nc("@info:whatsthis", "When this is "
-        "enabled, the icons are based on the actual file or folder "
-        "contents.<nl/>For example the icons of images become scaled "
-        "down versions of the images."));
+    showPreview->setWhatsThis(xi18nc("@info:whatsthis",
+                                     "When this is "
+                                     "enabled, the icons are based on the actual file or folder "
+                                     "contents.<nl/>For example the icons of images become scaled "
+                                     "down versions of the images."));

     showPreview->setIcon(QIcon::fromTheme(QStringLiteral("view-preview")));
     showPreview->setIcon(QIcon::fromTheme(QStringLiteral("view-preview")));

+    m_actionCollection->setDefaultShortcut(showPreview, QKeySequence(Qt::Key_F12));

     connect(showPreview, &KToggleAction::triggered, this, &DolphinViewActionHandler::togglePreview);
 
     connect(showPreview, &KToggleAction::triggered, this, &DolphinViewActionHandler::togglePreview);
 

-    KToggleAction* sortFoldersFirst = m_actionCollection->add<KToggleAction>(QStringLiteral("folders_first"));
+    KToggleAction *sortFoldersFirst = m_actionCollection->add<KToggleAction>(QStringLiteral("folders_first"));

     sortFoldersFirst->setText(i18nc("@action:inmenu Sort", "Folders First"));
     connect(sortFoldersFirst, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleSortFoldersFirst);
 
     sortFoldersFirst->setText(i18nc("@action:inmenu Sort", "Folders First"));
     connect(sortFoldersFirst, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleSortFoldersFirst);
 

-    KToggleAction* sortHiddenLast = m_actionCollection->add<KToggleAction>(QStringLiteral("hidden_last"));
+    KToggleAction *sortHiddenLast = m_actionCollection->add<KToggleAction>(QStringLiteral("hidden_last"));

     sortHiddenLast->setText(i18nc("@action:inmenu Sort", "Hidden Files Last"));
     connect(sortHiddenLast, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleSortHiddenLast);
 
     // View -> Sort By
     sortHiddenLast->setText(i18nc("@action:inmenu Sort", "Hidden Files Last"));
     connect(sortHiddenLast, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleSortHiddenLast);
 
     // View -> Sort By

-    QActionGroup* sortByActionGroup = createFileItemRolesActionGroup(QStringLiteral("sort_by_"));
+    QActionGroup *sortByActionGroup = createFileItemRolesActionGroup(QStringLiteral("sort_by_"));

 
 

-    KActionMenu* sortByActionMenu = m_actionCollection->add<KActionMenu>(QStringLiteral("sort"));
+    KActionMenu *sortByActionMenu = m_actionCollection->add<KActionMenu>(QStringLiteral("sort"));

     sortByActionMenu->setIcon(QIcon::fromTheme(QStringLiteral("view-sort")));
     sortByActionMenu->setText(i18nc("@action:inmenu View", "Sort By"));
     sortByActionMenu->setPopupMode(QToolButton::InstantPopup);
 
     const auto sortByActionGroupActions = sortByActionGroup->actions();
     sortByActionMenu->setIcon(QIcon::fromTheme(QStringLiteral("view-sort")));
     sortByActionMenu->setText(i18nc("@action:inmenu View", "Sort By"));
     sortByActionMenu->setPopupMode(QToolButton::InstantPopup);
 
     const auto sortByActionGroupActions = sortByActionGroup->actions();

-    for (QAction* action : sortByActionGroupActions) {
+    for (QAction *action : sortByActionGroupActions) {

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

-    QActionGroup* group = new QActionGroup(sortByActionMenu);
+    QActionGroup *group = new QActionGroup(sortByActionMenu);

     group->setExclusive(true);
 
     group->setExclusive(true);
 

-    KToggleAction* ascendingAction = m_actionCollection->add<KToggleAction>(QStringLiteral("ascending"));
+    KToggleAction *ascendingAction = m_actionCollection->add<KToggleAction>(QStringLiteral("ascending"));

     ascendingAction->setActionGroup(group);
     connect(ascendingAction, &QAction::triggered, this, [this] {
         m_currentView->setSortOrder(Qt::AscendingOrder);
     });
 
     ascendingAction->setActionGroup(group);
     connect(ascendingAction, &QAction::triggered, this, [this] {
         m_currentView->setSortOrder(Qt::AscendingOrder);
     });
 

-    KToggleAction* descendingAction = m_actionCollection->add<KToggleAction>(QStringLiteral("descending"));
+    KToggleAction *descendingAction = m_actionCollection->add<KToggleAction>(QStringLiteral("descending"));

     descendingAction->setActionGroup(group);
     connect(descendingAction, &QAction::triggered, this, [this] {
         m_currentView->setSortOrder(Qt::DescendingOrder);
     descendingAction->setActionGroup(group);
     connect(descendingAction, &QAction::triggered, this, [this] {
         m_currentView->setSortOrder(Qt::DescendingOrder);


@@ -307,62 +312,86 @@ void DolphinViewActionHandler::createActions(SelectionMode::ActionTextHelper *ac
     sortByActionMenu->addAction(sortHiddenLast);
 
     // View -> Additional Information
     sortByActionMenu->addAction(sortHiddenLast);
 
     // View -> Additional Information

-    QActionGroup* visibleRolesGroup = createFileItemRolesActionGroup(QStringLiteral("show_"));
+    QActionGroup *visibleRolesGroup = createFileItemRolesActionGroup(QStringLiteral("show_"));

 
 

-    KActionMenu* visibleRolesMenu = m_actionCollection->add<KActionMenu>(QStringLiteral("additional_info"));
+    KActionMenu *visibleRolesMenu = m_actionCollection->add<KActionMenu>(QStringLiteral("additional_info"));

     visibleRolesMenu->setText(i18nc("@action:inmenu View", "Show Additional Information"));
     visibleRolesMenu->setIcon(QIcon::fromTheme(QStringLiteral("documentinfo")));
     visibleRolesMenu->setPopupMode(QToolButton::InstantPopup);
 
     const auto visibleRolesGroupActions = visibleRolesGroup->actions();
     visibleRolesMenu->setText(i18nc("@action:inmenu View", "Show Additional Information"));
     visibleRolesMenu->setIcon(QIcon::fromTheme(QStringLiteral("documentinfo")));
     visibleRolesMenu->setPopupMode(QToolButton::InstantPopup);
 
     const auto visibleRolesGroupActions = visibleRolesGroup->actions();

-    for (QAction* action : visibleRolesGroupActions) {
+    for (QAction *action : visibleRolesGroupActions) {

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

-    KToggleAction* showInGroups = m_actionCollection->add<KToggleAction>(QStringLiteral("show_in_groups"));
+    KToggleAction *showInGroups = m_actionCollection->add<KToggleAction>(QStringLiteral("show_in_groups"));

     showInGroups->setIcon(QIcon::fromTheme(QStringLiteral("view-group")));
     showInGroups->setText(i18nc("@action:inmenu View", "Show in Groups"));
     showInGroups->setWhatsThis(i18nc("@info:whatsthis", "This groups files and folders by their first letter."));
     connect(showInGroups, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleGroupedSorting);
 
     showInGroups->setIcon(QIcon::fromTheme(QStringLiteral("view-group")));
     showInGroups->setText(i18nc("@action:inmenu View", "Show in Groups"));
     showInGroups->setWhatsThis(i18nc("@info:whatsthis", "This groups files and folders by their first letter."));
     connect(showInGroups, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleGroupedSorting);
 

-    KToggleAction* showHiddenFiles = m_actionCollection->add<KToggleAction>(QStringLiteral("show_hidden_files"));
+    KToggleAction *showHiddenFiles = m_actionCollection->add<KToggleAction>(QStringLiteral("show_hidden_files"));

     showHiddenFiles->setIcon(QIcon::fromTheme(QStringLiteral("view-visible")));
     showHiddenFiles->setText(i18nc("@action:inmenu View", "Show Hidden Files"));
     showHiddenFiles->setIcon(QIcon::fromTheme(QStringLiteral("view-visible")));
     showHiddenFiles->setText(i18nc("@action:inmenu View", "Show Hidden Files"));

-    showHiddenFiles->setWhatsThis(xi18nc("@info:whatsthis", "<para>When "
-        "this is enabled <emphasis>hidden</emphasis> files and folders "
-        "are visible. They will be displayed semi-transparent.</para>"
-        "<para>Hidden items only differ from other ones in that their "
-        "name starts with a \".\". In general there is no need for "
-        "users to access them which is why they are hidden.</para>"));
+    showHiddenFiles->setWhatsThis(xi18nc("@info:whatsthis",
+                                         "<para>When "
+                                         "this is enabled, <emphasis>hidden</emphasis> files and folders "
+                                         "are visible. They will be displayed semi-transparent.</para>"
+                                         "<para>Hidden items only differ from normal ones in that their "
+                                         "name starts with a dot (\".\"). Typically, there is no need for "
+                                         "users to access them, which is why they are hidden.</para>"
+                                         "<para>Items can also be hidden if their names are listed in a text file "
+                                         "named \".hidden\". Files with the \"application/x-trash\" MIME type, "
+                                         "such as backup files, can also be hidden by enabling that setting in "
+                                         "Configure Dolphin > View > General.</para>"));

     m_actionCollection->setDefaultShortcuts(showHiddenFiles, KStandardShortcut::showHideHiddenFiles());
     connect(showHiddenFiles, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleShowHiddenFiles);
 
     m_actionCollection->setDefaultShortcuts(showHiddenFiles, KStandardShortcut::showHideHiddenFiles());
     connect(showHiddenFiles, &KToggleAction::triggered, this, &DolphinViewActionHandler::toggleShowHiddenFiles);
 

-    QAction* adjustViewProps = m_actionCollection->addAction(QStringLiteral("view_properties"));
-    adjustViewProps->setText(i18nc("@action:inmenu View", "Adjust View Display Style..."));
+    QAction *adjustViewProps = m_actionCollection->addAction(QStringLiteral("view_properties"));
+    adjustViewProps->setText(i18nc("@action:inmenu View", "Adjust View Display Style…"));

     adjustViewProps->setIcon(QIcon::fromTheme(QStringLiteral("view-choose")));
     adjustViewProps->setIcon(QIcon::fromTheme(QStringLiteral("view-choose")));

-    adjustViewProps->setWhatsThis(i18nc("@info:whatsthis", "This opens a window "
-        "in which all folder view properties can be adjusted."));
+    adjustViewProps->setWhatsThis(i18nc("@info:whatsthis",
+                                        "This opens a window "
+                                        "in which all folder view properties can be adjusted."));

     connect(adjustViewProps, &QAction::triggered, this, &DolphinViewActionHandler::slotAdjustViewProperties);
     connect(adjustViewProps, &QAction::triggered, this, &DolphinViewActionHandler::slotAdjustViewProperties);

+
+    // View settings: the dropdown menu contains various view-related actions
+    KActionMenu *viewSettings = m_actionCollection->add<KActionMenu>(QStringLiteral("view_settings"));
+    viewSettings->setText(i18nc("@action:intoolbar", "View Settings"));
+    viewSettings->setWhatsThis(
+        xi18nc("@info:whatsthis View Settings Toolbutton", "This cycles through all view modes. The dropdown menu contains various view-related actions."));
+    const auto actions = viewModeActions->actions();
+    for (QAction *action : actions) {
+        viewSettings->addAction(action);
+    }
+    viewSettings->addSeparator();
+    viewSettings->addAction(zoomWidgetAction);
+    viewSettings->addAction(sortByActionMenu);
+    viewSettings->addAction(visibleRolesMenu);
+    viewSettings->addAction(showPreview);
+    viewSettings->addAction(showInGroups);
+    viewSettings->addAction(showHiddenFiles);
+    viewSettings->addAction(adjustViewProps);
+    viewSettings->setPopupMode(QToolButton::ToolButtonPopupMode::MenuButtonPopup);
+    connect(viewSettings, &KActionMenu::triggered, viewModeActions, &KSelectAction::triggered);

 }
 
 }
 

-QActionGroup* DolphinViewActionHandler::createFileItemRolesActionGroup(const QString& groupPrefix)
+QActionGroup *DolphinViewActionHandler::createFileItemRolesActionGroup(const QString &groupPrefix)

 {
     const bool isSortGroup = (groupPrefix == QLatin1String("sort_by_"));
     Q_ASSERT(isSortGroup || groupPrefix == QLatin1String("show_"));
 
 {
     const bool isSortGroup = (groupPrefix == QLatin1String("sort_by_"));
     Q_ASSERT(isSortGroup || groupPrefix == QLatin1String("show_"));
 

-    QActionGroup* rolesActionGroup = new QActionGroup(m_actionCollection);
+    QActionGroup *rolesActionGroup = new QActionGroup(m_actionCollection);

     rolesActionGroup->setExclusive(isSortGroup);
     if (isSortGroup) {
     rolesActionGroup->setExclusive(isSortGroup);
     if (isSortGroup) {

-        connect(rolesActionGroup, &QActionGroup::triggered,
-                this, &DolphinViewActionHandler::slotSortTriggered);
+        connect(rolesActionGroup, &QActionGroup::triggered, this, &DolphinViewActionHandler::slotSortTriggered);

     } else {
     } else {

-        connect(rolesActionGroup, &QActionGroup::triggered,
-                this, &DolphinViewActionHandler::toggleVisibleRole);
+        connect(rolesActionGroup, &QActionGroup::triggered, this, &DolphinViewActionHandler::toggleVisibleRole);

     }
 
     QString groupName;
     }
 
     QString groupName;

-    KActionMenu* groupMenu = nullptr;
-    QActionGroup* groupMenuGroup = nullptr;
+    KActionMenu *groupMenu = nullptr;
+    QActionGroup *groupMenuGroup = nullptr;

 
     bool indexingEnabled = false;
 #if HAVE_BALOO
 
     bool indexingEnabled = false;
 #if HAVE_BALOO


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

-    for (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;
         }
 

-        KToggleAction* action = nullptr;
+        KToggleAction *action = nullptr;

         const QString name = groupPrefix + info.role;
         if (info.group.isEmpty()) {
             action = m_actionCollection->add<KToggleAction>(name);
         const QString name = groupPrefix + info.role;
         if (info.group.isEmpty()) {
             action = m_actionCollection->add<KToggleAction>(name);


@@ -392,11 +421,9 @@ QActionGroup* DolphinViewActionHandler::createFileItemRolesActionGroup(const QSt
                 groupMenuGroup = new QActionGroup(groupMenu);
                 groupMenuGroup->setExclusive(isSortGroup);
                 if (isSortGroup) {
                 groupMenuGroup = new QActionGroup(groupMenu);
                 groupMenuGroup->setExclusive(isSortGroup);
                 if (isSortGroup) {

-                    connect(groupMenuGroup, &QActionGroup::triggered,
-                            this, &DolphinViewActionHandler::slotSortTriggered);
+                    connect(groupMenuGroup, &QActionGroup::triggered, this, &DolphinViewActionHandler::slotSortTriggered);

                 } else {
                 } else {

-                    connect(groupMenuGroup, &QActionGroup::triggered,
-                            this, &DolphinViewActionHandler::toggleVisibleRole);
+                    connect(groupMenuGroup, &QActionGroup::triggered, this, &DolphinViewActionHandler::toggleVisibleRole);

                 }
             }
 
                 }
             }
 


@@ -407,9 +434,7 @@ QActionGroup* DolphinViewActionHandler::createFileItemRolesActionGroup(const QSt
         action->setText(info.translation);
         action->setData(info.role);
 
         action->setText(info.translation);
         action->setData(info.role);
 

-        const bool enable = (!info.requiresBaloo && !info.requiresIndexer) ||
-                            (info.requiresBaloo) ||
-                            (info.requiresIndexer && indexingEnabled);
+        const bool enable = (!info.requiresBaloo && !info.requiresIndexer) || (info.requiresBaloo) || (info.requiresIndexer && indexingEnabled);

         action->setEnabled(enable);
 
         if (isSortGroup) {
         action->setEnabled(enable);
 
         if (isSortGroup) {


@@ -422,44 +447,48 @@ QActionGroup* DolphinViewActionHandler::createFileItemRolesActionGroup(const QSt
     return rolesActionGroup;
 }
 
     return rolesActionGroup;
 }
 

-void DolphinViewActionHandler::slotViewModeActionTriggered(QAction* action)
+void DolphinViewActionHandler::slotViewModeActionTriggered(QAction *action)

 {
     const DolphinView::Mode mode = action->data().value<DolphinView::Mode>();
     m_currentView->setViewMode(mode);
 
 {
     const DolphinView::Mode mode = action->data().value<DolphinView::Mode>();
     m_currentView->setViewMode(mode);
 

-    QAction* viewModeMenu = m_actionCollection->action(QStringLiteral("view_mode"));
+    QAction *viewModeMenu = m_actionCollection->action(QStringLiteral("view_mode"));

     viewModeMenu->setIcon(action->icon());
     viewModeMenu->setIcon(action->icon());

+
+    QAction *viewSettingsAction = m_actionCollection->action(QStringLiteral("view_settings"));
+    viewSettingsAction->setIcon(action->icon());

 }
 
 void DolphinViewActionHandler::slotRename()
 {
     if (m_currentView->selectedItemsCount() == 0) {
 }
 
 void DolphinViewActionHandler::slotRename()
 {
     if (m_currentView->selectedItemsCount() == 0) {

-        Q_EMIT setSelectionMode(true, SelectionMode::BottomBar::Contents::RenameContents);
+        Q_EMIT selectionModeChangeTriggered(true, SelectionMode::BottomBar::Contents::RenameContents);

     } else {
         Q_EMIT actionBeingHandled();
         m_currentView->renameSelectedItems();
     } else {
         Q_EMIT actionBeingHandled();
         m_currentView->renameSelectedItems();

+        // We don't exit selectionMode here because users might want to rename more items.

     }
 }
 
 void DolphinViewActionHandler::slotTrashActivated()
 {
     if (m_currentView->selectedItemsCount() == 0) {
     }
 }
 
 void DolphinViewActionHandler::slotTrashActivated()
 {
     if (m_currentView->selectedItemsCount() == 0) {

-        Q_EMIT setSelectionMode(true, SelectionMode::BottomBar::Contents::MoveToTrashContents);
+        Q_EMIT selectionModeChangeTriggered(true, SelectionMode::BottomBar::Contents::MoveToTrashContents);

     } else {
         Q_EMIT actionBeingHandled();
         m_currentView->trashSelectedItems();
     } else {
         Q_EMIT actionBeingHandled();
         m_currentView->trashSelectedItems();

-        Q_EMIT setSelectionMode(false);
+        Q_EMIT selectionModeChangeTriggered(false);

     }
 }
 
 void DolphinViewActionHandler::slotDeleteItems()
 {
     if (m_currentView->selectedItemsCount() == 0) {
     }
 }
 
 void DolphinViewActionHandler::slotDeleteItems()
 {
     if (m_currentView->selectedItemsCount() == 0) {

-        Q_EMIT setSelectionMode(true, SelectionMode::BottomBar::Contents::DeleteContents);
+        Q_EMIT selectionModeChangeTriggered(true, SelectionMode::BottomBar::Contents::DeleteContents);

     } else {
         Q_EMIT actionBeingHandled();
         m_currentView->deleteSelectedItems();
     } else {
         Q_EMIT actionBeingHandled();
         m_currentView->deleteSelectedItems();

-        Q_EMIT setSelectionMode(false);
+        Q_EMIT selectionModeChangeTriggered(false);

     }
 }
 
     }
 }
 


@@ -493,22 +522,25 @@ QString DolphinViewActionHandler::currentViewModeActionName() const
     return QString(); // can't happen
 }
 
     return QString(); // can't happen
 }
 

-KActionCollection* DolphinViewActionHandler::actionCollection()
+KActionCollection *DolphinViewActionHandler::actionCollection()

 {
     return m_actionCollection;
 }
 
 void DolphinViewActionHandler::updateViewActions()
 {
 {
     return m_actionCollection;
 }
 
 void DolphinViewActionHandler::updateViewActions()
 {

-    QAction* viewModeAction = m_actionCollection->action(currentViewModeActionName());
+    QAction *viewModeAction = m_actionCollection->action(currentViewModeActionName());

     if (viewModeAction) {
         viewModeAction->setChecked(true);
 
     if (viewModeAction) {
         viewModeAction->setChecked(true);
 

-        QAction* viewModeMenu = m_actionCollection->action(QStringLiteral("view_mode"));
+        QAction *viewModeMenu = m_actionCollection->action(QStringLiteral("view_mode"));

         viewModeMenu->setIcon(viewModeAction->icon());
         viewModeMenu->setIcon(viewModeAction->icon());

+
+        QAction *viewSettingsAction = m_actionCollection->action(QStringLiteral("view_settings"));
+        viewSettingsAction->setIcon(viewModeAction->icon());

     }
 
     }
 

-    QAction* showPreviewAction = m_actionCollection->action(QStringLiteral("show_preview"));
+    QAction *showPreviewAction = m_actionCollection->action(QStringLiteral("show_preview"));

     showPreviewAction->setChecked(m_currentView->previewsShown());
 
     slotSortOrderChanged(m_currentView->sortOrder());
     showPreviewAction->setChecked(m_currentView->previewsShown());
 
     slotSortOrderChanged(m_currentView->sortOrder());


@@ -557,8 +589,8 @@ void DolphinViewActionHandler::toggleSortHiddenLast()
 
 void DolphinViewActionHandler::slotSortOrderChanged(Qt::SortOrder order)
 {
 
 void DolphinViewActionHandler::slotSortOrderChanged(Qt::SortOrder order)
 {

-    QAction* descending = m_actionCollection->action(QStringLiteral("descending"));
-    QAction* ascending = m_actionCollection->action(QStringLiteral("ascending"));
+    QAction *descending = m_actionCollection->action(QStringLiteral("descending"));
+    QAction *ascending = m_actionCollection->action(QStringLiteral("ascending"));

     const bool sortDescending = (order == Qt::DescendingOrder);
     descending->setChecked(sortDescending);
     ascending->setChecked(!sortDescending);
     const bool sortDescending = (order == Qt::DescendingOrder);
     descending->setChecked(sortDescending);
     ascending->setChecked(!sortDescending);


@@ -574,7 +606,7 @@ void DolphinViewActionHandler::slotSortHiddenLastChanged(bool hiddenLast)
     m_actionCollection->action(QStringLiteral("hidden_last"))->setChecked(hiddenLast);
 }
 
     m_actionCollection->action(QStringLiteral("hidden_last"))->setChecked(hiddenLast);
 }
 

-void DolphinViewActionHandler::toggleVisibleRole(QAction* action)
+void DolphinViewActionHandler::toggleVisibleRole(QAction *action)

 {
     Q_EMIT actionBeingHandled();
 
 {
     Q_EMIT actionBeingHandled();
 


@@ -596,17 +628,16 @@ void DolphinViewActionHandler::toggleVisibleRole(QAction* action)
     }
 }
 
     }
 }
 

-void DolphinViewActionHandler::slotVisibleRolesChanged(const QList<QByteArray>& current,
-                                                       const QList<QByteArray>& previous)
+void DolphinViewActionHandler::slotVisibleRolesChanged(const QList<QByteArray> &current, const QList<QByteArray> &previous)

 {
     Q_UNUSED(previous)
 
     const auto checkedRoles = QSet<QByteArray>(current.constBegin(), current.constEnd());
 {
     Q_UNUSED(previous)
 
     const auto checkedRoles = QSet<QByteArray>(current.constBegin(), current.constEnd());

-    QHashIterator<QByteArray, KToggleAction*> it(m_visibleRoles);
+    QHashIterator<QByteArray, KToggleAction *> it(m_visibleRoles);

     while (it.hasNext()) {
         it.next();
     while (it.hasNext()) {
         it.next();

-        const QByteArray& role = it.key();
-        KToggleAction* action = it.value();
+        const QByteArray &role = it.key();
+        KToggleAction *action = it.value();

         action->setChecked(checkedRoles.contains(role));
     }
 }
         action->setChecked(checkedRoles.contains(role));
     }
 }


@@ -618,7 +649,7 @@ void DolphinViewActionHandler::toggleGroupedSorting(bool grouped)
 
 void DolphinViewActionHandler::slotGroupedSortingChanged(bool groupedSorting)
 {
 
 void DolphinViewActionHandler::slotGroupedSortingChanged(bool groupedSorting)
 {

-    QAction* showInGroupsAction = m_actionCollection->action(QStringLiteral("show_in_groups"));
+    QAction *showInGroupsAction = m_actionCollection->action(QStringLiteral("show_in_groups"));

     showInGroupsAction->setChecked(groupedSorting);
 }
 
     showInGroupsAction->setChecked(groupedSorting);
 }
 


@@ -630,19 +661,20 @@ void DolphinViewActionHandler::toggleShowHiddenFiles(bool show)
 
 void DolphinViewActionHandler::slotHiddenFilesShownChanged(bool shown)
 {
 
 void DolphinViewActionHandler::slotHiddenFilesShownChanged(bool shown)
 {

-    QAction* showHiddenFilesAction = m_actionCollection->action(QStringLiteral("show_hidden_files"));
+    QAction *showHiddenFilesAction = m_actionCollection->action(QStringLiteral("show_hidden_files"));

     showHiddenFilesAction->setChecked(shown);
 }
 
 void DolphinViewActionHandler::slotWriteStateChanged(bool isFolderWritable)
 {
     showHiddenFilesAction->setChecked(shown);
 }
 
 void DolphinViewActionHandler::slotWriteStateChanged(bool isFolderWritable)
 {

-    m_actionCollection->action(QStringLiteral("create_dir"))->setEnabled(isFolderWritable &&
-                                                                         KProtocolManager::supportsMakeDir(currentView()->url()));
+    const bool supportsMakeDir = KProtocolManager::supportsMakeDir(currentView()->url());
+    m_actionCollection->action(QStringLiteral("create_dir"))->setEnabled(isFolderWritable && supportsMakeDir);
+    m_actionCollection->action(QStringLiteral("create_file"))->setEnabled(isFolderWritable);

 }
 
 }
 

-KToggleAction* DolphinViewActionHandler::iconsModeAction()
+KToggleAction *DolphinViewActionHandler::iconsModeAction()

 {
 {

-    KToggleAction* iconsView = m_actionCollection->add<KToggleAction>(QStringLiteral("icons"));
+    KToggleAction *iconsView = m_actionCollection->add<KToggleAction>(QStringLiteral("icons"));

     iconsView->setText(i18nc("@action:inmenu View Mode", "Icons"));
     iconsView->setToolTip(i18nc("@info", "Icons view mode"));
     m_actionCollection->setDefaultShortcut(iconsView, Qt::CTRL | Qt::Key_1);
     iconsView->setText(i18nc("@action:inmenu View Mode", "Icons"));
     iconsView->setToolTip(i18nc("@info", "Icons view mode"));
     m_actionCollection->setDefaultShortcut(iconsView, Qt::CTRL | Qt::Key_1);


@@ -651,9 +683,9 @@ KToggleAction* DolphinViewActionHandler::iconsModeAction()
     return iconsView;
 }
 
     return iconsView;
 }
 

-KToggleAction* DolphinViewActionHandler::compactModeAction()
+KToggleAction *DolphinViewActionHandler::compactModeAction()

 {
 {

-    KToggleAction* iconsView = m_actionCollection->add<KToggleAction>(QStringLiteral("compact"));
+    KToggleAction *iconsView = m_actionCollection->add<KToggleAction>(QStringLiteral("compact"));

     iconsView->setText(i18nc("@action:inmenu View Mode", "Compact"));
     iconsView->setToolTip(i18nc("@info", "Compact view mode"));
     m_actionCollection->setDefaultShortcut(iconsView, Qt::CTRL | Qt::Key_2);
     iconsView->setText(i18nc("@action:inmenu View Mode", "Compact"));
     iconsView->setToolTip(i18nc("@info", "Compact view mode"));
     m_actionCollection->setDefaultShortcut(iconsView, Qt::CTRL | Qt::Key_2);


@@ -662,9 +694,9 @@ KToggleAction* DolphinViewActionHandler::compactModeAction()
     return iconsView;
 }
 
     return iconsView;
 }
 

-KToggleAction* DolphinViewActionHandler::detailsModeAction()
+KToggleAction *DolphinViewActionHandler::detailsModeAction()

 {
 {

-    KToggleAction* detailsView = m_actionCollection->add<KToggleAction>(QStringLiteral("details"));
+    KToggleAction *detailsView = m_actionCollection->add<KToggleAction>(QStringLiteral("details"));

     detailsView->setText(i18nc("@action:inmenu View Mode", "Details"));
     detailsView->setToolTip(i18nc("@info", "Details view mode"));
     m_actionCollection->setDefaultShortcut(detailsView, Qt::CTRL | Qt::Key_3);
     detailsView->setText(i18nc("@action:inmenu View Mode", "Details"));
     detailsView->setToolTip(i18nc("@info", "Details view mode"));
     m_actionCollection->setDefaultShortcut(detailsView, Qt::CTRL | Qt::Key_3);


@@ -673,20 +705,20 @@ KToggleAction* DolphinViewActionHandler::detailsModeAction()
     return detailsView;
 }
 
     return detailsView;
 }
 

-void DolphinViewActionHandler::slotSortRoleChanged(const QByteArray& role)
+void DolphinViewActionHandler::slotSortRoleChanged(const QByteArray &role)

 {
 {

-    KToggleAction* action = m_sortByActions.value(role);
+    KToggleAction *action = m_sortByActions.value(role);

     if (action) {
         action->setChecked(true);
 
         if (!action->icon().isNull()) {
     if (action) {
         action->setChecked(true);
 
         if (!action->icon().isNull()) {

-            QAction* sortByMenu = m_actionCollection->action(QStringLiteral("sort"));
+            QAction *sortByMenu = m_actionCollection->action(QStringLiteral("sort"));

             sortByMenu->setIcon(action->icon());
         }
     }
 
             sortByMenu->setIcon(action->icon());
         }
     }
 

-    QAction* descending = m_actionCollection->action(QStringLiteral("descending"));
-    QAction* ascending = m_actionCollection->action(QStringLiteral("ascending"));
+    QAction *descending = m_actionCollection->action(QStringLiteral("descending"));
+    QAction *ascending = m_actionCollection->action(QStringLiteral("ascending"));

 
     if (role == "text" || role == "type" || role == "extension" || role == "tags" || role == "comment") {
         descending->setText(i18nc("Sort descending", "Z-A"));
 
     if (role == "text" || role == "type" || role == "extension" || role == "tags" || role == "comment") {
         descending->setText(i18nc("Sort descending", "Z-A"));


@@ -712,18 +744,18 @@ void DolphinViewActionHandler::slotZoomLevelChanged(int current, int previous)
 {
     Q_UNUSED(previous)
 
 {
     Q_UNUSED(previous)
 

-    QAction* zoomInAction = m_actionCollection->action(KStandardAction::name(KStandardAction::ZoomIn));
+    QAction *zoomInAction = m_actionCollection->action(KStandardAction::name(KStandardAction::ZoomIn));

     if (zoomInAction) {
         zoomInAction->setEnabled(current < ZoomLevelInfo::maximumLevel());
     }
 
     if (zoomInAction) {
         zoomInAction->setEnabled(current < ZoomLevelInfo::maximumLevel());
     }
 

-    QAction* zoomOutAction = m_actionCollection->action(KStandardAction::name(KStandardAction::ZoomOut));
+    QAction *zoomOutAction = m_actionCollection->action(KStandardAction::name(KStandardAction::ZoomOut));

     if (zoomOutAction) {
         zoomOutAction->setEnabled(current > ZoomLevelInfo::minimumLevel());
     }
 }
 
     if (zoomOutAction) {
         zoomOutAction->setEnabled(current > ZoomLevelInfo::minimumLevel());
     }
 }
 

-void DolphinViewActionHandler::slotSortTriggered(QAction* action)
+void DolphinViewActionHandler::slotSortTriggered(QAction *action)

 {
     // The radiobuttons of the "Sort By"-menu are split between the main-menu
     // and several sub-menus. Because of this they don't have a common
 {
     // The radiobuttons of the "Sort By"-menu are split between the main-menu
     // and several sub-menus. Because of this they don't have a common


@@ -731,11 +763,11 @@ void DolphinViewActionHandler::slotSortTriggered(QAction* action)
     // actions and the sub-menu-actions. If an action gets checked, it must
     // be assured that all other actions get unchecked, except the ascending/
     // descending actions
     // actions and the sub-menu-actions. If an action gets checked, it must
     // be assured that all other actions get unchecked, except the ascending/
     // descending actions

-    for (QAction *groupAction : qAsConst(m_sortByActions)) {
-        KActionMenu* actionMenu = qobject_cast<KActionMenu*>(groupAction);
+    for (QAction *groupAction : std::as_const(m_sortByActions)) {
+        KActionMenu *actionMenu = qobject_cast<KActionMenu *>(groupAction);

         if (actionMenu) {
             const auto actions = actionMenu->menu()->actions();
         if (actionMenu) {
             const auto actions = actionMenu->menu()->actions();

-            for (QAction* subAction : actions) {
+            for (QAction *subAction : actions) {

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


@@ -760,17 +792,17 @@ void DolphinViewActionHandler::slotAdjustViewProperties()
 void DolphinViewActionHandler::slotDuplicate()
 {
     if (m_currentView->selectedItemsCount() == 0) {
 void DolphinViewActionHandler::slotDuplicate()
 {
     if (m_currentView->selectedItemsCount() == 0) {

-        Q_EMIT setSelectionMode(true, SelectionMode::BottomBar::Contents::DuplicateContents);
+        Q_EMIT selectionModeChangeTriggered(true, SelectionMode::BottomBar::Contents::DuplicateContents);

     } else {
         Q_EMIT actionBeingHandled();
         m_currentView->duplicateSelectedItems();
     } else {
         Q_EMIT actionBeingHandled();
         m_currentView->duplicateSelectedItems();

-        Q_EMIT setSelectionMode(false);
+        Q_EMIT selectionModeChangeTriggered(false);

     }
 }
 
 void DolphinViewActionHandler::slotProperties()
 {
     }
 }
 
 void DolphinViewActionHandler::slotProperties()
 {

-    KPropertiesDialog* dialog = nullptr;
+    KPropertiesDialog *dialog = nullptr;

     const KFileItemList list = m_currentView->selectedItems();
     if (list.isEmpty()) {
         const QUrl url = m_currentView->url();
     const KFileItemList list = m_currentView->selectedItems();
     if (list.isEmpty()) {
         const QUrl url = m_currentView->url();


@@ -788,21 +820,21 @@ void DolphinViewActionHandler::slotProperties()
 void DolphinViewActionHandler::slotCopyPath()
 {
     if (m_currentView->selectedItemsCount() == 0) {
 void DolphinViewActionHandler::slotCopyPath()
 {
     if (m_currentView->selectedItemsCount() == 0) {

-        Q_EMIT setSelectionMode(true, SelectionMode::BottomBar::Contents::CopyLocationContents);
+        Q_EMIT selectionModeChangeTriggered(true, SelectionMode::BottomBar::Contents::CopyLocationContents);

     } else {
         m_currentView->copyPathToClipboard();
     } else {
         m_currentView->copyPathToClipboard();

-        Q_EMIT setSelectionMode(false);
+        Q_EMIT selectionModeChangeTriggered(false);

     }
 }
 
     }
 }
 

-void DolphinViewActionHandler::slotSelectionChanged(const KFileItemList& selection)
+void DolphinViewActionHandler::slotSelectionChanged(const KFileItemList &selection)

 {
     QString basicActionsMenuText;
     if (selection.isEmpty()) {
 {
     QString basicActionsMenuText;
     if (selection.isEmpty()) {

-        basicActionsMenuText =
-            i18nc("@action:inmenu menu with actions like copy, paste, rename. The user's selection is empty when this text is shown.",
-                  "Actions for Current View");
+        basicActionsMenuText = i18nc("@action:inmenu menu with actions like copy, paste, rename. The user's selection is empty when this text is shown.",
+                                     "Actions for Current View");

     } else {
     } else {

+        // clang-format off

         QFontMetrics fontMetrics = QMenu().fontMetrics();
         // i18n: @action:inmenu menu with actions like copy, paste, rename.
         // %1 is a textual representation of the currently selected files or folders. This can be the name of
         QFontMetrics fontMetrics = QMenu().fontMetrics();
         // i18n: @action:inmenu menu with actions like copy, paste, rename.
         // %1 is a textual representation of the currently selected files or folders. This can be the name of


@@ -810,13 +842,15 @@ void DolphinViewActionHandler::slotSelectionChanged(const KFileItemList& selecti
         // If this sort of word puzzle can not be correctly translated in your language, translate it as "NULL" (without the quotes)
         // and a fallback will be used.
         basicActionsMenuText = i18n("Actions for %1", fileItemListToString(selection, fontMetrics.averageCharWidth() * 40, fontMetrics, ItemsState::Selected));
         // If this sort of word puzzle can not be correctly translated in your language, translate it as "NULL" (without the quotes)
         // and a fallback will be used.
         basicActionsMenuText = i18n("Actions for %1", fileItemListToString(selection, fontMetrics.averageCharWidth() * 40, fontMetrics, ItemsState::Selected));

+        // clang-format on

     }
 
     if (basicActionsMenuText == QStringLiteral("NULL")) {
         const KFileItemListProperties properties(selection);
     }
 
     if (basicActionsMenuText == QStringLiteral("NULL")) {
         const KFileItemListProperties properties(selection);

-        basicActionsMenuText =
-            i18ncp("@action:inmenu menu with actions like copy, paste, rename. %1 is the amount of selected files/folders.",
-                    "Actions for One Selected Item", "Actions for %1 Selected Items", selection.count());
+        basicActionsMenuText = i18ncp("@action:inmenu menu with actions like copy, paste, rename. %1 is the amount of selected files/folders.",
+                                      "Actions for One Selected Item",
+                                      "Actions for %1 Selected Items",
+                                      selection.count());

     }
 
     QAction *basicActionsMenu = m_actionCollection->action(QStringLiteral("basic_actions"));
     }
 
     QAction *basicActionsMenu = m_actionCollection->action(QStringLiteral("basic_actions"));


@@ -835,3 +869,5 @@ void DolphinViewActionHandler::slotSelectionChanged(const KFileItemList& selecti
         }
     }
 }
         }
     }
 }

+
+#include "moc_dolphinviewactionhandler.cpp"