The drag&drop helper did not make the difference between the different kind of views...

[dolphin.git] / src / filterbar.cpp

diff --git a/src/filterbar.cpp b/src/filterbar.cpp
index 99616c29e9175570c404a660d604a484734e1868..6e7443715d0d48c39c7d3461e7d96c08c5acffec 100644 (file)
--- a/src/filterbar.cpp
+++ b/src/filterbar.cpp
@@ -19,10 +19,10 @@
  ***************************************************************************/
 #include "filterbar.h"
 
-#include <QBoxLayout>
-#include <QKeyEvent>
-#include <QLabel>
-#include <QToolButton>
+#include <QtGui/QBoxLayout>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QLabel>
+#include <QtGui/QToolButton>
 
 #include <kdialog.h>
 #include <klocale.h>
@@ -36,15 +36,11 @@ FilterBar::FilterBar(QWidget* parent) :
 {
     const int gap = 3;
 
-    QVBoxLayout* vLayout = new QVBoxLayout(this);
-    vLayout->setMargin(0);
-    vLayout->addSpacing(gap);
-
-    QHBoxLayout* hLayout = new QHBoxLayout(vLayout);
+    QHBoxLayout* hLayout = new QHBoxLayout(this);
     hLayout->setMargin(0);
     hLayout->addSpacing(gap);
 
-    m_filter = new QLabel(i18n("Filter:"), this);
+    m_filter = new QLabel(i18nc("@label:textbox", "Filter:"), this);
     hLayout->addWidget(m_filter);
     hLayout->addSpacing(KDialog::spacingHint());
 
@@ -54,13 +50,14 @@ FilterBar::FilterBar(QWidget* parent) :
 
     m_close = new QToolButton(this);
     m_close->setAutoRaise(true);
-    m_close->setIcon(QIcon(SmallIcon("fileclose")));
+    m_close->setIcon(KIcon("dialog-close"));
+    m_close->setToolTip(i18nc("@info:tooltip", "Hide Filter Bar"));
     hLayout->addWidget(m_close);
     hLayout->addSpacing(gap);
 
     connect(m_filterInput, SIGNAL(textChanged(const QString&)),
             this, SIGNAL(filterChanged(const QString&)));
-    connect(m_close, SIGNAL(clicked()), this, SLOT(emitClose()));
+    connect(m_close, SIGNAL(clicked()), this, SLOT(emitCloseRequest()));
 }
 
 FilterBar::~FilterBar()
@@ -86,13 +83,13 @@ void FilterBar::keyReleaseEvent(QKeyEvent* event)
 {
     QWidget::keyReleaseEvent(event);
     if ((event->key() == Qt::Key_Escape)) {
-        emitClose();
+        emitCloseRequest();
     }
 }
 
-void FilterBar::emitClose()
+void FilterBar::emitCloseRequest()
 {
-    emit close();
+    emit closeRequest();
 }
 
 #include "filterbar.moc"