Replace goto.png with a themeable svg image

Author: luisangelsm

YACReader/goto_dialog.cpp

@@ -8,6 +8,7 @@ GoToDialog::GoToDialog(QWidget *parent)
     : QDialog(parent)
 {
     setupUI();
+    initTheme(this);
 }
 
 void GoToDialog::setupUI()
@@ -42,9 +43,7 @@ void GoToDialog::setupUI()
     mainLayout->addLayout(bottomLayout);
 
     auto imgMainLayout = new QHBoxLayout;
-    auto imgLabel = new QLabel();
-    QPixmap p(":/images/goto.png");
-    imgLabel->setPixmap(p);
+    imgLabel = new QLabel();
     imgMainLayout->addWidget(imgLabel);
     imgMainLayout->addLayout(mainLayout);
 
@@ -78,3 +77,8 @@ void GoToDialog::open()
     pageNumber->setFocus();
     QDialog::open();
 }
+
+void GoToDialog::applyTheme(const Theme &theme)
+{
+    imgLabel->setPixmap(theme.dialogIcons.goToDialogIcon);
+}

YACReader/goto_dialog.h

@@ -1,21 +1,27 @@
 #ifndef __GOTODIALOG_H
 #define __GOTODIALOG_H
 
+#include "themable.h"
+
 #include <QDialog>
 #include <QIntValidator>
 #include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>
 
-class GoToDialog : public QDialog
+class GoToDialog : public QDialog, protected Themable
 {
     Q_OBJECT
 public:
     GoToDialog(QWidget *parent = nullptr);
 
+protected:
+    void applyTheme(const Theme &theme) override;
+
 private:
     QLabel *numPagesLabel;
     QLabel *textLabel;
+    QLabel *imgLabel;
     QLineEdit *pageNumber;
     QIntValidator *v;
     QPushButton *accept;

YACReader/themes/builtin_classic.json

@@ -1,4 +1,7 @@
 {
+    "dialogIcons": {
+        "iconColor": "#404040"
+    },
     "goToFlowWidget": {
         "editBackgroundColor": "#55000000",
         "editBorderColor": "#77000000",

YACReader/themes/builtin_dark.json

@@ -1,4 +1,7 @@
 {
+    "dialogIcons": {
+        "iconColor": "#cccccc"
+    },
     "goToFlowWidget": {
         "editBackgroundColor": "#55000000",
         "editBorderColor": "#77000000",

YACReader/themes/builtin_light.json

@@ -1,4 +1,7 @@
 {
+    "dialogIcons": {
+        "iconColor": "#404040"
+    },
     "goToFlowWidget": {
         "editBackgroundColor": "#22000000",
         "editBorderColor": "#33000000",

YACReader/themes/theme.h

@@ -182,6 +182,7 @@ struct ShortcutsIconsTheme {
 
 struct DialogIconsTheme {
     QIcon findFolderIcon;
+    QPixmap goToDialogIcon;
 };
 
 struct Theme {

YACReader/themes/theme_factory.cpp

@@ -56,6 +56,10 @@ struct ShortcutsIconsParams {
     QColor iconColor; // Main icon color (replaces #f0f)
 };
 
+struct DialogIconsParams {
+    QColor iconColor; // Main icon color (replaces #f0f)
+};
+
 struct TranslatorParams {
     TranslatorThemeTemplates t;
 
@@ -79,6 +83,7 @@ struct ThemeParams {
     HelpAboutDialogTheme helpAboutDialogParams;
     WhatsNewDialogParams whatsNewDialogParams;
     ShortcutsIconsParams shortcutsIconsParams;
+    DialogIconsParams dialogIconsParams;
     TranslatorParams translatorParams;
 };
 
@@ -340,6 +345,11 @@ Theme makeTheme(const QJsonObject &json)
         p.shortcutsIconsParams.iconColor = colorFromJson(s, "iconColor", p.shortcutsIconsParams.iconColor);
     }
 
+    if (json.contains("dialogIcons")) {
+        const auto o = json["dialogIcons"].toObject();
+        p.dialogIconsParams.iconColor = colorFromJson(o, "iconColor", p.dialogIconsParams.iconColor);
+    }
+
     if (json.contains("translator")) {
         const auto t = json["translator"].toObject();
         auto &tp = p.translatorParams;

YACReader/yacreader_images.qrc

@@ -1,7 +1,7 @@
 <RCC>
   <qresource>
     <file>../images/icon-new.svg</file>
-    <file>../images/goto.png</file>
+    <file>../images/goto.svg</file>
     <file>../images/find_folder.svg</file>
     <file>../images/flow1.png</file>
     <file>../images/flow2.png</file>