Rethink GUI

While figuring out how to populate the album view, I realized that I
don't want to view my music by albums, only by artist, maybe by genre...

So I removed the QComboBox for the different sort orders and
concentrated on the filter, which is a good thing (tm). Just make the
filter find anything you need. Name/Title is already implemented. Have to
think about genre/year...

1 files changed, 6 insertions, 8 deletions

diff --git a/playerwidget.h b/playerwidget.h
index e6e20d5..c9206cd 100644
--- a/playerwidget.h
+++ b/playerwidget.h
@@ -7,33 +7,31 @@ class QTreeView;
 class QStandardItemModel;
 class QSortFilterProxyModel;
 class QLineEdit;
-class QComboBox;
 class QLabel;
 class QSlider;
 class QTextEdit;
 class QMediaPlayer;
+class BeetPlayerProxy;
 
 class PlayerWidget : public QWidget {
     Q_OBJECT
     public:
         enum ItemType { Artist, Album, Song };
-        enum CustomRoles { TypeRole = Qt::UserRole + 1, IdRole = Qt::UserRole + 2, FullPathRole = Qt::UserRole + 3 };
+        enum CustomRoles { TypeRole = Qt::UserRole + 1, IdRole = Qt::UserRole + 2, FullPathRole = Qt::UserRole + 3, GenreRole = Qt::UserRole + 4 };
         explicit PlayerWidget(QWidget *parent = 0);
 
     public slots:
-        //void doFilter();
-        void populateBy(QString selector);
-        void refreshSort();
+        void populate();
+        void doFilter();
+        void clearFilter();
 
     private:
         void setupGui();
-        void populateByArtist();
-        QComboBox *mSortBy;
         QLineEdit *mFilter;
         QMediaPlayer *mPlayer;
         QTreeView *mView;
         QStandardItemModel *mViewModel;
-        QSortFilterProxyModel *mViewProxy;
+        BeetPlayerProxy *mViewProxy;
         QLabel *mNowPlayingL;
         QSlider *mSlider;
         QTextEdit *mCurrentTE;