Fix Colors

This is more a qt5-fix than a SmDirModel fix. The global palette doesn't
propagate any more, so we have to set the palette in every QTreeView
separately. Very annoying and tedious. Maybe I missed a Widget or two,
dunno...

15 files changed, 53 insertions, 15 deletions

diff --git a/dbanalyzer.cpp b/dbanalyzer.cpp
index 2996fa0..90debeb 100644
--- a/dbanalyzer.cpp
+++ b/dbanalyzer.cpp
@@ -23,6 +23,7 @@
 #include "dbanalyzer.h"
 #include "smtreemodel.h"
 #include "smtreeitem.h"
+#include "smglobals.h"
 
 DbAnalyzerDialog::DbAnalyzerDialog(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f), mMarkMode(DbAnalyzer::NOMARKS), mCurrentView(0){
     //create tab widget
@@ -51,6 +52,7 @@ DbAnalyzerDialog::DbAnalyzerDialog(QWidget *parent, Qt::WindowFlags f) : QDialog
     noActorsT->setLayout(noActorsL);
     mCurrentView = mNoActorsV;
     mMarkMode = DbAnalyzer::MARKS_ACTORS;
+    SmGlobals::instance()->treeWidgets().append(mNoActorsV);
 
     //no covers
     QWidget *noCoversT = new QWidget;
@@ -70,6 +72,7 @@ DbAnalyzerDialog::DbAnalyzerDialog(QWidget *parent, Qt::WindowFlags f) : QDialog
     mNoCoversV->setAlternatingRowColors(true);
     connect(mNoCoversV, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(noDataDoubleClicked(QModelIndex)));
     noCoversT->setLayout(noCoversL);
+    SmGlobals::instance()->treeWidgets().append(mNoCoversV);
 
     //stray actors
     QWidget *strayActorsT = new QWidget;
@@ -85,6 +88,7 @@ DbAnalyzerDialog::DbAnalyzerDialog(QWidget *parent, Qt::WindowFlags f) : QDialog
     mStrayActorsV->setSelectionMode(QAbstractItemView::ExtendedSelection);
     mStrayActorsV->setAlternatingRowColors(true);
     strayActorsT->setLayout(strayActorsL);
+    SmGlobals::instance()->treeWidgets().append(mStrayActorsV);
 
     //stray genres
     QWidget *strayGenresT = new QWidget;
@@ -100,6 +104,7 @@ DbAnalyzerDialog::DbAnalyzerDialog(QWidget *parent, Qt::WindowFlags f) : QDialog
     mStrayGenresV->setSelectionMode(QAbstractItemView::ExtendedSelection);
     mStrayGenresV->setAlternatingRowColors(true);
     strayGenresT->setLayout(strayGenresL);
+    SmGlobals::instance()->treeWidgets().append(mStrayGenresV);
 
     //buttons
     mCancel = new QPushButton(tr("Cancel"));
diff --git a/filepropertiesdialog.cpp b/filepropertiesdialog.cpp
index a49b863..a36517a 100644
--- a/filepropertiesdialog.cpp
+++ b/filepropertiesdialog.cpp
@@ -15,6 +15,7 @@
 #include <QVariant>
 #include <QPalette>
 #include <QtWidgets/QTabWidget>
+#include <QApplication>
 
 #include "filepropertiesdialog.h"
 #include "seriesmetadatamodel.h"
@@ -52,6 +53,7 @@ FilePropertiesDialog::FilePropertiesDialog(int seriesPartId, QWidget *parent, Qt
 	streamDataLayout->addWidget(mView);
 	streamData->setLayout(streamDataLayout);
 	mTab->addTab(streamData, tr("Stream data"));
+    mView->setPalette(qApp->palette());
 
 	//metadata widget
 	mMetadata = new MetadataWidget;
diff --git a/filestreewidget.cpp b/filestreewidget.cpp
index 669a57a..3635ac2 100644
--- a/filestreewidget.cpp
+++ b/filestreewidget.cpp
@@ -360,6 +360,7 @@ void FilesTreeWidget::playItems(const QStringList &paths){
 FilesTreeView::FilesTreeView(QWidget *parent) : QTreeView(parent), mHoverPics(false){
 	setAttribute(Qt::WA_Hover);
     mHoverWin = new HoverWindow(this);
+    SmGlobals::instance()->treeWidgets().append(this);
 }
 
 void FilesTreeView::setModel(QAbstractItemModel *model){
diff --git a/filesystemwidget.cpp b/filesystemwidget.cpp
index efe5149..49a0159 100644
--- a/filesystemwidget.cpp
+++ b/filesystemwidget.cpp
@@ -60,6 +60,7 @@ FilesystemWidget::FilesystemWidget(QWidget *parent) : QWidget(parent), mClipboar
 	mDirView->setSortingEnabled(true);
 	mDirView->sortByColumn(0, Qt::AscendingOrder);
 	mDirView->setAlternatingRowColors(true);
+    SmGlobals::instance()->treeWidgets().append(mDirView);
 
 	mFileView = new FileView;
 	mFileProxy = new FilesystemFileProxy;
diff --git a/fileview.cpp b/fileview.cpp
index 3bd45d4..f7c65ca 100644
--- a/fileview.cpp
+++ b/fileview.cpp
@@ -24,6 +24,7 @@
 #include <QDir>
 #include <QSortFilterProxyModel>
 #include <QtWidgets/QInputDialog>
+#include <QPalette>
 
 #include "fileview.h"
 #include "hoverwindow.h"
@@ -39,6 +40,7 @@ FileView::FileView(QWidget *parent) : QTreeView(parent), mDeleteA(0) {
 	QSize curSize = SmGlobals::instance()->cursorSize();
 	mHoverWin->setHoverOffset(QPoint(curSize.width() + 30, 0));
 	readConfig();
+    SmGlobals::instance()->treeWidgets().append(this);
 }
 
 void FileView::markFiles(){
diff --git a/mappingtablewidget.cpp b/mappingtablewidget.cpp
index 8b220a5..991b09d 100644
--- a/mappingtablewidget.cpp
+++ b/mappingtablewidget.cpp
@@ -28,6 +28,7 @@ MappingTableWidget::MappingTableWidget(const QString &table, QWidget *parent) :
 	mModel->setHeaderData(0, Qt::Horizontal, mTable);
 	mView->setModel(mModel);
 	mView->setAlternatingRowColors(true);
+    SmGlobals::instance()->treeWidgets().append(mView);
 
 	//mapping model
 	mMappingModel = static_cast<MappingTableModel*>(SmGlobals::instance()->model(mTable));
diff --git a/mappingtreewidget.cpp b/mappingtreewidget.cpp
index d001d8b..e026537 100644
--- a/mappingtreewidget.cpp
+++ b/mappingtreewidget.cpp
@@ -21,6 +21,7 @@
 #include <QtWidgets/QAction>
 #include <QtWidgets/QMenu>
 #include <QSqlError>
+#include <QApplication>
 
 #include "mappingtreewidget.h"
 #include "mappingtreemodel.h"
@@ -43,6 +44,7 @@ MappingTreeWidget::MappingTreeWidget(QWidget *parent) : QWidget(parent){
     mTree->setColumnHidden(4, true);
     mTree->setAlternatingRowColors(true);
     mTree->expandAll();
+    SmGlobals::instance()->treeWidgets().append(mTree);
     connect(mModel, SIGNAL(needExpansion()), mTree, SLOT(expandAll()));
     connect(mTree->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(selectionChanged()));
     mTypeBox = new QComboBox;
@@ -263,7 +265,10 @@ void MappingTreeView::contextMenuEvent(QContextMenuEvent *e){
     ctxMenu.exec(e->globalPos());
 }
 
-MappingTreeResultView::MappingTreeResultView(QWidget *parent) : QTreeView(parent) {}
+MappingTreeResultView::MappingTreeResultView(QWidget *parent) : QTreeView(parent) {
+    setAlternatingRowColors(true);
+    setPalette(qApp->palette());
+}
 
 MappingEditWidget::MappingEditWidget(QWidget *parent) : QWidget(parent){
     //the views
diff --git a/newmoviewizard.cpp b/newmoviewizard.cpp
index 36bf016..18fe68d 100644
--- a/newmoviewizard.cpp
+++ b/newmoviewizard.cpp
@@ -219,7 +219,8 @@ void MovieInfoPage::setupGui(){
 	mFileView = new QTreeView;
 	mFileView->setModel(mFileModel);
 	connect(mFileView->selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)), this, SLOT(fileSelectionChanged(QModelIndex,QModelIndex)));
-	mFileView->setAlternatingRowColors(true);
+    mFileView->setAlternatingRowColors(true);
+    SmGlobals::instance()->treeWidgets().append(mFileView);
 
 	//add + remove files
 	QHBoxLayout *fileButtonLayout = new QHBoxLayout;
diff --git a/newpicsdialog.cpp b/newpicsdialog.cpp
index 5269e18..37a9cba 100644
--- a/newpicsdialog.cpp
+++ b/newpicsdialog.cpp
@@ -18,6 +18,7 @@
 #include <QPersistentModelIndex>
 #include <QtWidgets/QHBoxLayout>
 #include <QtWidgets/QVBoxLayout>
+#include <QApplication>
 
 #include "newpicsdialog.h"
 #include "smtreeitem.h"
@@ -52,6 +53,8 @@ void NewPicsDialog::setupDlg(){
     mFilesV->setSortingEnabled(true);
     mFilesV->setAlternatingRowColors(true);
     mFilesV->setColumnHidden(2, true);
+    mFilesV->setAlternatingRowColors(true);
+    mFilesV->setPalette(qApp->palette());
     mAddFiles = new QPushButton(tr("Select..."));
     connect(mAddFiles, SIGNAL(clicked()), this, SLOT(selectFiles()));
     mRemoveFiles = new QPushButton(tr("Remove"));
diff --git a/pictureswidget.cpp b/pictureswidget.cpp
index 703953a..fd9812e 100644
--- a/pictureswidget.cpp
+++ b/pictureswidget.cpp
@@ -154,6 +154,7 @@ PictureView::PictureView(QWidget *parent) : QTreeView(parent) {
     setAlternatingRowColors(true);
     setColumnHidden(1, true);
     setColumnHidden(4, true);
+    SmGlobals::instance()->treeWidgets().append(this);
 }
 
 void PictureView::mappingChanged(int pMapId){
diff --git a/seriesmetadatamodel.cpp b/seriesmetadatamodel.cpp
index df8635b..d00dc40 100644
--- a/seriesmetadatamodel.cpp
+++ b/seriesmetadatamodel.cpp
@@ -296,6 +296,7 @@ MetadataDisplay::MetadataDisplay(QWidget *parent) : QWidget(parent){
 	QVBoxLayout *mainLayout = new QVBoxLayout;
 	mainLayout->addWidget(gb);
 	setLayout(mainLayout);
+    SmGlobals::instance()->treeWidgets().append(mDisplay);
 }
 
 void MetadataDisplay::setSeriesPartId(int seriesPartId){
diff --git a/seriestreewidget.cpp b/seriestreewidget.cpp
index ff174d4..b790be5 100644
--- a/seriestreewidget.cpp
+++ b/seriestreewidget.cpp
@@ -399,6 +399,7 @@ void SeriesTreeWidget::setFilterMode(int mode){
 SeriesTreeView::SeriesTreeView(QWidget *parent) : QTreeView(parent), mHover(false) {
 	setAttribute(Qt::WA_Hover);
     mHoverWin = new HoverWindow(this);
+    SmGlobals::instance()->treeWidgets().append(this);
 	readSettings();
 }
 
diff --git a/shemov.cpp b/shemov.cpp
index 1fcc5f5..a4226ad 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -181,6 +181,7 @@ void SheMov::configure(){
 	dlg.exec();
 	createOpenWithMenuFS();
 	createOpenWithMenuAV();
+    createPalette();
 	emit configChanged();
 }
 
@@ -1078,18 +1079,7 @@ void SheMov::readSettings(){
 			}
 		}
 	}
-	bool alternate = s.value("ui/allowalternate").toBool();
-	QPalette pal(palette());
-	if(alternate){
-		QVariant basecolor = s.value("ui/basecolor");
-		QVariant alternatecolor = s.value("ui/alternatecolor");
-		pal.setColor(QPalette::Base, basecolor.value<QColor>());
-		pal.setColor(QPalette::AlternateBase, alternatecolor.value<QColor>());
-	}else{
-		pal.setColor(QPalette::Base, Qt::white);
-		pal.setColor(QPalette::AlternateBase, Qt::white);
-	}
-	qApp->setPalette(pal);
+
 	int seriesFilterMode = s.value("archive/filtermode").toInt();
 	QAction *filterAction = qobject_cast<QAction*>(mFilterMapper->mapping(seriesFilterMode));
 	if(filterAction){
@@ -1100,6 +1090,26 @@ void SheMov::readSettings(){
     if(showAllFiles){
         mShowBurnFilesA->trigger();
     }
+    createPalette();
+}
+
+void SheMov::createPalette(){
+    QSettings s;
+    bool alternate = s.value("ui/allowalternate").toBool();
+    QPalette pal(palette());
+    if(alternate){
+        QVariant basecolor = s.value("ui/basecolor");
+        QVariant alternatecolor = s.value("ui/alternatecolor");
+        pal.setColor(QPalette::Base, basecolor.value<QColor>());
+        pal.setColor(QPalette::AlternateBase, alternatecolor.value<QColor>());
+    }else{
+        pal.setColor(QPalette::Base, Qt::white);
+        pal.setColor(QPalette::AlternateBase, Qt::white);
+    }
+    qApp->setPalette(pal);
+    foreach(QWidget *w, SmGlobals::instance()->treeWidgets()){
+        w->setPalette(pal);
+    }
 }
 
 void SheMov::checkConsistency(){
diff --git a/shemov.h b/shemov.h
index bdb8868..206aa73 100644
--- a/shemov.h
+++ b/shemov.h
@@ -72,7 +72,8 @@ class SheMov : public QMainWindow {
 		void createOpenWithMenuAV();
 		void createToolBar();
 		void writeSettings();
-		void readSettings();
+        void readSettings();
+        void createPalette();
 
 		//Statusbar Items
 		QLabel *mSelectedItems;
diff --git a/smglobals.h b/smglobals.h
index 31a90e7..a91d162 100644
--- a/smglobals.h
+++ b/smglobals.h
@@ -13,6 +13,7 @@
 #include <QHash>
 #include <QSize>
 #include <QPair>
+#include <QList>
 
 class QAbstractItemModel;
 class PictureViewer2;
@@ -57,6 +58,7 @@ class SmGlobals : public QObject {
         const QSize minPVSize() const { return QSize(640, 480); }
 		const QHash<QString, QString> & icons() const { return mIcons; }
 		qint64 dvdSize() const { return mDvdSize; }
+        QList<QWidget*> &treeWidgets() { return mTreeWidgets; }
 
 	private:
 		SmGlobals();
@@ -70,6 +72,7 @@ class SmGlobals : public QObject {
 		QSize mCursorSize;
 		QHash<QString, QString> mIcons;
 		qint64 mDvdSize;
+        QList<QWidget*> mTreeWidgets;
 };
 
 #endif