WIP

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(QWidget *parent) :
@@ -25,8 +24,8 @@ QVAboutDialog::QVAboutDialog(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

@@ -8,6 +8,7 @@
 #include <QTimer>
 #include <QFileDialog>
 #include <QMessageBox>
+#include <QFontDatabase>
 
 QVApplication::QVApplication(int &argc, char **argv) : QApplication(argc, argv)
 {
@@ -366,6 +367,34 @@ void QVApplication::defineFilterLists()
     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);
+}
+
 bool QVApplication::supportsSessionPersistence()
 {
 #if defined(Q_OS_MACOS)

src/qvapplication.h

@@ -88,6 +88,10 @@ class QVApplication : public QApplication
 
     bool getShowSubmenuIcons() const { return showSubmenuIcons; }
 
+    void ensureFontLoaded(const QString &path);
+
+    static QIcon iconFromFont(const QString &fontFamily, const QChar &codePoint, const int pixelSize, const qreal pixelRatio);
+
     static bool supportsSessionPersistence();
 
     static bool tryRestoreLastSession();
@@ -134,6 +138,8 @@ protected slots:
 
     UpdateChecker updateChecker;
 
+    QSet<QString> loadedFontPaths;
+
     bool isApplicationQuitting {false};
     bool userDeclinedSessionStateSave {false};
     QList<ClosedWindowData> closedWindowData;

src/qvoptionsdialog.cpp

@@ -18,6 +18,9 @@ QVOptionsDialog::QVOptionsDialog(QWidget *parent) :
     setAttribute(Qt::WA_DeleteOnClose);
     setWindowFlags(windowFlags() & (~Qt::WindowContextHelpButtonHint | Qt::CustomizeWindowHint));
 
+    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);
@@ -31,11 +34,12 @@ QVOptionsDialog::QVOptionsDialog(QWidget *parent) :
     connect(ui->windowResizeComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &QVOptionsDialog::windowResizeComboBoxCurrentIndexChanged);
     connect(ui->langComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &QVOptionsDialog::languageComboBoxCurrentIndexChanged);
 
+    populateCategories();
     populateComboBoxes();
     populateLanguages();
 
     QSettings settings;
-    ui->tabWidget->setCurrentIndex(settings.value("optionstab", 1).toInt());
+    ui->categoryList->setCurrentRow(settings.value("optionstab", 1).toInt());
 
     // On macOS, the dialog should not be dependent on any window
 #ifndef Q_OS_MACOS
@@ -101,7 +105,7 @@ 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);
 }
@@ -519,6 +523,22 @@ void QVOptionsDialog::constrainImagePositionCheckboxStateChanged(int state)
     ui->constrainCentersSmallImageCheckbox->setEnabled(static_cast<bool>(state));
 }
 
+void QVOptionsDialog::populateCategories()
+{
+    const int iconSize = 24;
+    auto addItem = [this](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());
+    addItem(u'\ue069', tr("Window"));
+    addItem(u'\ue3f4', tr("Image"));
+    addItem(u'\ue429', tr("Miscellaneous"));
+    addItem(u'\ue312', tr("Shortcuts"));
+    addItem(u'\ue323', tr("Mouse"));
+    ui->categoryList->setFixedWidth(ui->categoryList->sizeHintForColumn(0) + ui->categoryList->frameWidth() + 2);
+}
+
 void QVOptionsDialog::populateLanguages()
 {
     ui->langComboBox->clear();

src/qvoptionsdialog.h

@@ -44,6 +44,7 @@ class QVOptionsDialog : public QDialog
     void bgColorButtonClicked();
     void updateBgColorButton();
     void restartNotifyForCheckbox(const QString &key, const int state);
+    void populateCategories();
     void populateLanguages();
     void populateComboBoxes();