From 9cd042a86c85eaf7722a50ec2747fa3d6690e0a7 Mon Sep 17 00:00:00 2001
From: Simon Krull <simondotunix@gmail.com>
Date: Sun, 25 Aug 2019 09:32:49 -0600
Subject: [PATCH] Change default Dolphin toolbar layout

Summary:
{F7205836}

Use a default toolbar layout that looks better and makes more sense for new users.

Test Plan: Open Dolphin (with the default toolbar)

Reviewers: #dolphin, #vdg, ngraham, GB_2, elvisangelaccio

Reviewed By: #dolphin, #vdg, ngraham, GB_2

Subscribers: iasensio, filipf, meven, elvisangelaccio, felixernst, GB_2, ndavis, ngraham, kfm-devel, #vdg, #dolphin

Tags: #dolphin, #vdg

Differential Revision: https://phabricator.kde.org/D23075
---
 CMakeLists.txt            | 2 +-
 src/dolphinmainwindow.cpp | 5 +----
 src/dolphinui.rc          | 8 +++++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f2a118ce..91ce0dfa0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATI
 project(Dolphin VERSION ${KDE_APPLICATIONS_VERSION})
 
 set(QT_MIN_VERSION "5.8.0")
-set(KF5_MIN_VERSION "5.57.0")
+set(KF5_MIN_VERSION "5.61.0")
 
 # ECM setup
 find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 1da823e23..bdf5dbac5 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1728,10 +1728,9 @@ void DolphinMainWindow::createControlButton()
 
     m_controlButton = new QToolButton(this);
     m_controlButton->setIcon(QIcon::fromTheme(QStringLiteral("application-menu")));
-    m_controlButton->setText(i18nc("@action", "Control"));
+    m_controlButton->setToolTip(i18nc("@action", "Show menu"));
     m_controlButton->setAttribute(Qt::WidgetAttribute::WA_CustomWhatsThis);
     m_controlButton->setPopupMode(QToolButton::InstantPopup);
-    m_controlButton->setToolButtonStyle(toolBar()->toolButtonStyle());
 
     QMenu* controlMenu = new QMenu(m_controlButton);
     connect(controlMenu, &QMenu::aboutToShow, this, &DolphinMainWindow::updateControlMenu);
@@ -1742,8 +1741,6 @@ void DolphinMainWindow::createControlButton()
     toolBar()->addWidget(m_controlButton);
     connect(toolBar(), &KToolBar::iconSizeChanged,
             m_controlButton, &QToolButton::setIconSize);
-    connect(toolBar(), &KToolBar::toolButtonStyleChanged,
-            m_controlButton, &QToolButton::setToolButtonStyle);
 
     // The added widgets are owned by the toolbar and may get deleted when e.g. the toolbar
     // gets edited. In this case we must add them again. The adding is done asynchronously by
diff --git a/src/dolphinui.rc b/src/dolphinui.rc
index b90321d05..207c5d4c2 100644
--- a/src/dolphinui.rc
+++ b/src/dolphinui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="dolphin" version="22">
+<kpartgui name="dolphin" version="23">
     <MenuBar>
         <Menu name="file">
             <Action name="new_menu" />
@@ -98,10 +98,11 @@
         <Action name="compact" />
         <Action name="details" />
         <Separator name="separator_0" />
-        <Action name="edit_find"/>
-        <Action name="show_preview" />
+        <Action name="sort" />
+        <Spacer name="spacer_0" />
         <Action name="split_view" />
         <Action name="split_stash" />
+        <Action name="edit_find" />
     </ToolBar>
     <ActionProperties scheme="Default">
         <Action priority="0" name="go_back"/>
@@ -117,5 +118,6 @@
         <Action priority="0" name="edit_cut"/>
         <Action priority="0" name="edit_copy"/>
         <Action priority="0" name="edit_paste"/>
+        <Action priority="0" name="edit_find"/>
     </ActionProperties>
 </kpartgui>
-- 
2.47.3