Revert "Make "show filter bar" a toggle action"

This reverts commit edf8e57373.

See https://git.reviewboard.kde.org/r/129662 for discussion
This commit is contained in:
Sergey Kalinichev 2017-03-11 20:33:41 +03:00
parent e8eb6a7f2c
commit 042b0c8409
3 changed files with 4 additions and 5 deletions

View file

@ -552,9 +552,9 @@ void DolphinMainWindow::disableStopAction()
actionCollection()->action(QStringLiteral("stop"))->setEnabled(false);
}
void DolphinMainWindow::showFilterBar(bool show)
void DolphinMainWindow::showFilterBar()
{
m_activeViewContainer->setFilterBarVisible(show);
m_activeViewContainer->setFilterBarVisible(true);
}
void DolphinMainWindow::toggleEditLocation()
@ -1108,7 +1108,7 @@ void DolphinMainWindow::setupActions()
KStandardAction::home(this, SLOT(goHome()), actionCollection());
// setup 'Tools' menu
KToggleAction* showFilterBar = actionCollection()->add<KToggleAction>(QStringLiteral("show_filter_bar"));
QAction* showFilterBar = actionCollection()->addAction(QStringLiteral("show_filter_bar"));
showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar"));
showFilterBar->setIcon(QIcon::fromTheme(QStringLiteral("view-filter")));
actionCollection()->setDefaultShortcut(showFilterBar, Qt::CTRL | Qt::Key_I);

View file

@ -236,7 +236,7 @@ private slots:
void enableStopAction();
void disableStopAction();
void showFilterBar(bool show);
void showFilterBar();
/**
* Toggles between edit and browse mode of the navigation bar.

View file

@ -389,7 +389,6 @@ void DolphinViewContainer::setFilterBarVisible(bool visible)
m_filterBar->show();
m_filterBar->setFocus();
m_filterBar->selectAll();
emit showFilterBarChanged(true);
} else {
closeFilterBar();
}