From 1ec6d0233916b6d5644f94b60b74273000a733ba Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Tue, 21 Jan 2025 08:39:42 -0500
Subject: [PATCH] refactor: use theme icons for on settings dialog and mac os
 tray

---
 src/apps/deskflow-gui/MainWindow.cpp             | 10 +++++++---
 src/apps/deskflow-gui/dialogs/SettingsDialog.cpp |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/apps/deskflow-gui/MainWindow.cpp b/src/apps/deskflow-gui/MainWindow.cpp
index e7d4c0abb..5be5390f8 100644
--- a/src/apps/deskflow-gui/MainWindow.cpp
+++ b/src/apps/deskflow-gui/MainWindow.cpp
@@ -644,14 +644,18 @@ void MainWindow::setIcon()
   // Using a theme icon that is packed in exe renders an invisible icon
   // Instead use the resource path of the packed icon
   // TODO Report to Qt ref the bug here
+#ifndef Q_OS_MAC
   QString iconString = QStringLiteral(":/icons/deskflow-%1/apps/64/deskflow").arg(iconMode());
   if (!appConfig().colorfulTrayIcon()) {
     iconString.append(QStringLiteral("-symbolic"));
   }
   m_trayIcon->setIcon(QIcon(iconString));
-#ifdef Q_OS_MAC
-  if (!appConfig().colorfulTrayIcon())
-    m_trayIcon->icon().setIsMask(true);
+#else
+  if (m_AppConfig.colorfulTrayIcon())
+    m_trayIcon->setIcon(QIcon::fromTheme(QStringLiteral("deskflow")));
+  else
+    m_trayIcon->setIcon(QIcon::fromTheme(QStringLiteral("deskflow")));
+  m_trayIcon->icon().setIsMask(true);
 #endif
 }
 
diff --git a/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp b/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp
index 5ed96f534..d044e4a28 100644
--- a/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp
+++ b/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp
@@ -55,8 +55,8 @@ SettingsDialog::SettingsDialog(
   ui->m_pPushButtonTlsCertPath->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::DocumentOpen));
   ui->m_pButtonBrowseLog->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::DocumentOpen));
 
-  ui->rb_icon_mono->setIcon(QIcon(QStringLiteral(":/icons/deskflow-%1/apps/64/deskflow-symbolic").arg(iconMode())));
-  ui->rb_icon_colorful->setIcon(QIcon(QStringLiteral(":/icons/deskflow-%1/apps/64/deskflow").arg(iconMode())));
+  ui->rb_icon_mono->setIcon(QIcon::fromTheme(QStringLiteral("deskflow-symbolic")));
+  ui->rb_icon_colorful->setIcon(QIcon::fromTheme(QStringLiteral("deskflow")));
 
   // force the first tab, since qt creator sets the active tab as the last one
   // the developer was looking at, and it's easy to accidentally save that.