Qt: searchlineedit: change search text.

[vlc] / modules / gui / qt4 / util / searchlineedit.cpp

diff --git a/modules/gui/qt4/util/searchlineedit.cpp b/modules/gui/qt4/util/searchlineedit.cpp
index 3017b7de28cab3c3acb13d012dd9ddc4bab18a11..9cce9396d6d20255db2829a051eb41428db1f3e4 100644 (file)
--- a/modules/gui/qt4/util/searchlineedit.cpp
+++ b/modules/gui/qt4/util/searchlineedit.cpp
@@ -40,7 +40,7 @@
 
 #include <vlc_intf_strings.h>
 
-#if QT_VERSION < 0x040700
+#if !HAS_QT47
 
 ClickLineEdit::ClickLineEdit( const QString &msg, QWidget *parent) : QLineEdit( parent )
 {
@@ -65,7 +65,7 @@ void ClickLineEdit::setText( const QString &txt )
 void ClickLineEdit::paintEvent( QPaintEvent *pe )
 {
     QLineEdit::paintEvent( pe );
-    if ( mDrawClickMsg == true && !hasFocus() ) {
+    if ( mDrawClickMsg && !hasFocus() ) {
         QPainter p( this );
         QPen tmp = p.pen();
         p.setPen( palette().color( QPalette::Disabled, QPalette::Text ) );
@@ -86,7 +86,7 @@ void ClickLineEdit::dropEvent( QDropEvent *ev )
 
 void ClickLineEdit::focusInEvent( QFocusEvent *ev )
 {
-    if ( mDrawClickMsg == true ) {
+    if ( mDrawClickMsg ) {
         mDrawClickMsg = false;
         repaint();
     }
@@ -106,8 +106,8 @@ void ClickLineEdit::focusOutEvent( QFocusEvent *ev )
 #ifndef Q_WS_MAC
 SearchLineEdit::SearchLineEdit( QWidget *parent ) : QLineEdit( parent )
 {
-    clearButton = new QVLCFramelessButton( this );
-    clearButton->setIcon( QIcon( ":/toolbar/clear" ) );
+    clearButton = new QFramelessButton( this );
+    clearButton->setIcon( QIcon( ":/search_clear" ) );
     clearButton->setIconSize( QSize( 16, 16 ) );
     clearButton->setCursor( Qt::ArrowCursor );
     clearButton->setToolTip( qfu(vlc_pgettext("Tooltip|Clear", "Clear")) );
@@ -123,7 +123,7 @@ SearchLineEdit::SearchLineEdit( QWidget *parent ) : QLineEdit( parent )
                                   "padding-bottom: 1px; "
                                   "padding-right: %2px;" )
                                   .arg( metrics.height() + ( 2 * frameWidth ) )
-                                  .arg( clearButton->sizeHint().width() + 1 );
+                                  .arg( clearButton->sizeHint().width() + 6 );
     setStyleSheet( styleSheet );
 
     setMessageVisible( true );
@@ -160,7 +160,8 @@ void SearchLineEdit::resizeEvent ( QResizeEvent * event )
     QLineEdit::resizeEvent( event );
     int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth,0,this);
     clearButton->resize( clearButton->sizeHint().width(), height() );
-    clearButton->move( width() - clearButton->width() - frameWidth, 0 );
+    clearButton->move( width() - clearButton->width() - frameWidth - 3,
+                      ( height() - clearButton->height() + 2 ) / 2 );
 }
 
 void SearchLineEdit::focusInEvent( QFocusEvent *event )
@@ -191,7 +192,7 @@ void SearchLineEdit::paintEvent( QPaintEvent *event )
         .adjusted( 3, 0, clearButton->width() + 1, 0 );
     QPainter painter( this );
     painter.setPen( palette().color( QPalette::Disabled, QPalette::Text ) );
-    painter.drawText( rect, Qt::AlignLeft | Qt::AlignVCenter, qtr( I_PL_FILTER ) );
+    painter.drawText( rect, Qt::AlignLeft | Qt::AlignVCenter, qtr( I_PL_SEARCH ) );
 }
 
 void SearchLineEdit::searchEditingFinished()