Commit 8bf64cf8 authored by Nicolas Fella's avatar Nicolas Fella
Browse files

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
(cherry picked from commit d3f427a6)
parent 0ac967c0
......@@ -1013,7 +1013,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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment