From cde34538dc6045223c965958535218a38d22b2ee Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Thu, 8 May 2025 09:06:47 +0200
Subject: [PATCH] Explicitly set app icon on widgets (#1098)

---
 src/courtroom.cpp                     | 1 +
 src/lobby.cpp                         | 2 +-
 src/widgets/aooptionsdialog.cpp       | 1 +
 src/widgets/direct_connect_dialog.cpp | 1 +
 src/widgets/moderator_dialog.cpp      | 1 +
 src/widgets/server_editor_dialog.cpp  | 2 +-
 6 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index 8402b8e..ca1b810 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -12,6 +12,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app)
     : QMainWindow()
     , ao_app{p_ao_app}
 {
+  setWindowIcon(QIcon(":/data/logo-client.png"));
   setWindowFlags((this->windowFlags() | Qt::CustomizeWindowHint) & ~Qt::WindowMaximizeButtonHint);
   setObjectName("courtroom");
 
diff --git a/src/lobby.cpp b/src/lobby.cpp
index f103508..871af8b 100644
--- a/src/lobby.cpp
+++ b/src/lobby.cpp
@@ -104,7 +104,7 @@ void Lobby::reset_selection()
 
 void Lobby::loadUI()
 {
-  setWindowIcon(QIcon(":/logo.png"));
+  setWindowIcon(QIcon(":/data/logo-client.png"));
   setWindowFlags((windowFlags() | Qt::CustomizeWindowHint));
 
   QUiLoader l_loader(this);
diff --git a/src/widgets/aooptionsdialog.cpp b/src/widgets/aooptionsdialog.cpp
index 57ea7d5..67f9c1c 100644
--- a/src/widgets/aooptionsdialog.cpp
+++ b/src/widgets/aooptionsdialog.cpp
@@ -302,6 +302,7 @@ void AOOptionsDialog::themeChanged(int i)
 
 void AOOptionsDialog::setupUI()
 {
+  setWindowIcon(QIcon(":/data/logo-client.png"));
   QUiLoader l_loader(this);
   QFile l_uiFile(Options::getInstance().getUIAsset("options_dialog.ui"));
   if (!l_uiFile.open(QFile::ReadOnly))
diff --git a/src/widgets/direct_connect_dialog.cpp b/src/widgets/direct_connect_dialog.cpp
index 6a09b77..f8c77b8 100644
--- a/src/widgets/direct_connect_dialog.cpp
+++ b/src/widgets/direct_connect_dialog.cpp
@@ -17,6 +17,7 @@ DirectConnectDialog::DirectConnectDialog(NetworkManager *netManager, QWidget *pa
     : QDialog(parent)
     , net_manager(netManager)
 {
+  setWindowIcon(QIcon(":/data/logo-client.png"));
   QUiLoader l_loader(this);
   QFile l_uiFile(Options::getInstance().getUIAsset(UI_FILE_PATH));
 
diff --git a/src/widgets/moderator_dialog.cpp b/src/widgets/moderator_dialog.cpp
index a39840f..923be4a 100644
--- a/src/widgets/moderator_dialog.cpp
+++ b/src/widgets/moderator_dialog.cpp
@@ -26,6 +26,7 @@ ModeratorDialog::ModeratorDialog(int clientId, bool ban, AOApplication *ao_app,
     return;
   }
 
+  setWindowIcon(QIcon(":/data/logo-client.png"));
   QUiLoader loader;
   ui_widget = loader.load(&file, this);
   auto layout = new QVBoxLayout(this);
diff --git a/src/widgets/server_editor_dialog.cpp b/src/widgets/server_editor_dialog.cpp
index 150a435..03c8d6c 100644
--- a/src/widgets/server_editor_dialog.cpp
+++ b/src/widgets/server_editor_dialog.cpp
@@ -1,6 +1,5 @@
 #include "server_editor_dialog.h"
 
-#include "datatypes.h"
 #include "debug_functions.h"
 #include "gui_utils.h"
 #include "options.h"
@@ -15,6 +14,7 @@ const QString ServerEditorDialog::UI_FILE_PATH = "favorite_server_dialog.ui";
 ServerEditorDialog::ServerEditorDialog(QWidget *parent)
     : QDialog(parent)
 {
+  setWindowIcon(QIcon(":/data/logo-client.png"));
   QUiLoader loader(this);
   QFile file(Options::getInstance().getUIAsset(UI_FILE_PATH));