put the close button of the filter bar on the left like in other applications (Kate...

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

diff --git a/src/filterbar.cpp b/src/filterbar.cpp
index 36a6d5271a83c59af1d08266672b22d2c3b28c75..a16df75aa4027573aa5dc0ce59859d1f6e649b0e 100644 (file)
--- a/src/filterbar.cpp
+++ b/src/filterbar.cpp
@@ -29,20 +29,21 @@
 #include <klineedit.h>
 #include <kiconloader.h>
 
 #include <klineedit.h>
 #include <kiconloader.h>
 

-#include "dolphinmainwindow.h"
-

 FilterBar::FilterBar(QWidget* parent) :
     QWidget(parent)
 {
 FilterBar::FilterBar(QWidget* parent) :
     QWidget(parent)
 {

-    const int gap = 3;
-

     QHBoxLayout* hLayout = new QHBoxLayout(this);
     hLayout->setMargin(0);
     QHBoxLayout* hLayout = new QHBoxLayout(this);
     hLayout->setMargin(0);

-    hLayout->addSpacing(gap);
+
+    m_close = new QToolButton(this);
+    m_close->setAutoRaise(true);
+    m_close->setIcon(KIcon("dialog-close"));
+    m_close->setToolTip(i18nc("@info:tooltip", "Hide Filter Bar"));
+    hLayout->addWidget(m_close);
+    hLayout->addSpacing(KDialog::spacingHint());

 
     m_filter = new QLabel(i18nc("@label:textbox", "Filter:"), this);
     hLayout->addWidget(m_filter);
 
     m_filter = new QLabel(i18nc("@label:textbox", "Filter:"), this);
     hLayout->addWidget(m_filter);

-    hLayout->addSpacing(KDialog::spacingHint());

 
     m_filterInput = new KLineEdit(this);
     m_filterInput->setLayoutDirection(Qt::LeftToRight);
 
     m_filterInput = new KLineEdit(this);
     m_filterInput->setLayoutDirection(Qt::LeftToRight);


@@ -50,16 +51,9 @@ FilterBar::FilterBar(QWidget* parent) :
     m_filter->setBuddy(m_filterInput);
     hLayout->addWidget(m_filterInput);
 
     m_filter->setBuddy(m_filterInput);
     hLayout->addWidget(m_filterInput);
 

-    m_close = new QToolButton(this);
-    m_close->setAutoRaise(true);
-    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_filterInput, SIGNAL(textChanged(const QString&)),
             this, SIGNAL(filterChanged(const QString&)));

-    connect(m_close, SIGNAL(clicked()), this, SLOT(emitCloseRequest()));
+    connect(m_close, SIGNAL(clicked()), this, SIGNAL(closeRequest()));

 }
 
 FilterBar::~FilterBar()
 }
 
 FilterBar::~FilterBar()


@@ -82,13 +76,8 @@ void FilterBar::keyReleaseEvent(QKeyEvent* event)
 {
     QWidget::keyReleaseEvent(event);
     if ((event->key() == Qt::Key_Escape)) {
 {
     QWidget::keyReleaseEvent(event);
     if ((event->key() == Qt::Key_Escape)) {

-        emitCloseRequest();
+        emit closeRequest();

     }
 }
 
     }
 }
 

-void FilterBar::emitCloseRequest()
-{
-    emit closeRequest();
-}
-

 #include "filterbar.moc"
 #include "filterbar.moc"

diff --git a/src/filterbar.h b/src/filterbar.h
index ef5711fc29c45b6fb0ffd514a73a4524cdc98fdb..7ede89b313f8a8cc6230738e4f8dc7be2e822ffd 100644 (file)
--- a/src/filterbar.h
+++ b/src/filterbar.h
@@ -59,9 +59,6 @@ protected:
     virtual void showEvent(QShowEvent* event);
     virtual void keyReleaseEvent(QKeyEvent* event);
 
     virtual void showEvent(QShowEvent* event);
     virtual void keyReleaseEvent(QKeyEvent* event);
 

-private slots:
-    void emitCloseRequest();
-

 private:
     QLabel* m_filter;
     KLineEdit* m_filterInput;
 private:
     QLabel* m_filter;
     KLineEdit* m_filterInput;