1
0
mirror of https://github.com/clementine-player/Clementine synced 2025-02-02 20:36:44 +01:00

Use qocoa for icecast filter.

This commit is contained in:
John Maguire 2012-06-27 17:15:10 +02:00
parent 569c8295db
commit 53998ee976
3 changed files with 6 additions and 20 deletions

View File

@ -19,8 +19,8 @@
#include "icecastfilterwidget.h" #include "icecastfilterwidget.h"
#include "ui_icecastfilterwidget.h" #include "ui_icecastfilterwidget.h"
#include "ui/iconloader.h" #include "ui/iconloader.h"
#include "widgets/maclineedit.h"
#include <QKeyEvent>
#include <QMenu> #include <QMenu>
#include <QSettings> #include <QSettings>
#include <QSignalMapper> #include <QSignalMapper>
@ -50,15 +50,6 @@ IcecastFilterWidget::IcecastFilterWidget(QWidget *parent)
ui_->options->setMenu(menu_); ui_->options->setMenu(menu_);
connect(sort_mode_mapper_, SIGNAL(mapped(int)), SLOT(SortModeChanged(int))); connect(sort_mode_mapper_, SIGNAL(mapped(int)), SLOT(SortModeChanged(int)));
#ifdef Q_OS_DARWIN
delete ui_->filter;
MacLineEdit* lineedit = new MacLineEdit(this);
ui_->horizontalLayout->insertWidget(1, lineedit);
filter_ = lineedit;
#else
filter_ = ui_->filter;
#endif
} }
void IcecastFilterWidget::AddAction( void IcecastFilterWidget::AddAction(
@ -79,7 +70,7 @@ void IcecastFilterWidget::FocusOnFilter(QKeyEvent *event) {
void IcecastFilterWidget::SetIcecastModel(IcecastModel* model) { void IcecastFilterWidget::SetIcecastModel(IcecastModel* model) {
model_ = model; model_ = model;
connect(filter_->widget(), SIGNAL(textChanged(QString)), connect(ui_->filter, SIGNAL(textChanged(QString)),
model_, SLOT(SetFilterText(QString))); model_, SLOT(SetFilterText(QString)));
// Load settings // Load settings

View File

@ -57,8 +57,6 @@ private:
QMenu* menu_; QMenu* menu_;
QSignalMapper* sort_mode_mapper_; QSignalMapper* sort_mode_mapper_;
LineEditInterface* filter_;
}; };
#endif // ICECASTFILTERWIDGET_H #endif // ICECASTFILTERWIDGET_H

View File

@ -21,10 +21,7 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="LineEdit" name="filter"> <widget class="QSearchField" name="filter">
<property name="hint" stdset="0">
<string>Search Icecast stations</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -71,9 +68,9 @@
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
<class>LineEdit</class> <class>QSearchField</class>
<extends>QLineEdit</extends> <extends>QWidget</extends>
<header>widgets/lineedit.h</header> <header>3rdparty/qocoa/qsearchfield.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>