* move the search button to the end

* use the default search icon instead of the nepomuk icon

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

2 files changed, 11 insertions, 13 deletions

diff --git a/src/dolphinsearchbox.cpp b/src/dolphinsearchbox.cpp
index 69cf6233f..438944362 100644
--- a/src/dolphinsearchbox.cpp
+++ b/src/dolphinsearchbox.cpp
@@ -31,30 +31,28 @@
 
 DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
     QWidget(parent),
-    m_searchButton(0),
-    m_searchInput(0)
+    m_searchInput(0),
+    m_searchButton(0)
 {
     QHBoxLayout* hLayout = new QHBoxLayout(this);
     hLayout->setMargin(0);
     hLayout->setSpacing(0);
 
-    m_searchButton = new QToolButton(this);
-    m_searchButton->setAutoRaise(true);
-    m_searchButton->setIcon(KIcon("nepomuk"));
-    m_searchButton->setToolTip(i18nc("@info:tooltip", "Search"));
-    hLayout->addWidget(m_searchButton);
-
-    connect(m_searchButton, SIGNAL(clicked()),
-            this, SLOT(emitSearchSignal()));
-
     m_searchInput = new KLineEdit(this);
     m_searchInput->setLayoutDirection(Qt::LeftToRight);
     m_searchInput->setClearButtonShown(true);
     m_searchInput->setMinimumWidth(150);
     hLayout->addWidget(m_searchInput);
-
     connect(m_searchInput, SIGNAL(returnPressed()),
             this, SLOT(emitSearchSignal()));
+
+    m_searchButton = new QToolButton(this);
+    m_searchButton->setAutoRaise(true);
+    m_searchButton->setIcon(KIcon("edit-find"));
+    m_searchButton->setToolTip(i18nc("@info:tooltip", "Search"));
+    hLayout->addWidget(m_searchButton);
+    connect(m_searchButton, SIGNAL(clicked()),
+            this, SLOT(emitSearchSignal()));
 }
 
 DolphinSearchBox::~DolphinSearchBox()
diff --git a/src/dolphinsearchbox.h b/src/dolphinsearchbox.h
index 3d25ef4f5..949c0b547 100644
--- a/src/dolphinsearchbox.h
+++ b/src/dolphinsearchbox.h
@@ -51,8 +51,8 @@ private slots:
     void emitSearchSignal();
 
 private:
-    QToolButton* m_searchButton;
     KLineEdit* m_searchInput;
+    QToolButton* m_searchButton;
 };
 
 #endif