1) Make sure that size qprogressbar is really updated after each change

[dolphin.git] / src / filterbar.cpp

diff --git a/src/filterbar.cpp b/src/filterbar.cpp
index 082f988568b6751e23cd24efa72039aed5771134..a4284a8b54b40d0b9c056a6eabbeda99d2383ea4 100644 (file)
--- a/src/filterbar.cpp
+++ b/src/filterbar.cpp
@@ -19,10 +19,10 @@
  ***************************************************************************/
 #include "filterbar.h"
 
  ***************************************************************************/
 #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>
 
 #include <kdialog.h>
 #include <klocale.h>


@@ -36,26 +36,23 @@ FilterBar::FilterBar(QWidget* parent) :
 {
     const int gap = 3;
 
 {
     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);
 
     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());
 
     m_filterInput = new KLineEdit(this);
     hLayout->addWidget(m_filter);
     hLayout->addSpacing(KDialog::spacingHint());
 
     m_filterInput = new KLineEdit(this);

+    m_filterInput->setClearButtonShown(true);

     m_filter->setBuddy(m_filterInput);
     hLayout->addWidget(m_filterInput);
 
     m_close = new QToolButton(this);
     m_close->setAutoRaise(true);
     m_filter->setBuddy(m_filterInput);
     hLayout->addWidget(m_filterInput);
 
     m_close = new QToolButton(this);
     m_close->setAutoRaise(true);

-    m_close->setIcon(QIcon(SmallIcon("window-close")));
-    m_close->setToolTip("Hide Filter Bar");
+    m_close->setIcon(KIcon("dialog-close"));
+    m_close->setToolTip(i18nc("@info:tooltip", "Hide Filter Bar"));

     hLayout->addWidget(m_close);
     hLayout->addSpacing(gap);
 
     hLayout->addWidget(m_close);
     hLayout->addSpacing(gap);