From 79c485a66de7444e87708ae25c5f8a661a89dd21 Mon Sep 17 00:00:00 2001 From: Henrik Fehlauer Date: Wed, 22 Aug 2018 23:48:53 +0200 Subject: [PATCH] Restore settings label and prevent warning when Baloo is unavailable Summary: As discussed in D14814, 6674c9c387d0 removed the {nav Show tooltips} checkbox in Dolphin's preferences when Baloo is unavailabe at compile time and thus the tooltip would not be functional. The {nav Miscellaneous} label in front of the checkbox was also removed, even though it relates to all options in that group. In addition, after 6674c9c387d0 running Dolphin without Baloo support would print QWidget::insertAction: Attempt to insert null action on startup. Both issues can be fixed with more `#ifdefs`. Test Plan: After building with `-DCMAKE_DISABLE_FIND_PACKAGE_KF5Baloo=ON`, the {nav Show tooltips} checkbox is removed, the {nav Miscellaneous} label is still there, and there is no warning printed. Reviewers: elvisangelaccio Reviewed By: elvisangelaccio Subscribers: kfm-devel Tags: #dolphin Differential Revision: https://phabricator.kde.org/D14980 --- src/dolphinmainwindow.cpp | 2 ++ src/settings/general/behaviorsettingspage.cpp | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 32915827b..3b905b4d3 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -1380,7 +1380,9 @@ void DolphinMainWindow::setupDockWidgets() panelsMenu->setDelayed(false); const KActionCollection* ac = actionCollection(); panelsMenu->addAction(ac->action(QStringLiteral("show_places_panel"))); +#ifdef HAVE_BALOO panelsMenu->addAction(ac->action(QStringLiteral("show_information_panel"))); +#endif panelsMenu->addAction(ac->action(QStringLiteral("show_folders_panel"))); panelsMenu->addAction(ac->action(QStringLiteral("show_terminal_panel"))); panelsMenu->addSeparator(); diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp index fa21822cc..add9acad5 100644 --- a/src/settings/general/behaviorsettingspage.cpp +++ b/src/settings/general/behaviorsettingspage.cpp @@ -86,7 +86,11 @@ BehaviorSettingsPage::BehaviorSettingsPage(const QUrl& url, QWidget* parent) : // 'Show selection marker' m_showSelectionToggle = new QCheckBox(i18nc("@option:check", "Show selection marker")); +#ifdef HAVE_BALOO topLayout->addRow(QString(), m_showSelectionToggle); +#else + topLayout->addRow(i18nc("@title:group", "Miscellaneous: "), m_showSelectionToggle); +#endif // 'Inline renaming of items' m_renameInline = new QCheckBox(i18nc("option:check", "Rename inline")); -- 2.47.3