Remove the filter-button as it has been replaced by the Filter Panel.

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

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index 0ff9e9b1defb258150c297481d09e7cfea6382da..84f2c12e5387d00596c89bf367b947f8b3ed5f28 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -61,7 +61,6 @@ DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
     m_everywhereButton(0),
     m_fileNameButton(0),
     m_contentButton(0),
-    m_filterButton(0),
     m_searchPath(),
     m_startSearchTimer(0)
 {
@@ -80,7 +79,6 @@ QString DolphinSearchBox::text() const
 void DolphinSearchBox::setSearchPath(const KUrl& url)
 {
     m_searchPath = url;
-    m_filterButton->setVisible(m_nepomukActivated && isSearchPathIndexed());
 
     QFontMetrics metrics(m_fromHereButton->font());
     const int maxWidth = metrics.averageCharWidth() * 15;
@@ -263,14 +261,6 @@ void DolphinSearchBox::init()
     searchWhatGroup->addButton(m_fileNameButton);
     searchWhatGroup->addButton(m_contentButton);
 
-    // Create "Filter" button
-    m_filterButton = new QToolButton(this);
-    m_filterButton->setIcon(KIcon("view-filter"));
-    m_filterButton->setAutoRaise(true);
-    m_filterButton->setCheckable(true);
-    m_filterButton->hide();
-    //connect(m_filterButton, SIGNAL(toggled(bool)), this, SLOT(setFilterWidgetsVisible(bool)));
-
     // Apply layout for the options
     QHBoxLayout* optionsLayout = new QHBoxLayout();
     optionsLayout->setMargin(0);
@@ -280,7 +270,6 @@ void DolphinSearchBox::init()
     optionsLayout->addWidget(m_fileNameButton);
     optionsLayout->addWidget(m_contentButton);
     optionsLayout->addStretch(1);
-    optionsLayout->addWidget(m_filterButton);
 
     m_topLayout = new QVBoxLayout(this);
     m_topLayout->addLayout(searchInputLayout);

diff --git a/src/search/dolphinsearchbox.h b/src/search/dolphinsearchbox.h
index 11cd2416798367893dcfd096dcf151d5370738b0..18883b512058faa0891fa51426b0bc8e0bd28e09 100644 (file)
--- a/src/search/dolphinsearchbox.h
+++ b/src/search/dolphinsearchbox.h
@@ -28,7 +28,6 @@ class AbstractSearchFilterWidget;
 class KLineEdit;
 class QFormLayout;
 class QPushButton;
-class QToolButton;
 class QVBoxLayout;
 
 /**
@@ -125,8 +124,6 @@ private:
     QPushButton* m_fileNameButton;
     QPushButton* m_contentButton;
 
-    QToolButton* m_filterButton;
-
     KUrl m_searchPath;
 
     QTimer* m_startSearchTimer;