From 24e36ccd5b97cc3b6e669b4c651d38b6c2f64906 Mon Sep 17 00:00:00 2001
From: Arno <arno@disconnect.de>
Date: Sun, 15 Oct 2017 06:56:49 +0200
Subject: Fix Search and Current Directory Groupbox

Set ModelType for all views and make the QLineEdit for the current
directory readonly instead of disabled. The latter causes the groupbox
text to be double underlined for some reason...
---
 playerwidget.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/playerwidget.cpp b/playerwidget.cpp
index 60cbe8b..7814f02 100644
--- a/playerwidget.cpp
+++ b/playerwidget.cpp
@@ -154,7 +154,7 @@ void PlayerWidget::setupGui(){
     //directories
     QGroupBox *dirGB = new QGroupBox(QString(tr("Current Directory")));
     mDir = new QLineEdit;
-    mDir->setEnabled(false);
+    mDir->setReadOnly(true);
     QToolBar *dirTB = new QToolBar;
     QImage upImg(":/stomp.png");
     upImg = upImg.mirrored();
@@ -873,7 +873,11 @@ void PlayerWidget::doModelChanged(){
     mDeselectAllA->setEnabled(mModelType == Folders);
     mDeleteFilesA->setEnabled(mModelType == Folders);
     mRefreshA->setEnabled(mModelType == Folders);
-    mSearchDirStack->setCurrentIndex(1 ? mModelType == Folders : 0);
+    if(mModelType == Folders){
+        mSearchDirStack->setCurrentIndex(1);
+    }else{
+        mSearchDirStack->setCurrentIndex(0);
+    }
     mRemoveFromFavoritesA->setEnabled(mModelType == Favorites);
 }
 
@@ -1117,6 +1121,7 @@ void PlayerWidget::doPopulateByArtist(){
     qApp->setOverrideCursor(Qt::BusyCursor);
     mView->setModel(mViewModel);
     mCurrentModel = mViewModel;
+    mModelType = DoNotCare;
     mViewModel->clear();
     mViewModel->setHorizontalHeaderLabels(QStringList() << tr("Artist name"));
     QStandardItem *root = mViewModel->invisibleRootItem();
@@ -1134,6 +1139,7 @@ void PlayerWidget::doPopulateByAlbum(){
     qApp->setOverrideCursor(Qt::BusyCursor);
     mView->setModel(mViewModel);
     mCurrentModel = mViewModel;
+    mModelType = DoNotCare;
     mViewModel->clear();
     mViewModel->setHorizontalHeaderLabels(QStringList() << tr("Album name"));
     QStandardItem *root = mViewModel->invisibleRootItem();
@@ -1150,6 +1156,7 @@ void PlayerWidget::doPopulateByGenre(){
     qApp->setOverrideCursor(Qt::BusyCursor);
     mView->setModel(mViewModel);
     mCurrentModel = mViewModel;
+    mModelType = DoNotCare;
     mViewModel->clear();
     mViewModel->setHorizontalHeaderLabels(QStringList() << tr("Genre name"));
     QStandardItem *root = mViewModel->invisibleRootItem();
@@ -1166,6 +1173,7 @@ void PlayerWidget::doPopulateBySong(){
     qApp->setOverrideCursor(Qt::BusyCursor);
     mView->setModel(mViewModel);
     mCurrentModel = mViewModel;
+    mModelType = DoNotCare;
     mViewModel->clear();
     mViewModel->setHorizontalHeaderLabels(QStringList() << tr("Genre name"));
     QStandardItem *root = mViewModel->invisibleRootItem();
@@ -1182,6 +1190,7 @@ void PlayerWidget::doPopulateByDate(){
     qApp->setOverrideCursor(Qt::BusyCursor);
     mView->setModel(mViewModel);
     mCurrentModel = mViewModel;
+    mModelType = DoNotCare;
     mViewModel->clear();
     mViewModel->setHorizontalHeaderLabels(QStringList() << tr("Date added"));
     QStandardItem *root = mViewModel->invisibleRootItem();
-- 
cgit v1.2.3-70-g09d2