From 97801e2cdb22411de58d2c67f8b82b466f8dff82 Mon Sep 17 00:00:00 2001
From: Nerdopolis Turfwalker <bluescreenavenger@gmail.com>
Date: Sat, 2 Jun 2018 16:38:01 +0200
Subject: [PATCH] Add 'Sort By' and 'View Mode' into Dolphin file context menus

Summary: This adds the 'Sort By' and 'View Mode'  options into the context menu of Dolphin within the file browser. I keep looking for these option (especially sort by) in the Context Menu, and keep forgetting to go to the menu. It also makes the order of "View Mode" and "Sort By" options consistent in the control menu

Test Plan: Made sure that the options appeared when right clicking on an empty space.

Reviewers: #dolphin, ngraham, elvisangelaccio

Reviewed By: #dolphin, ngraham, elvisangelaccio

Subscribers: question, markg, elvisangelaccio, mmustac, rkflx, ngraham, kfm-devel, #dolphin

Tags: #dolphin

Differential Revision: https://phabricator.kde.org/D12911
---
 src/dolphincontextmenu.cpp | 6 ++++++
 src/dolphinmainwindow.cpp  | 4 ++--
 src/dolphinui.rc           | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index a6e465f2ad..7d7d7a4084 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -363,6 +363,12 @@ void DolphinContextMenu::openViewportContextMenu()
     addAction(pasteAction);
     addSeparator();
 
+    // Insert 'Sort By' and 'View Mode'
+    addAction(m_mainWindow->actionCollection()->action(QStringLiteral("sort")));
+    addAction(m_mainWindow->actionCollection()->action(QStringLiteral("view_mode")));
+
+    addSeparator();
+
     // Insert service actions
     fileItemActions.addServiceActionsTo(this);
     fileItemActions.addPluginActionsTo(this);
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index a0509ad47d..f8b35d4a70 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -877,8 +877,8 @@ void DolphinMainWindow::updateControlMenu()
         menu->addSeparator();
     }
 
-    added = addActionToMenu(ac->action(QStringLiteral("view_mode")), menu) |
-            addActionToMenu(ac->action(QStringLiteral("sort")), menu) |
+    added = addActionToMenu(ac->action(QStringLiteral("sort")), menu) |
+            addActionToMenu(ac->action(QStringLiteral("view_mode")), menu) |
             addActionToMenu(ac->action(QStringLiteral("additional_info")), menu) |
             addActionToMenu(ac->action(QStringLiteral("show_preview")), menu) |
             addActionToMenu(ac->action(QStringLiteral("show_in_groups")), menu) |
diff --git a/src/dolphinui.rc b/src/dolphinui.rc
index ea3609c642..282ea63e5f 100644
--- a/src/dolphinui.rc
+++ b/src/dolphinui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="dolphin" version="20">
+<kpartgui name="dolphin" version="21">
     <MenuBar>
         <Menu name="file">
             <Action name="new_menu" />
@@ -21,8 +21,8 @@
             <Action name="invert_selection" />
         </Menu>
         <Menu name="view">
-            <Action name="view_mode" />
             <Action name="sort" />
+            <Action name="view_mode" />
             <Action name="additional_info" />
             <Action name="show_preview" />
             <Action name="show_in_groups" />