fix: improve icons and logo style

6 files changed, 10 insertions, 7 deletions

diff --git a/gpgfrontend.qrc b/gpgfrontend.qrc
index 96118c23..e6b4a6d4 100644
--- a/gpgfrontend.qrc
+++ b/gpgfrontend.qrc
@@ -1,10 +1,12 @@
 <!DOCTYPE RCC>
 <RCC>
     <qresource prefix="/icons">
+        <file alias="gpgfrontend.ico">gpgfrontend.ico</file>
+        <file alias="gpgfrontend.png">resource/lfs/icons/gpgfrontend.png</file>
+        <file alias="gpgfrontend_logo.png">resource/lfs/icons/gpgfrontend_logo.png</file>
         <file alias="keymgmt.png">resource/lfs/icons/keymgmt.png</file>
         <file alias="help.png">resource/lfs/icons/help.png</file>
         <file alias="button_copy.png">resource/lfs/icons/button_copy.png</file>
-        <file alias="logo.png">resource/lfs/icons/gpgfrontend_logo.png</file>
         <file alias="error.png">resource/lfs/icons/error.png</file>
         <file alias="info.png">resource/lfs/icons/info.png</file>
         <file alias="inbox.png">resource/lfs/icons/inbox.png</file>
@@ -38,7 +40,6 @@
         <file alias="format-line-spacing-normal.png">resource/lfs/icons/format-line-spacing-normal.png</file>
         <file alias="format-line-spacing-triple.png">resource/lfs/icons/format-line-spacing-triple.png</file>
         <file alias="gnupg.png">resource/lfs/icons/gnupg.png</file>
-        <file alias="gpgfrontend.png">resource/lfs/icons/gpgfrontend.png</file>
         <file alias="importance.png">resource/lfs/icons/importance.png</file>
         <file alias="importkey_editor.png">resource/lfs/icons/importkey_editor.png</file>
         <file alias="import_key_from_clipboard.png">resource/lfs/icons/import_key_from_clipboard.png</file>
diff --git a/resource/lfs/icons/gpgfrontend.png b/resource/lfs/icons/gpgfrontend.png
index 94936fec..9930b0b5 100644
--- a/resource/lfs/icons/gpgfrontend.png
+++ b/resource/lfs/icons/gpgfrontend.png
diff --git a/resource/lfs/icons/gpgfrontend_logo.png b/resource/lfs/icons/gpgfrontend_logo.png
index d99342ab..2dc43564 100644
--- a/resource/lfs/icons/gpgfrontend_logo.png
+++ b/resource/lfs/icons/gpgfrontend_logo.png
diff --git a/src/ui/GpgFrontendApplication.cpp b/src/ui/GpgFrontendApplication.cpp
index 1304aad5..c832ffe0 100644
--- a/src/ui/GpgFrontendApplication.cpp
+++ b/src/ui/GpgFrontendApplication.cpp
@@ -36,8 +36,9 @@ namespace GpgFrontend::UI {
 
 GpgFrontendApplication::GpgFrontendApplication(int &argc, char *argv[])
     : QApplication(argc, argv) {
-#ifndef MACOS
-  this->setWindowIcon(QIcon(":/icons/gpgfrontend.png"));
+#if defined(DEBUG) || !defined(MACOS)
+  GpgFrontend::UI::GpgFrontendApplication::setWindowIcon(
+      QIcon(":/icons/gpgfrontend.png"));
 #endif
 
   // set the extra information of the build
diff --git a/src/ui/dialog/Wizard.cpp b/src/ui/dialog/Wizard.cpp
index 5765bd1b..ad97d2e5 100644
--- a/src/ui/dialog/Wizard.cpp
+++ b/src/ui/dialog/Wizard.cpp
@@ -42,7 +42,8 @@ Wizard::Wizard(QWidget* parent) : QWizard(parent) {
 #endif
   setWindowTitle(tr("First Start Wizard"));
 
-  setPixmap(QWizard::LogoPixmap, QPixmap(":/icons/logo.png").scaled(64, 64));
+  setPixmap(QWizard::LogoPixmap,
+            QPixmap(":/icons/gpgfrontend_logo.png").scaled(64, 64));
 
   int next_page_id = GlobalSettingStation::GetInstance()
                          .GetSettings()
diff --git a/src/ui/dialog/help/AboutDialog.cpp b/src/ui/dialog/help/AboutDialog.cpp
index b26d9cc2..61b01dfe 100644
--- a/src/ui/dialog/help/AboutDialog.cpp
+++ b/src/ui/dialog/help/AboutDialog.cpp
@@ -78,8 +78,8 @@ InfoTab::InfoTab(QWidget* parent) : QWidget(parent) {
       "core", "gpgme.version", QString{"2.0.0"});
   GF_UI_LOG_DEBUG("got gpgme version from rt: {}", gpgme_version);
 
-  auto pixmap = QPixmap(":/icons/logo.png");
-  pixmap = pixmap.scaled(200, 200);
+  auto pixmap = QPixmap(":/icons/gpgfrontend_logo.png");
+  pixmap = pixmap.scaled(128, 128);
 
   auto text =
       "<center><h2>" + qApp->applicationName() + "</h2></center>" +