minor cosmetic update of the progress indication

[dolphin.git] / src / filterbar.cpp

diff --git a/src/filterbar.cpp b/src/filterbar.cpp
index eb7be1b2d3ccddd938b88f11ba16250f04fc54dd..f05d0d77d1e159e7938731b79b12f58c0fd7343a 100644 (file)
--- a/src/filterbar.cpp
+++ b/src/filterbar.cpp
@@ -19,30 +19,30 @@
  ***************************************************************************/
 #include "filterbar.h"
 
-#include <qlabel.h>
-#include <qlayout.h>
-//Added by qt3to4:
-#include <Q3VBoxLayout>
+#include <QBoxLayout>
 #include <QKeyEvent>
-#include <Q3HBoxLayout>
+#include <QLabel>
+#include <QToolButton>
 
 #include <kdialog.h>
 #include <klocale.h>
-#include <kpushbutton.h>
 #include <klineedit.h>
 #include <kiconloader.h>
 
-#include "dolphin.h"
+#include "dolphinmainwindow.h"
 
-FilterBar::FilterBar(QWidget *parent, const char *name) :
-    QWidget(parent, name)
+FilterBar::FilterBar(DolphinMainWindow* mainWindow, QWidget *parent, const char *name) :
+    QWidget(parent, name),
+    m_mainWindow(mainWindow)
 {
     const int gap = 3;
 
-    Q3VBoxLayout* foo = new Q3VBoxLayout(this);
+    QVBoxLayout* foo = new QVBoxLayout(this);
+    foo->setMargin(0);
     foo->addSpacing(gap);
 
-    Q3HBoxLayout* layout = new Q3HBoxLayout(foo);
+    QHBoxLayout* layout = new QHBoxLayout(foo);
+    layout->setMargin(0);
     layout->addSpacing(gap);
 
     m_filter = new QLabel(i18n("Filter:"), this);
@@ -50,11 +50,12 @@ FilterBar::FilterBar(QWidget *parent, const char *name) :
     layout->addSpacing(KDialog::spacingHint());
 
     m_filterInput = new KLineEdit(this);
+    m_filter->setBuddy(m_filterInput);
     layout->addWidget(m_filterInput);
 
-    m_close = new KPushButton(this);
-    m_close->setIconSet(SmallIcon("fileclose"));
-    m_close->setFlat(true);
+    m_close = new QToolButton(this);
+    m_close->setAutoRaise(true);
+    m_close->setIcon(QIcon(SmallIcon("fileclose")));
     layout->addWidget(m_close);
     layout->addSpacing(gap);
 
@@ -62,24 +63,26 @@ FilterBar::FilterBar(QWidget *parent, const char *name) :
             this, SIGNAL(signalFilterChanged(const QString&)));
     connect(m_close, SIGNAL(clicked()), this, SLOT(hide()));
     connect(m_close, SIGNAL(clicked()),
-            &Dolphin::mainWin(), SLOT(slotShowFilterBarChanged()));
+            mainWindow, SLOT(slotShowFilterBarChanged()));
 }
 
 FilterBar::~FilterBar()
 {
 }
 
-void FilterBar::hide()
+void FilterBar::hideEvent(QHideEvent* event)
 {
-    m_filterInput->clear();
-    m_filterInput->clearFocus();
-    QWidget::hide();
+    if (!event->spontaneous()) {
+        m_filterInput->clear();
+        m_filterInput->clearFocus();
+    }
 }
 
-void FilterBar::show()
+void FilterBar::showEvent(QShowEvent* event)
 {
-    m_filterInput->setFocus();
-    QWidget::show();
+    if (!event->spontaneous()) {
+        m_filterInput->setFocus();
+    }
 }
 
 void FilterBar::keyReleaseEvent(QKeyEvent* event)
@@ -87,7 +90,7 @@ void FilterBar::keyReleaseEvent(QKeyEvent* event)
     QWidget::keyReleaseEvent(event);
     if ((event->key() == Qt::Key_Escape)) {
         hide();
-        Dolphin::mainWin().slotShowFilterBarChanged();
+        m_mainWindow->slotShowFilterBarChanged();
     }
 }