Make "show filter bar" a toggle action

REVIEW: 129662

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index a2e9c0dd8dfac0d9de95661ebab470205cf0b2ad..185db71936e207aceb50c2407d4e810f07c1a579 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -552,9 +552,9 @@ void DolphinMainWindow::disableStopAction()
     actionCollection()->action(QStringLiteral("stop"))->setEnabled(false);
 }
 
     actionCollection()->action(QStringLiteral("stop"))->setEnabled(false);
 }
 

-void DolphinMainWindow::showFilterBar()
+void DolphinMainWindow::showFilterBar(bool show)

 {
 {

-    m_activeViewContainer->setFilterBarVisible(true);
+    m_activeViewContainer->setFilterBarVisible(show);

 }
 
 void DolphinMainWindow::toggleEditLocation()
 }
 
 void DolphinMainWindow::toggleEditLocation()


@@ -1110,7 +1110,7 @@ void DolphinMainWindow::setupActions()
     KStandardAction::home(this, SLOT(goHome()), actionCollection());
 
     // setup 'Tools' menu
     KStandardAction::home(this, SLOT(goHome()), actionCollection());
 
     // setup 'Tools' menu

-    QAction* showFilterBar = actionCollection()->addAction(QStringLiteral("show_filter_bar"));
+    KToggleAction* showFilterBar = actionCollection()->add<KToggleAction>(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);
     showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar"));
     showFilterBar->setIcon(QIcon::fromTheme(QStringLiteral("view-filter")));
     actionCollection()->setDefaultShortcut(showFilterBar, Qt::CTRL | Qt::Key_I);

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index d741eb21ed455aa84e1f85c05e3347c4fdc5b355..219bcdcb9b63f6a0d07e8af149a0e019bd48607a 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -236,7 +236,7 @@ private slots:
     void enableStopAction();
     void disableStopAction();
 
     void enableStopAction();
     void disableStopAction();
 

-    void showFilterBar();
+    void showFilterBar(bool show);

 
     /**
      * Toggles between edit and browse mode of the navigation bar.
 
     /**
      * Toggles between edit and browse mode of the navigation bar.

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 72ced931b709f21d95848b541372b618df8edab5..a9825f47e48d05bcf95f441ce962b78ebd7c11a2 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -389,6 +389,7 @@ void DolphinViewContainer::setFilterBarVisible(bool visible)
         m_filterBar->show();
         m_filterBar->setFocus();
         m_filterBar->selectAll();
         m_filterBar->show();
         m_filterBar->setFocus();
         m_filterBar->selectAll();

+        emit showFilterBarChanged(true);

     } else {
         closeFilterBar();
     }
     } else {
         closeFilterBar();
     }