Dark theme GUI changes

Add icons better suited for dark themes and don't draw an ellipse around
the letter when calling Helper::icon and use the theme's text color to
better match the desktop theme.

Just be a good tenant and respect the user's choices where applicable.

1 files changed, 10 insertions, 10 deletions

diff --git a/fswidget.cpp b/fswidget.cpp
index 739946d..a386abc 100644
--- a/fswidget.cpp
+++ b/fswidget.cpp
@@ -61,7 +61,7 @@ void FSWidget::setupWidget(){
     connect(mFileView, &QTreeView::doubleClicked, this, &FSWidget::doubleClicked);
 
     QToolBar *toolbar = new QToolBar;
-    QPixmap buttplug(":/butt_plug.png");
+    QPixmap buttplug(":/butt_plug_light.png");
     QMatrix rotatematrix;
     rotatematrix.rotate(90);
     QIcon buttplugRight(buttplug.transformed(rotatematrix));
@@ -83,16 +83,16 @@ void FSWidget::setupWidget(){
     toolbar->addAction(deleteFilesA);
     deleteFilesA->setShortcut(Qt::Key_Delete);
     toolbar->addSeparator();
-    QAction *archiveMovieA = new QAction(QIcon(":/huge_bra.png"), tr("Archive movies..."), this);
+    QAction *archiveMovieA = new QAction(QIcon(":/huge_bra_light.png"), tr("Archive movies..."), this);
     connect(archiveMovieA, &QAction::triggered, this, &FSWidget::archiveMovie);
     connect(mMovieWizard, &NewMovieWizard::accepted, this, &FSWidget::refresh);
     toolbar->addAction(archiveMovieA);
-    QAction *archivePicsA = new QAction(QIcon(":/french_maid_dress.png"), tr("Archive pics..."), this);
+    QAction *archivePicsA = new QAction(QIcon(":/male_chastity_belt.png"), tr("Archive pics..."), this);
     connect(archivePicsA, &QAction::triggered, this, &FSWidget::archivePics);
     connect(mNewPicsDlg, &NewPicsDialog::accepted, this, &FSWidget::refresh);
     toolbar->addAction(archivePicsA);
     toolbar->addSeparator();
-    QAction *unpackA = new QAction(QIcon(":/dog_hood.png"), tr("Unpack"), this);
+    QAction *unpackA = new QAction(QIcon(":/dog_hood_light.png"), tr("Unpack"), this);
     connect(unpackA, &QAction::triggered, this, &FSWidget::unpack);
     toolbar->addAction(unpackA);
     QAction *previewA = new QAction(QIcon(":/snapshot.png"), tr("Preview..."), this);
@@ -112,7 +112,7 @@ void FSWidget::setupWidget(){
         connect(a, &QAction::triggered, [=] { mFileView->header()->setSectionHidden(i, a->isChecked() == false); });
         headerAG->addAction(a);
     }
-    QIcon headerIcon = Helper::icon(QColor(255,85,255), Qt::white, 'H', true, true);
+    QIcon headerIcon = Helper::icon(Qt::transparent, qApp->palette().color(QPalette::Text), 'H', true, false);
     QAction *headerA = new QAction(headerIcon, tr("Show headers"), this);
     QMenu *headerMenu = new QMenu;
     headerMenu->addActions(headerAG->actions());
@@ -146,8 +146,8 @@ void FSWidget::setupWidget(){
     QAction *compareA = new QAction(QIcon(":/compare.png"), tr("Compare..."), this);
     connect(compareA, &QAction::triggered, this, &FSWidget::comparePics);
 
-    QIcon plusIcon = Helper::icon(QColor(255,85,255), Qt::white, '+', true, true);
-    QIcon minusIcon = Helper::icon(QColor(255,85,255), Qt::white, '-', true, true);
+    QIcon plusIcon = Helper::icon(Qt::transparent, qApp->palette().color(QPalette::Text), QChar(0x002b), true, false);
+    QIcon minusIcon = Helper::icon(Qt::transparent, qApp->palette().color(QPalette::Text), QChar(0x2212), true, false);
     QLabel *dirL = new QLabel(tr("Dir"));
     mDirCB = new QComboBox;
     mDirCB->setSizeAdjustPolicy(QComboBox::AdjustToContents);
@@ -308,9 +308,9 @@ void FSWidget::gatherData(const QString &curDir){
     QStandardItem *root = mModel->invisibleRootItem();
     mModel->removeRows(0, mModel->rowCount());
     QMimeDatabase mimedb;
-    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);
+    QIcon videoIcon = Helper::icon(Qt::transparent, qApp->palette().color(QPalette::Text), 'M', true, false);
+    QIcon imageIcon = Helper::icon(Qt::transparent, qApp->palette().color(QPalette::Text), 'P', true, false);
+    QIcon otherIcon = Helper::icon(Qt::transparent, qApp->palette().color(QPalette::Text), 'O', true, false);
     QBrush defaultBrush(qApp->palette().brush(QPalette::Text));
     QBrush greenBrush(Qt::green);
     QBrush blueBrush(Qt::blue);