diff --git a/src/libtomahawk/infobar/infobar.cpp b/src/libtomahawk/infobar/infobar.cpp index 7c3fb874c..dc677895b 100644 --- a/src/libtomahawk/infobar/infobar.cpp +++ b/src/libtomahawk/infobar/infobar.cpp @@ -71,7 +71,7 @@ InfoBar::InfoBar( QWidget* parent ) ui->imageLabel->setText( QString() ); m_searchWidget = new QSearchField( this ); - m_searchWidget->setPlaceholderText( "Filter..." ); + m_searchWidget->setPlaceholderText( tr( "Filter..." ) ); m_searchWidget->setMinimumWidth( 180 ); connect( m_searchWidget, SIGNAL( textChanged( QString ) ), this, SLOT( onFilterEdited() ) ); diff --git a/src/libtomahawk/thirdparty/Qocoa/qsearchfield.cpp b/src/libtomahawk/thirdparty/Qocoa/qsearchfield.cpp index bc5716931..06532d71a 100644 --- a/src/libtomahawk/thirdparty/Qocoa/qsearchfield.cpp +++ b/src/libtomahawk/thirdparty/Qocoa/qsearchfield.cpp @@ -51,10 +51,17 @@ QSearchField::QSearchField(QWidget *parent) : QWidget(parent) TomahawkUtils::unmarginLayout(layout); setContentsMargins(0, 0, 0, 0); - lineEdit->setStyleSheet( "QLineEdit { border: 1px solid gray; border-radius: 6px; margin-right: 2px; }" ); + lineEdit->setStyleSheet( "QLineEdit { border: 1px solid gray; border-radius: 6px; }" ); + +#ifdef Q_OS_MAC lineEdit->setContentsMargins(0, 0, 0, 0); lineEdit->setMinimumHeight(27); setFixedHeight(27); +#else + lineEdit->setContentsMargins(2, 2, 2, 2); + lineEdit->setMinimumHeight(27); +#endif + } void QSearchField::setText(const QString &text) diff --git a/src/tomahawkwindow.cpp b/src/tomahawkwindow.cpp index 33595d9b4..51c6c0542 100644 --- a/src/tomahawkwindow.cpp +++ b/src/tomahawkwindow.cpp @@ -193,7 +193,7 @@ TomahawkWindow::setupSideBar() m_sidebar->setChildrenCollapsible( false ); m_searchWidget = new QSearchField( m_sidebar ); - m_searchWidget->setPlaceholderText( "Global Search..." ); + m_searchWidget->setPlaceholderText( tr( "Global Search..." ) ); connect( m_searchWidget, SIGNAL( returnPressed() ), this, SLOT( onFilterEdited() ) ); m_sourcetree = new SourceTreeView();