┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNicolas Fella <[email protected]>2021-09-22 20:52:52 +0200
committerNicolas Fella <[email protected]>2021-09-22 21:23:53 +0000
commitd3f427a6da1b117c85b1080bf198ae4758d00e8e (patch)
tree8e52ea279becb9a5c2528e124fa63c0f22814305 /src
parentf8c292c556b87a19e9099cc98bf0ab88424472b2 (diff)
Don't force icon for preferred search tool action if one is manually configured
The code reads the icon from the relevant application and uses that for the action When the user has configured one manually in the toolbar settings that is overridden To avoid this only change the icon if it is the default one (search) BUG: 442815
Diffstat (limited to 'src')
-rw-r--r--src/dolphinmainwindow.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index f3a5e3b4e..e0d6c4725 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1011,7 +1011,11 @@ void DolphinMainWindow::updateOpenPreferredSearchToolAction()
if (tool) {
openPreferredSearchTool->setVisible(true);
openPreferredSearchTool->setText(i18nc("@action:inmenu Tools", "Open %1", tool->text()));
- openPreferredSearchTool->setIcon(tool->icon());
+ // Only override with the app icon if it is the default, i.e. the user hasn't configured one manually
+ // https://bugs.kde.org/show_bug.cgi?id=442815
+ if (openPreferredSearchTool->icon().name() == QLatin1String("search")) {
+ openPreferredSearchTool->setIcon(tool->icon());
+ }
} else {
openPreferredSearchTool->setVisible(false);
// still visible in Shortcuts configuration window