Settings UI proposal

resources/resources.qrc

@@ -2,6 +2,7 @@
     <qresource prefix="/fonts">
         <file>Lato-Light.ttf</file>
         <file>Lato-Regular.ttf</file>
+        <file>MaterialIconsOutlined-Regular.otf</file>
     </qresource>
     <qresource prefix="/images">
         <file>checkmark.png</file>

src/qvaboutdialog.cpp

@@ -3,7 +3,6 @@
 
 #include "qvapplication.h"
 
-#include <QFontDatabase>
 #include <QJsonDocument>
 
 QVAboutDialog::QVAboutDialog(double givenLatestVersionNum, QWidget *parent) :
@@ -25,8 +24,8 @@ QVAboutDialog::QVAboutDialog(double givenLatestVersionNum, QWidget *parent) :
 #endif
 
     // add fonts
-    QFontDatabase::addApplicationFont(":/fonts/Lato-Light.ttf");
-    QFontDatabase::addApplicationFont(":/fonts/Lato-Regular.ttf");
+    qvApp->ensureFontLoaded(":/fonts/Lato-Light.ttf");
+    qvApp->ensureFontLoaded(":/fonts/Lato-Regular.ttf");
 
     int modifier = 0;
     //set main title font

src/qvapplication.cpp

@@ -7,6 +7,7 @@
 #include <QSettings>
 #include <QTimer>
 #include <QFileDialog>
+#include <QFontDatabase>
 
 QVApplication::QVApplication(int &argc, char **argv) : QApplication(argc, argv)
 {
@@ -390,3 +391,36 @@ void QVApplication::defineFilterLists()
     nameFilterList << filterString;
     nameFilterList << tr("All Files") + " (*)";
 }
+
+void QVApplication::ensureFontLoaded(const QString &path)
+{
+    if (loadedFontPaths.contains(path))
+        return;
+
+    QFontDatabase::addApplicationFont(path);
+    loadedFontPaths.insert(path);
+}
+
+QIcon QVApplication::iconFromFont(const QString &fontFamily, const QChar &codePoint, const int pixelSize, const qreal pixelRatio)
+{
+    const int scaledPixelSize = qRound(pixelSize * pixelRatio);
+
+    QFont font(fontFamily);
+    font.setPixelSize(pixelSize);
+
+    QPixmap pixmap(scaledPixelSize, scaledPixelSize);
+    pixmap.fill(Qt::transparent);
+    pixmap.setDevicePixelRatio(pixelRatio);
+
+    QPainter painter(&pixmap);
+    painter.setFont(font);
+    painter.setPen(QApplication::palette().color(QPalette::WindowText));
+    painter.drawText(pixmap.rect(), codePoint);
+
+    return QIcon(pixmap);
+}
+
+qreal QVApplication::getPerceivedBrightness(const QColor &color)
+{
+    return (color.red() * 0.299 + color.green() * 0.587 + color.blue() * 0.114) / 255.0;
+}

src/qvapplication.h

@@ -77,6 +77,12 @@ class QVApplication : public QApplication
 
     ActionManager &getActionManager() { return actionManager; }
 
+    void ensureFontLoaded(const QString &path);
+
+    static QIcon iconFromFont(const QString &fontFamily, const QChar &codePoint, const int pixelSize, const qreal pixelRatio);
+
+    static qreal getPerceivedBrightness(const QColor &color);
+
 private:
 
     QList<MainWindow*> lastActiveWindows;
@@ -102,6 +108,8 @@ class QVApplication : public QApplication
 #ifndef QV_DISABLE_ONLINE_VERSION_CHECK
     UpdateChecker updateChecker;
 #endif //QV_DISABLE_ONLINE_VERSION_CHECK
+
+    QSet<QString> loadedFontPaths;
 };
 
 #endif // QVAPPLICATION_H

src/qvoptionsdialog.cpp

@@ -20,15 +20,20 @@ QVOptionsDialog::QVOptionsDialog(QWidget *parent) :
     setAttribute(Qt::WA_DeleteOnClose);
     setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint | Qt::CustomizeWindowHint));
 
+    resize(640, 530);
+
+    qvApp->ensureFontLoaded(":/fonts/MaterialIconsOutlined-Regular.otf");
+
+    connect(ui->categoryList, &QListWidget::currentRowChanged, this, [this](int currentRow) { ui->stackedWidget->setCurrentIndex(currentRow); });
     connect(ui->buttonBox, &QDialogButtonBox::clicked, this, &QVOptionsDialog::buttonBoxClicked);
     connect(ui->shortcutsTable, &QTableWidget::cellDoubleClicked, this, &QVOptionsDialog::shortcutCellDoubleClicked);
     connect(ui->bgColorCheckbox, &QCheckBox::stateChanged, this, &QVOptionsDialog::bgColorCheckboxStateChanged);
     connect(ui->scalingCheckbox, &QCheckBox::stateChanged, this, &QVOptionsDialog::scalingCheckboxStateChanged);
 
-    populateLanguages();
-
     QSettings settings;
-    ui->tabWidget->setCurrentIndex(settings.value("optionstab", 1).toInt());
+
+    populateCategories(settings.value("optionstab", 1).toInt());
+    populateLanguages();
 
     // On macOS, the dialog should not be dependent on any window
 #ifndef Q_OS_MACOS
@@ -79,12 +84,21 @@ QVOptionsDialog::~QVOptionsDialog()
     delete ui;
 }
 
+void QVOptionsDialog::changeEvent(QEvent *event)
+{
+    if (event->type() == QEvent::PaletteChange)
+    {
+        populateCategories(ui->categoryList->currentRow());
+    }
+    QDialog::changeEvent(event);
+}
+
 void QVOptionsDialog::done(int r)
 {
     // Save window geometry
     QSettings settings;
     settings.setValue("optionsgeometry", saveGeometry());
-    settings.setValue("optionstab", ui->tabWidget->currentIndex());
+    settings.setValue("optionstab", ui->categoryList->currentRow());
 
     QDialog::done(r);
 }
@@ -452,6 +466,34 @@ void QVOptionsDialog::windowResizeComboBoxCurrentIndexChanged(int index)
     ui->maxWindowResizeSpinBox->setEnabled(enableRelatedControls);
 }
 
+void QVOptionsDialog::populateCategories(int selectedRow)
+{
+    const int iconSize = 24;
+    const int listRightPadding = 3;
+    auto addItem = [&](const QChar &iconChar, const QString &text) {
+        ui->categoryList->addItem(new QListWidgetItem(qvApp->iconFromFont("Material Icons Outlined", iconChar, iconSize, devicePixelRatioF()), text));
+    };
+    ui->categoryList->setIconSize(QSize(iconSize, iconSize));
+    ui->categoryList->setFont(QApplication::font());
+    const QString currentStyle = qApp->style()->objectName();
+    if (currentStyle.compare("fusion", Qt::CaseInsensitive) == 0 ||
+        currentStyle.compare("macos", Qt::CaseInsensitive) == 0)
+    {
+        const QColor textColor = QApplication::palette().color(QPalette::WindowText);
+        QPalette palette = ui->categoryList->palette();
+        palette.setColor(QPalette::HighlightedText, textColor);
+        palette.setColor(QPalette::Highlight, qvApp->getPerceivedBrightness(textColor) > 0.5 ? QColor(0, 65, 127) : QColor(75, 166, 255));
+        ui->categoryList->setPalette(palette);
+    }
+    ui->categoryList->clear();
+    addItem(u'\ue069', tr("Window"));
+    addItem(u'\ue3f4', tr("Image"));
+    addItem(u'\ue429', tr("Miscellaneous"));
+    addItem(u'\ue312', tr("Shortcuts"));
+    ui->categoryList->setCurrentRow(selectedRow);
+    ui->categoryList->setFixedWidth(ui->categoryList->sizeHintForColumn(0) + ui->categoryList->frameWidth() + listRightPadding);
+}
+
 void QVOptionsDialog::populateLanguages()
 {
     ui->langComboBox->clear();

src/qvoptionsdialog.h

@@ -24,6 +24,7 @@ class QVOptionsDialog : public QDialog
     ~QVOptionsDialog() override;
 
 protected:
+    void changeEvent(QEvent *event) override;
     void done(int r) override;
 
     void modifySetting(QString key, QVariant value);
@@ -40,6 +41,7 @@ class QVOptionsDialog : public QDialog
     void updateButtonBox();
     void bgColorButtonClicked();
     void updateBgColorButton();
+    void populateCategories(int selectedRow);
     void populateLanguages();
 
 private slots: