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

Merge branch 'release/20.04'

Browse source
This commit is contained in:
Nate Graham 2020-05-24 08:26:34 -06:00
parent 0d6b900a84 29e6cf01df
commit b6700f77dd
2 changed files with 4 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/dolphinmainwindow.cpp
View file

@ -67,6 +67,7 @@
#include <KShell>
#include <KStandardAction>
#include <KStartupInfo>
#include <KSycoca>
#include <KToggleAction>
#include <KToolBar>
#include <KToolBarPopupAction>
@ -205,7 +206,9 @@ DolphinMainWindow::DolphinMainWindow() :
setupWhatsThis();
QTimer::singleShot(0, this, &DolphinMainWindow::setupUpdateOpenPreferredSearchToolAction);
connect(KSycoca::self(), QOverload<>::of(&KSycoca::databaseChanged), this, &DolphinMainWindow::updateOpenPreferredSearchToolAction);
QTimer::singleShot(0, this, &DolphinMainWindow::updateOpenPreferredSearchToolAction);
}
DolphinMainWindow::~DolphinMainWindow()
@ -982,29 +985,6 @@ QPointer<QAction> DolphinMainWindow::preferredSearchTool()
return action;
}
void DolphinMainWindow::setupUpdateOpenPreferredSearchToolAction()
{
QAction* openPreferredSearchTool = actionCollection()->action(QStringLiteral("open_preferred_search_tool"));
const QList<QWidget*> widgets = openPreferredSearchTool->associatedWidgets();
for (QWidget* widget : widgets) {
QMenu* menu = qobject_cast<QMenu*>(widget);
if (menu) {
connect(menu, &QMenu::aboutToShow, this, &DolphinMainWindow::updateOpenPreferredSearchToolAction);
}
}
// Update the open_preferred_search_tool action *before* the Configure Shortcuts window is shown,
// since this action is then listed in that window and it should be up-to-date when it is displayed.
// This update is instantaneous if user made no changes to the search tools in the meantime.
// Maybe all KStandardActions should defer calls to their slots, so that we could simply connect() to trigger()?
connect(
actionCollection()->action(KStandardAction::name(KStandardAction::KeyBindings)), &QAction::hovered,
this, &DolphinMainWindow::updateOpenPreferredSearchToolAction
);
updateOpenPreferredSearchToolAction();
}
void DolphinMainWindow::updateOpenPreferredSearchToolAction()
{
QAction* openPreferredSearchTool = actionCollection()->action(QStringLiteral("open_preferred_search_tool"));
@ -1180,7 +1160,6 @@ void DolphinMainWindow::updateControlMenu()
addActionToMenu(ac->action(QStringLiteral("show_filter_bar")), menu);
addActionToMenu(ac->action(QStringLiteral("open_preferred_search_tool")), menu);
addActionToMenu(ac->action(QStringLiteral("open_terminal")), menu);
connect(menu, &QMenu::aboutToShow, this, &DolphinMainWindow::updateOpenPreferredSearchToolAction);
menu->addSeparator();

3
src/dolphinmainwindow.h
View file

@ -353,9 +353,6 @@ private slots:
*/
void toggleShowMenuBar();
/** Sets up updates for "Open Preferred Search Tool" action. */
void setupUpdateOpenPreferredSearchToolAction();
/** Updates "Open Preferred Search Tool" action. */
void updateOpenPreferredSearchToolAction();