Preload application icon for About page

complexlogic · complexlogic · commit ce04b29e2ac1 · 2024-10-27T09:01:44.000-07:00
diff --git a/src/about.cpp b/src/about.cpp
@@ -2,6 +2,7 @@
 #include <QString>
 #include <QTabWidget>
 #include <QTabBar>
+#include <QPixmap>
 
 extern "C" {
 #include <libavformat/avformat.h>
@@ -24,11 +25,12 @@ extern "C" {
 #define PROGRAM_VER "<html><head/><body><p><span style=\" font-size:12pt;\">%1</span></p></body></html>"
 #define ABOUT_HTML "<html><head/><body><p>%1</p><p>%2</p></body></html>"
 
-AboutDialog::AboutDialog(const Config &config, QWidget *parent) :
+AboutDialog::AboutDialog(const Config &config, const QPixmap &icon, QWidget *parent) :
 QDialog(parent),
 ui(std::make_unique<Ui::AboutDialog>())
 {
     ui->setupUi(this);
+    ui->label->setPixmap(icon);
     ui->tabs->setCurrentIndex(0);
     ui->program_ver->setText(QString(PROGRAM_VER).arg(QString(tr("Version %1")).arg(
 #ifdef PROJECT_VERSION_GIT
diff --git a/src/about.hpp b/src/about.hpp
@@ -10,6 +10,7 @@ namespace Ui {
     class AboutDialog;
 }
 class QLabel;
+class QPixmap;
 
 class AboutDialog : public QDialog
 {
@@ -22,6 +23,6 @@ class AboutDialog : public QDialog
 
 public:
     void closeEvent(QCloseEvent *event) override { event->accept(); }
-    explicit AboutDialog(const Config &config, QWidget *parent = nullptr);
+    explicit AboutDialog(const Config &config, const QPixmap &icon, QWidget *parent = nullptr);
     ~AboutDialog() override;
 };
diff --git a/src/main.cpp b/src/main.cpp
@@ -20,9 +20,10 @@
 #include <QStyle>
 #include <QStyleOption>
 #include <QIcon>
+#include <QPixmap>
+
 #include <fmt/core.h>
 #include <fmt/chrono.h>
-
 #include "main.hpp"
 #include "sync.hpp"
 #include "config.hpp"
@@ -36,11 +37,12 @@
 #define LOG_FILENAME EXECUTABLE_NAME ".log"
 
 Application::Application(QWidget *parent) :
-QMainWindow(parent),
-ui(std::make_unique<Ui::MainWindow>()),
-config(std::make_unique<Config>()),
-style(QApplication::style()),
-settings(EXECUTABLE_NAME, EXECUTABLE_NAME)
+    QMainWindow(parent),
+    ui(std::make_unique<Ui::MainWindow>()),
+    icon(std::make_unique<QPixmap>(":/icons/easyaudiosync256.png")),
+    config(std::make_unique<Config>()),
+    style(QApplication::style()),
+    settings(EXECUTABLE_NAME, EXECUTABLE_NAME)
 {
     config->check_features();
     config->load(settings);
@@ -214,7 +216,7 @@ void Application::on_action_settings_triggered()
 
 void Application::on_action_about_triggered()
 {
-    auto dialog = new AboutDialog(*config, this);
+    auto dialog = new AboutDialog(*config, *icon, this);
     dialog->setAttribute(Qt::WA_DeleteOnClose, true);
     dialog->setModal(true);
     dialog->show();
diff --git a/src/main.hpp b/src/main.hpp
@@ -19,6 +19,7 @@
 class Sync;
 struct Config;
 class QLineEdit;
+class QPixmap;
 
 namespace Ui {
     class MainWindow;
@@ -52,6 +53,7 @@ public slots:
 
 private:
     std::unique_ptr<Ui::MainWindow> ui;
+    std::unique_ptr<QPixmap> icon;
     std::unique_ptr<Config> config;
     QStyle *style;
     QSettings settings;
diff --git a/src/ui/about.ui b/src/ui/about.ui
@@ -39,9 +39,6 @@
        <property name="text">
         <string/>
        </property>
-       <property name="pixmap">
-        <pixmap resource="../../assets/icons/icons.qrc">:/icons/easyaudiosync256.png</pixmap>
-       </property>
        <property name="scaledContents">
         <bool>true</bool>
        </property>

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ namespace Ui {`
`10`	`10`	`class AboutDialog;`
`11`	`11`	`}`
`12`	`12`	`class QLabel;`
	`13`	`+class QPixmap;`
`13`	`14`
`14`	`15`	`class AboutDialog : public QDialog`
`15`	`16`	`{`
`@@ -22,6 +23,6 @@ class AboutDialog : public QDialog`
`22`	`23`
`23`	`24`	`public:`
`24`	`25`	`void closeEvent(QCloseEvent *event) override { event->accept(); }`
`25`		`- explicit AboutDialog(const Config &config, QWidget *parent = nullptr);`
	`26`	`+ explicit AboutDialog(const Config &config, const QPixmap &icon, QWidget *parent = nullptr);`
`26`	`27`	`~AboutDialog() override;`
`27`	`28`	`};`