kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-12 12:54:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't force icon for preferred search tool action if one is manually configured

Browse source 
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 d3f427a6da)
This commit is contained in:
Nicolas Fella 2021-09-22 20:52:52 +02:00
parent 0ac967c021
commit 8bf64cf8b1
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/dolphinmainwindow.cpp
View file

@ -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