Applied patches to filterbar as discussed on review request 91 and 93.

svn path=/trunk/KDE/kdebase/apps/; revision=926845

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index bc2c44c0738152dc14f4ff73bce173f7c15c543d..9da51a60c2a7424ee662a71cd4a4f5f7040f4c6f 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -158,6 +158,8 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
             this, SLOT(setNameFilter(const QString&)));
     connect(m_filterBar, SIGNAL(closeRequest()),
             this, SLOT(closeFilterBar()));
+    connect(m_view, SIGNAL(urlChanged(const KUrl&)),
+            m_filterBar, SLOT(clear()));
 
     m_topLayout->addWidget(m_urlNavigator);
     m_topLayout->addWidget(m_view);

diff --git a/src/filterbar.cpp b/src/filterbar.cpp
index a16df75aa4027573aa5dc0ce59859d1f6e649b0e..7becada99b27cc8baed82cec33ea6083ff04a5f0 100644 (file)
--- a/src/filterbar.cpp
+++ b/src/filterbar.cpp
@@ -76,7 +76,11 @@ void FilterBar::keyReleaseEvent(QKeyEvent* event)
 {
     QWidget::keyReleaseEvent(event);
     if ((event->key() == Qt::Key_Escape)) {
-        emit closeRequest();
+        if (m_filterInput->text().isEmpty()) {
+            emit closeRequest();
+        } else {
+            m_filterInput->clear();
+        }
     }
 }
 

diff --git a/src/filterbar.h b/src/filterbar.h
index 87aaa017ec0dddcafbfdd95587c5a320a2f14786..e7c244e8c92640d29fc18e9cad8df704983f6f53 100644 (file)
--- a/src/filterbar.h
+++ b/src/filterbar.h
@@ -39,10 +39,11 @@ class FilterBar : public QWidget
 public:
     FilterBar(QWidget* parent = 0);
     virtual ~FilterBar();
-    
+
+public slots:
     /** Clears the input field. */
     void clear();
-    
+
 signals:
     /**
      * Signal that reports the name filter has been