summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArno <arno@disconnect.de>2018-11-23 14:17:09 +0100
committerArno <arno@disconnect.de>2018-11-23 14:17:09 +0100
commit7fd099fb737d625befa6f04dcfad1f6c74705e14 (patch)
tree2864b6177561e142f325d03c9f9b6785cb113748
parent8c932c2d21e35fe5b446f80643f3b0ecf19b177d (diff)
downloadSheMov-7fd099fb737d625befa6f04dcfad1f6c74705e14.tar.gz
SheMov-7fd099fb737d625befa6f04dcfad1f6c74705e14.tar.bz2
SheMov-7fd099fb737d625befa6f04dcfad1f6c74705e14.zip
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.
-rw-r--r--fswidget.cpp4
-rw-r--r--moviewidget.cpp16
-rw-r--r--pictureviewer2.cpp2
-rw-r--r--randomtab.cpp4
-rw-r--r--shemov.cpp3
-rw-r--r--smdialog.cpp3
6 files changed, 18 insertions, 14 deletions
diff --git a/fswidget.cpp b/fswidget.cpp
index ddda387..e7e7278 100644
--- a/fswidget.cpp
+++ b/fswidget.cpp
@@ -311,7 +311,7 @@ void FSWidget::gatherData(const QString &curDir){
QIcon videoIcon = Helper::icon(QColor(255,85,255), Qt::white, 'M', true, true);
QIcon imageIcon = Helper::icon(QColor(255,85,255), Qt::white, 'P', true, true);
QIcon otherIcon = Helper::icon(QColor(255,85,255), Qt::white, 'O', true, true);
- QBrush blackBrush(Qt::black);
+ QBrush defaultBrush(qApp->palette().brush(QPalette::Text));
QBrush greenBrush(Qt::darkGreen);
QBrush blueBrush(Qt::darkBlue);
@@ -333,7 +333,7 @@ void FSWidget::gatherData(const QString &curDir){
QDirIterator it(curDir, QDir::Files);
mFileView->setUpdatesEnabled(false);
while(it.hasNext()){
- QBrush currentBrush = blackBrush;
+ QBrush currentBrush = defaultBrush;
QFileInfo fi = it.next();
++fileCount;
QMimeType mimeType = mimedb.mimeTypeForFile(fi);
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<QStandardItem*> 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<QStandardItem*> 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<QStandardItem*> 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");
diff --git a/pictureviewer2.cpp b/pictureviewer2.cpp
index 5b30e1b..ed73150 100644
--- a/pictureviewer2.cpp
+++ b/pictureviewer2.cpp
@@ -792,7 +792,7 @@ void PictureViewer2Item::paint(QPainter *painter, const QStyleOptionGraphicsItem
painter->setRenderHint(QPainter::TextAntialiasing, true);
QColor bgColor = QColor(Qt::white);
bgColor.setAlpha(80);
- QColor fgColor = QColor(Qt::black);
+ QColor fgColor = QColor(qApp->palette().color(QPalette::Text));
QBrush brush(bgColor);
painter->setPen(QColor(Qt::yellow));
painter->setBrush(brush);
diff --git a/randomtab.cpp b/randomtab.cpp
index 93113b7..2907d86 100644
--- a/randomtab.cpp
+++ b/randomtab.cpp
@@ -29,6 +29,7 @@
#include <QAction>
#include <QMenu>
#include <QContextMenuEvent>
+#include <QApplication>
#include <algorithm>
#include <random>
@@ -130,7 +131,8 @@ void RandomTab::setupGui(){
mContextMenu->addAction(goA);
QGroupBox *miscBox = new QGroupBox(tr("Misc."));
- QPushButton *miscB = new QPushButton(Helper::icon(QColor(0, 0, 0, 0), Qt::black, QChar(0x26A4), true, false), tr("Global..."));
+ QColor brushColor = qApp->palette().color(QPalette::Text);
+ QPushButton *miscB = new QPushButton(Helper::icon(QColor(0, 0, 0, 0), brushColor, QChar(0x26A4), true, false), tr("Global..."));
miscB->setMenu(SmGlobals::instance()->globalAction()->menu());
QHBoxLayout *miscL = new QHBoxLayout;
miscL->addWidget(miscB);
diff --git a/shemov.cpp b/shemov.cpp
index eb9fc20..583e008 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -78,7 +78,8 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla
connect(mStatisticsA, &QAction::triggered, this, &SheMov::showStatistics);
//global menu
- QAction *globalMenuA = new QAction(Helper::icon(QColor(0, 0, 0, 0), Qt::black, QChar(0x26A4), true, false), tr("Global"), this);
+ QColor fgColor = qApp->palette().color(QPalette::Text);
+ QAction *globalMenuA = new QAction(Helper::icon(QColor(0, 0, 0, 0), fgColor, QChar(0x26A4), true, false), tr("Global"), this);
QMenu *globalMenu = new QMenu;
globalMenu->addAction(mConsistencyA);
globalMenu->addSeparator();
diff --git a/smdialog.cpp b/smdialog.cpp
index e5ca13c..bd6c3f6 100644
--- a/smdialog.cpp
+++ b/smdialog.cpp
@@ -12,6 +12,7 @@
#include <QFormLayout>
#include <QTextEdit>
#include <QTextBlock>
+#include <QApplication>
#include "smdialog.h"
#include "helper.h"
@@ -107,7 +108,7 @@ void UnpackDialog::addOutput(const QString &msg, const QString &prepend){
cur.insertText(prepend);
}
QTextCharFormat fmtBlack;
- fmtBlack.setForeground(QBrush(Qt::black));
+ fmtBlack.setForeground(qApp->palette().color(QPalette::Text));
cur.setCharFormat(fmtBlack);
cur.insertText(msg);
mOutput->ensureCursorVisible();