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.

18 files changed, 47 insertions, 32 deletions

diff --git a/archivebrowser.cpp b/archivebrowser.cpp
index 3341d7c..1a73be4 100644
--- a/archivebrowser.cpp
+++ b/archivebrowser.cpp
@@ -21,6 +21,7 @@
 #include <QProgressDialog>
 #include <QHeaderView>
 #include <QMenu>
+#include <QApplication>
 
 #include "archivebrowser.h"
 #include "archivebrowsermodel.h"
@@ -65,26 +66,26 @@ ArchiveBrowser::ArchiveBrowser(QWidget *parent) : QWidget(parent), mSelectedSize
     mTree->addAction(refreshA);
     toolBar->addSeparator();
     mTree->addAction(Helper::createSeparator(this));
-    QAction *playSelectedA = new QAction(QIcon(":/dildo.png"), tr("Play selected..."), this);
+    QAction *playSelectedA = new QAction(QIcon::fromTheme("media-playback-start"), tr("Play selected..."), this);
     connect(playSelectedA, &QAction::triggered, this, &ArchiveBrowser::playSelected);
     toolBar->addAction(playSelectedA);
     mTree->addAction(playSelectedA);
-    QAction *moveToUSBA = new QAction(QIcon(":/clean_tampon.png"), tr("Move to USB..."), this);
+    QAction *moveToUSBA = new QAction(QIcon(":/usb-32.png"), tr("Move to USB..."), this);
     connect(moveToUSBA, &QAction::triggered, this, &ArchiveBrowser::moveToUSB);
     toolBar->addAction(moveToUSBA);
     mTree->addAction(moveToUSBA);
-    QAction *moveToBurnA = new QAction(QIcon(":/shackles.png"), tr("Move to burn..."), this);
+    QAction *moveToBurnA = new QAction(QIcon(":/fire.png"), tr("Move to burn..."), this);
     connect(moveToBurnA, &QAction::triggered, this, &ArchiveBrowser::moveToBurn);
     toolBar->addAction(moveToBurnA);
     mTree->addAction(moveToBurnA);
     toolBar->addSeparator();
     mTree->addAction(Helper::createSeparator(this));
-    QIcon downArrowIcon = Helper::icon(QColor(255,85,255), Qt::white, QChar(0x2b07), true, true);
+    QIcon downArrowIcon = Helper::icon(Qt::transparent, qApp->palette().color(QPalette::Text), QChar(0x2b07), true, false);
     QAction *expandAllA = new QAction(downArrowIcon, tr("Expand all"), this);
     connect(expandAllA, &QAction::triggered, archiveTree(), &SmTreeView::expandAll);
     toolBar->addAction(expandAllA);
     mTree->addAction(expandAllA);
-    QIcon upArrowIcon = Helper::icon(QColor(255,85,255), Qt::white, QChar(0x2b06), true, true);
+    QIcon upArrowIcon = Helper::icon(Qt::transparent, qApp->palette().color(QPalette::Text), QChar(0x2b06), true, false);
     QAction *collapseAllA = new QAction(upArrowIcon, tr("Collapse all"), this);
     connect(collapseAllA, &QAction::triggered, archiveTree(), &SmTreeView::collapseAll);
     toolBar->addAction(collapseAllA);
@@ -106,7 +107,7 @@ ArchiveBrowser::ArchiveBrowser(QWidget *parent) : QWidget(parent), mSelectedSize
         }
         connect(a, &QAction::triggered, [=] { mTree->toggleHeader(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(hDataAG->actions());
diff --git a/butt_plug_light.png b/butt_plug_light.png
new file mode 100644
index 0000000..d6e2f03
--- /dev/null
+++ b/butt_plug_light.png
diff --git a/configurationdialog.cpp b/configurationdialog.cpp
index da394e8..f5fc7d1 100644
--- a/configurationdialog.cpp
+++ b/configurationdialog.cpp
@@ -157,8 +157,8 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : S
 
     // icons
     mIconModel = new QStandardItemModel;
-    const QHash<QString, QString> icons = SmGlobals::instance()->icons();
-    for(QHash<QString, QString>::const_iterator it = icons.constBegin(); it != icons.constEnd(); ++it){
+    const auto icons = SmGlobals::instance()->icons();
+    for(auto it = icons.constBegin(); it != icons.constEnd(); ++it){
         QStandardItem *item = new QStandardItem(QIcon(it.value()), it.key());
         mIconModel->appendRow(item);
     }
diff --git a/dog_hood_light.png b/dog_hood_light.png
new file mode 100644
index 0000000..f16fdd3
--- /dev/null
+++ b/dog_hood_light.png
diff --git a/fire.png b/fire.png
new file mode 100644
index 0000000..48293ec
--- /dev/null
+++ b/fire.png
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);
diff --git a/helper.cpp b/helper.cpp
index 02b3fac..bfff932 100644
--- a/helper.cpp
+++ b/helper.cpp
@@ -460,8 +460,9 @@ namespace Helper {
         p->setRenderHint(QPainter::Antialiasing);
         p->setRenderHint(QPainter::TextAntialiasing);
         p->setRenderHint(QPainter::SmoothPixmapTransform);
-        QFont f("Monospace");
-        f.setPixelSize(30);
+        //QFont f("Monospace");
+        QFont f(qApp->font());
+        f.setPixelSize(28);
         f.setBold(bold);
         p->setPen(fg);
         if(drawEllipse){
diff --git a/huge_bra_light.png b/huge_bra_light.png
new file mode 100644
index 0000000..3c212a1
--- /dev/null
+++ b/huge_bra_light.png
diff --git a/male_chastity_belt.png b/male_chastity_belt.png
index ca3a859..c08c4e8 100644
--- a/male_chastity_belt.png
+++ b/male_chastity_belt.png
diff --git a/moviewidget.cpp b/moviewidget.cpp
index dd51a34..9c114e6 100644
--- a/moviewidget.cpp
+++ b/moviewidget.cpp
@@ -39,7 +39,7 @@ MovieWidget::~MovieWidget(){
 
 void MovieWidget::setupWidget(){
     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));
@@ -117,7 +117,7 @@ void MovieWidget::setupWidget(){
     connect(mBottomView, &SmView::doubleClicked, this, &MovieWidget::bottomDoubleClicked);
     QAction *playSelectedA = new QAction(QIcon(":/spreadingpants.png"), tr("Play selected..."), this);
     connect(playSelectedA, &QAction::triggered, this, &MovieWidget::playSelected);
-    QAction *editFileA = new QAction(QIcon(":/huge_bra.png"), tr("Edit file..."), this);
+    QAction *editFileA = new QAction(QIcon(":/huge_bra_light.png"), tr("Edit file..."), this);
     connect(editFileA, &QAction::triggered, this, &MovieWidget::editFile);
     QAction *filenameToClipA = new QAction(tr("Filename to clip"), this);
     connect(filenameToClipA, &QAction::triggered, [=] { copyToClipboard(FilenameRole); });
diff --git a/pictureswidget.cpp b/pictureswidget.cpp
index 5c6f8b0..bc7fcc1 100644
--- a/pictureswidget.cpp
+++ b/pictureswidget.cpp
@@ -15,6 +15,7 @@
 #include <QMenu>
 #include <QHeaderView>
 #include <QToolBar>
+#include <QApplication>
 
 #include "pictureswidget.h"
 #include "picturelistview.h"
@@ -59,7 +60,7 @@ void PicturesWidget::setupWidget(){
     QWidget *spacer1 = new QWidget;
     spacer1->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
     toolBar->addWidget(spacer1);
-    QAction *slideA = new QAction(QIcon(":/huge_bra.png"), tr("Slide dialog..."), this);
+    QAction *slideA = new QAction(QIcon(":/huge_bra_light.png"), tr("Slide dialog..."), this);
     connect(slideA, &QAction::triggered, [=] {
         int ret = SmGlobals::instance()->pictureViewer()->slideDialog()->exec();
         if(ret == QDialog::Accepted){
@@ -76,7 +77,7 @@ void PicturesWidget::setupWidget(){
     mPictureListView->addAction(deleteA);
     toolBar->addSeparator();
     mPictureListView->addAction(Helper::createSeparator(mPictureListView));
-    QAction *editMappingsA = new QAction(QIcon(":/squirting_nipple.png"), tr("Edit mappings..."), this);
+    QAction *editMappingsA = new QAction(QIcon(":/squirting_nipple_light.png"), tr("Edit mappings..."), this);
     connect(editMappingsA, &QAction::triggered, this, &PicturesWidget::editMappings);
     toolBar->addAction(editMappingsA);
     mPictureListView->addAction(editMappingsA);
@@ -100,7 +101,7 @@ void PicturesWidget::setupWidget(){
         }
         connect(a, &QAction::triggered, [=] { mPictureListView->toggleHeader(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(hDataAG->actions());
diff --git a/randomtab.cpp b/randomtab.cpp
index 0b5f8d9..292ae98 100644
--- a/randomtab.cpp
+++ b/randomtab.cpp
@@ -101,9 +101,9 @@ void RandomTab::setupGui(){
     connect(refreshB, &QPushButton::clicked, this, &RandomTab::refreshComboboxes);
     QPushButton *clearB = new QPushButton(QIcon(":/delete.png"), tr("Clear"));
     connect(clearB, &QPushButton::clicked, this, &RandomTab::clearAll);
-    QPushButton *goB = new QPushButton(QIcon(":/huge_bra.png"), tr("Go!"));
+    QPushButton *goB = new QPushButton(QIcon(":/huge_bra_light.png"), tr("Go!"));
     connect(goB, &QPushButton::clicked, this, &RandomTab::select);
-    QAction *goA = new QAction(QIcon(":/huge_bra.png"), tr("Go!"), this);
+    QAction *goA = new QAction(QIcon(":/huge_bra_light.png"), tr("Go!"), this);
     connect(goA, &QAction::triggered, this, &RandomTab::select);
     QGridLayout *actionL = new QGridLayout;
     actionL->addWidget(clearB, 0, 0);
@@ -377,7 +377,7 @@ void RandomTab::select(){
                 fData << item;
             }
             fData[0]->setText(randomFilesQ.value(0).toString());
-            fData[0]->setIcon(QIcon(":/huge_bra.png"));
+            fData[0]->setIcon(QIcon(":/huge_bra_light.png"));
             fData[1]->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
             qint64 dbSize = randomFilesQ.value(1).toLongLong();
             double mbSize = dbSize / 1024.0 / 1024.0;
diff --git a/shemov.cpp b/shemov.cpp
index 583e008..86d500a 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -298,9 +298,9 @@ void SheMov::setSize(qint64 size){
     QString selectedSize = l.toString(size);
     QString freeSize = l.toString(free);
     if(size < DVDSIZE){
-        val = QString("<span style=\"color:#008000\">%1 (%2)</span>").arg(selectedSize).arg(freeSize);
+        val = QString("<span style=\"color:%1\">%2 (%3)</span>").arg(QColor(Qt::green).name()).arg(selectedSize).arg(freeSize);
 	}else{
-        val = QString("<span style=\"color:#ff0000\">%1 (%2)</span>").arg(selectedSize).arg(freeSize);
+        val = QString("<span style=\"color:%1\">%2 (%3)</span>").arg(QColor(Qt::red).name()).arg(selectedSize).arg(freeSize);
 	}
 	mSelectedSize->setText(val);
 }
diff --git a/shemov.qrc b/shemov.qrc
index 7cd8817..0499c4f 100644
--- a/shemov.qrc
+++ b/shemov.qrc
@@ -50,5 +50,11 @@
         <file>refresh.png</file>
         <file>snapshot.png</file>
         <file>compare.png</file>
+        <file>butt_plug_light.png</file>
+        <file>huge_bra_light.png</file>
+        <file>dog_hood_light.png</file>
+        <file>squirting_nipple_light.png</file>
+        <file>fire.png</file>
+        <file>usb-32.png</file>
     </qresource>
 </RCC>
diff --git a/smglobals.cpp b/smglobals.cpp
index 278772e..b6f8a3f 100644
--- a/smglobals.cpp
+++ b/smglobals.cpp
@@ -146,21 +146,26 @@ SmGlobals::SmGlobals() : mPictureViewer(nullptr), mVideoViewer(nullptr), mArchiv
 	mIcons.insert("Shackles", ":/shackles.png");
 	mIcons.insert("Steel collar", ":/steel_collar.png");
 	mIcons.insert("Butt plug", ":/butt_plug.png");
+    mIcons.insert("Butt plug (light)", ":/butt_plug_light.png");
 	mIcons.insert("Hourglass figure", ":/hourglass_figure.png");
 	mIcons.insert("Big ass", ":/big_ass.png");
 	mIcons.insert("Big tit", ":/big_tit.png");
 	mIcons.insert("Bizarre amputee", ":/bizarre_amputee.png");
 	mIcons.insert("Spreading pants", ":/spreadingpants.png");
 	mIcons.insert("Leather dog hood", ":/dog_hood.png");
+    mIcons.insert("Dog hood (light)", ":/dog_hood_light.png");
 	mIcons.insert("Male chastity belt", ":/male_chastity_belt.png");
 	mIcons.insert("Anal stretcher", ":/analstretcher.png");
     mIcons.insert("Big balls", ":/big_balls.png");
     mIcons.insert("Big pierced balls", ":/huge_balls_pierced.png");
     mIcons.insert("Huge bra", ":/huge_bra.png");
+    mIcons.insert("Huge bra (light)", ":/huge_bra_light.png");
     mIcons.insert("Squirting nipple", ":/squirting_nipple.png");
+    mIcons.insert("Squirting nipple (light)", ":/squirting_nipple_light.png");
     mIcons.insert("Dick in a cage", ":/dick_in_cage.png");
     mIcons.insert("Used tampon", ":/used_tampon.png");
     mIcons.insert("Clean tampon", ":/clean_tampon.png");
+    mIcons.insert("Fire", ":/fire.png");
     mFiletypeMap.insert(FT_MOVIE, tr("Movie"));
     mFiletypeMap.insert(FT_FRONTCOVER, tr("Front Cover"));
     mFiletypeMap.insert(FT_BACKCOVER, tr("Back Cover"));
diff --git a/smglobals.h b/smglobals.h
index 83e63be..89fe597 100644
--- a/smglobals.h
+++ b/smglobals.h
@@ -10,6 +10,7 @@
 
 #include <QObject>
 #include <QHash>
+#include <QMap>
 #include <QSize>
 #include <QStringList>
 
@@ -43,7 +44,7 @@ class SmGlobals : public QObject {
         ArchiveController *archiveController() { return mArchiveController; }
 		QSize cursorSize();
         QIcon iconFor(const QString &type);
-		const QHash<QString, QString> & icons() const { return mIcons; }
+        const QMap<QString, QString> & icons() const { return mIcons; }
         QHash<int, QString> filetypeMap() const { return mFiletypeMap; }
         void setGlobalAction(QAction *a) { mGlobalActions = a; }
         QAction *globalAction() { return mGlobalActions; }
@@ -62,7 +63,7 @@ class SmGlobals : public QObject {
         VideoViewer *mVideoViewer;
         SeriesTreeWidget *mSeriesTreeWidget;
         QSize mCursorSize;
-		QHash<QString, QString> mIcons;
+        QMap<QString, QString> mIcons;
         ArchiveController *mArchiveController;
         QHash<int, QString> mFiletypeMap;
         QList<QWidget*> mWidgets;
diff --git a/squirting_nipple_light.png b/squirting_nipple_light.png
new file mode 100644
index 0000000..36db9fe
--- /dev/null
+++ b/squirting_nipple_light.png
diff --git a/usb-32.png b/usb-32.png
new file mode 100644
index 0000000..2778a62
--- /dev/null
+++ b/usb-32.png