mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Restore settings label and prevent warning when Baloo is unavailable
Summary: As discussed in D14814,6674c9c387
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, after6674c9c387
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
This commit is contained in:
parent
6674c9c387
commit
79c485a66d
|
@ -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();
|
||||
|
|
|
@ -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"));
|
||||
|
|
Loading…
Reference in a new issue