From 7fd099fb737d625befa6f04dcfad1f6c74705e14 Mon Sep 17 00:00:00 2001 From: Arno Date: Fri, 23 Nov 2018 14:17:09 +0100 Subject: Use palette colors where applicable Don't assume we know what color ought to use. Ask the palette where applicable, but keep the modified configuration options. --- moviewidget.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'moviewidget.cpp') diff --git a/moviewidget.cpp b/moviewidget.cpp index bf6777d..50e4a11 100644 --- a/moviewidget.cpp +++ b/moviewidget.cpp @@ -222,13 +222,13 @@ void MovieWidget::populateBySeries(){ mTopModel->clear(); mTopModel->setHorizontalHeaderLabels(QStringList() << tr("Ct.") << tr("Series")); QFont f("Monospace"); - QBrush blackBrush(Qt::black); + QBrush defaultBrush(qApp->palette().brush(QPalette::Text)); QBrush greenBrush(Qt::darkGreen); QStandardItem *root = mTopModel->invisibleRootItem(); QSqlDatabase db = QSqlDatabase::database("treedb"); QSqlQuery seriesQ("SELECT series.tseries_name, seriesparts.iseriesparts_id, seriesparts.iseriespart, seriesparts.bfavorite, seriesparts.tsubtitle, count(files.*) FROM series, seriesparts, files WHERE series.iseries_id = seriesparts.iseries_id and seriesparts.iseriesparts_id = files.iseriespart_id GROUP BY series.tseries_name, seriesparts.iseriesparts_id, seriesparts.iseriespart, seriesparts.bfavorite, seriesparts.tsubtitle ORDER BY series.tseries_name, seriesparts.iseriespart, seriesparts.tsubtitle", db); while(seriesQ.next()){ - QBrush currentBrush = blackBrush; + QBrush currentBrush = defaultBrush; QList items; QString series(seriesQ.value(0).toString()); if(seriesQ.value(2).toInt() > 0){ @@ -272,13 +272,13 @@ void MovieWidget::populateByActors(){ mTopModel->clear(); mTopModel->setHorizontalHeaderLabels(QStringList() << tr("Ct.") << tr("Series")); QFont f("Monospace"); - QBrush blackBrush(Qt::black); + QBrush defaultBrush(qApp->palette().brush(QPalette::Text)); QBrush greenBrush(Qt::darkGreen); QStandardItem *root = mTopModel->invisibleRootItem(); QSqlDatabase db = QSqlDatabase::database("treedb"); QSqlQuery actorsQ("SELECT actors.tactorname, seriesparts_actormap.iseriesparts_id, series.tseries_name, seriesparts.iseriesparts_id, seriesparts.iseriespart, seriesparts.bfavorite, seriesparts.tsubtitle, COUNT(files.*) FROM actors, seriesparts_actormap, series, seriesparts, files WHERE actors.iactors_id = seriesparts_actormap.iactors_id AND seriesparts_actormap.iseriesparts_id = seriesparts.iseriesparts_id AND seriesparts.iseries_id = series.iseries_id AND seriesparts.iseriesparts_id = files.iseriespart_id GROUP BY actors.tactorname, seriesparts_actormap.iseriesparts_id, series.tseries_name, seriesparts.iseriesparts_id, seriesparts.iseriespart, seriesparts.bfavorite, seriesparts.tsubtitle ORDER BY actors.tactorname, series.tseries_name, seriesparts.iseriespart, seriesparts.tsubtitle", db); while(actorsQ.next()){ - QBrush currentBrush = blackBrush; + QBrush currentBrush = defaultBrush; QList items; QString actor(actorsQ.value(0).toString()); actor.append(QString(" - %1").arg(actorsQ.value(2).toString())); @@ -323,13 +323,13 @@ void MovieWidget::populateByGenres(){ mTopModel->clear(); mTopModel->setHorizontalHeaderLabels(QStringList() << tr("Ct.") << tr("Series")); QFont f("Monospace"); - QBrush blackBrush(Qt::black); + QBrush defaultBrush(qApp->palette().brush(QPalette::Text)); QBrush greenBrush(Qt::darkGreen); QStandardItem *root = mTopModel->invisibleRootItem(); QSqlDatabase db = QSqlDatabase::database("treedb"); QSqlQuery genresQ("SELECT genres.tgenrename, seriesparts_genremap.iseriesparts_id, series.tseries_name, seriesparts.iseriesparts_id, seriesparts.iseriespart, seriesparts.bfavorite, seriesparts.tsubtitle, COUNT(files.*) FROM genres, seriesparts_genremap, series, seriesparts, files WHERE genres.igenres_id = seriesparts_genremap.igenres_id AND seriesparts_genremap.iseriesparts_id = seriesparts.iseriesparts_id AND seriesparts.iseries_id = series.iseries_id AND seriesparts.iseriesparts_id = files.iseriespart_id GROUP BY genres.tgenrename, seriesparts_genremap.iseriesparts_id, series.tseries_name, seriesparts.iseriesparts_id, seriesparts.iseriespart, seriesparts.bfavorite, seriesparts.tsubtitle ORDER BY genres.tgenrename, series.tseries_name, seriesparts.iseriespart, seriesparts.tsubtitle", db); while(genresQ.next()){ - QBrush currentBrush = blackBrush; + QBrush currentBrush = defaultBrush; QList items; QString genre(genresQ.value(0).toString()); genre.append(QString(" - %1").arg(genresQ.value(2).toString())); @@ -372,10 +372,10 @@ void MovieWidget::topSelectionChanged(){ mBottomView->setSortingEnabled(false); mBottomView->setRootIsDecorated(false); mBottomModel->clear(); - QBrush blackBrush(Qt::black); + QBrush defaultBrush(qApp->palette().brush(QPalette::Text)); QBrush redBrush(Qt::darkRed); QBrush greenBrush(Qt::darkGreen); - QBrush currentBrush = blackBrush; + QBrush currentBrush = defaultBrush; QSqlDatabase db = QSqlDatabase::database("treedb"); QSqlQuery selectFilesQ(db); selectFilesQ.prepare("SELECT tfilename, cmd5sum, bisize, siquality, iduration, sifileno, idvd FROM files WHERE iseriespart_id = :arg ORDER BY sifileno"); -- cgit v1.2.3-70-g09d2