diff options
| -rw-r--r-- | beetplayer.qrc | 1 | ||||
| -rw-r--r-- | playerwidget.cpp | 26 | ||||
| -rw-r--r-- | playerwidget.h | 2 | ||||
| -rw-r--r-- | stomp.png | bin | 0 -> 946 bytes |
4 files changed, 16 insertions, 13 deletions
diff --git a/beetplayer.qrc b/beetplayer.qrc index 56a1001..f8457fb 100644 --- a/beetplayer.qrc +++ b/beetplayer.qrc @@ -18,5 +18,6 @@ <file>artist.png</file> <file>song.png</file> <file>genre.png</file> + <file>stomp.png</file> </qresource> </RCC> diff --git a/playerwidget.cpp b/playerwidget.cpp index 57cbdc8..27c473f 100644 --- a/playerwidget.cpp +++ b/playerwidget.cpp @@ -46,17 +46,19 @@ void PlayerWidget::setupGui(){ currentModel = mViewModel; //filter - QGroupBox *filterGB = new QGroupBox(tr("Filter")); - mFilter = new QLineEdit; - connect(mFilter, SIGNAL(returnPressed()), this, SLOT(doFilter())); - QPushButton *filterB = new QPushButton(tr("Go!")); - connect(filterB, SIGNAL(clicked()), this, SLOT(doFilter())); - QPushButton *clearFilterB = new QPushButton(tr("Clear")); - connect(clearFilterB, SIGNAL(clicked()), this, SLOT(clearFilter())); + QGroupBox *filterGB = new QGroupBox(tr("Search")); + mSearch = new QLineEdit; + connect(mSearch, SIGNAL(returnPressed()), this, SLOT(doFilter())); + QToolBar *searchTB = new QToolBar; + QAction *clearSearchA = new QAction(QIcon(":/delete.png"), tr("Clear search"), this); + connect(clearSearchA, SIGNAL(triggered()), this, SLOT(clearFilter())); + searchTB->addAction(clearSearchA); + QAction *doSearchA = new QAction(QIcon(":/stomp.png"), tr("Go searching!"), this); + connect(doSearchA, SIGNAL(triggered()), this, SLOT(doFilter())); + searchTB->addAction(doSearchA); QHBoxLayout *filterLayout = new QHBoxLayout; - filterLayout->addWidget(mFilter); - filterLayout->addWidget(filterB); - filterLayout->addWidget(clearFilterB); + filterLayout->addWidget(mSearch); + filterLayout->addWidget(searchTB); filterGB->setLayout(filterLayout); //left widget @@ -382,7 +384,7 @@ void PlayerWidget::populate(){ } void PlayerWidget::doFilter(){ - QString filter = mFilter->text(); + QString filter = mSearch->text(); if(filter.isEmpty()){ mView->setModel(mViewModel); return; @@ -400,7 +402,7 @@ void PlayerWidget::doFilter(){ } void PlayerWidget::clearFilter(){ - mFilter->clear(); + mSearch->clear(); mView->setModel(mViewModel); currentModel = mViewModel; } diff --git a/playerwidget.h b/playerwidget.h index 103f219..365eec3 100644 --- a/playerwidget.h +++ b/playerwidget.h @@ -53,7 +53,7 @@ class PlayerWidget : public QWidget { void addSong(const QModelIndex &idx); void play(const QString &fullPath); void advance(int numSongs); - QLineEdit *mFilter; + QLineEdit *mSearch; QMediaPlayer *mPlayer; BeetView *mView; QStandardItemModel *mViewModel; diff --git a/stomp.png b/stomp.png Binary files differnew file mode 100644 index 0000000..e45b2f9 --- /dev/null +++ b/stomp.png |
