Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Explicitly set app icon on widgets (#1098)

Browse Source
This commit is contained in:
Salanto 2025-05-08 09:06:47 +02:00 committed by GitHub
parent 2977ed8620
commit cde34538dc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/courtroom.cpp
View File

@ -12,6 +12,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app)
: QMainWindow() : QMainWindow()
, ao_app{p_ao_app} , ao_app{p_ao_app}
{ {
setWindowIcon(QIcon(":/data/logo-client.png"));
setWindowFlags((this->windowFlags() | Qt::CustomizeWindowHint) & ~Qt::WindowMaximizeButtonHint); setWindowFlags((this->windowFlags() | Qt::CustomizeWindowHint) & ~Qt::WindowMaximizeButtonHint);
setObjectName("courtroom"); setObjectName("courtroom");

2
src/lobby.cpp
View File

@ -104,7 +104,7 @@ void Lobby::reset_selection()
void Lobby::loadUI() void Lobby::loadUI()
{ {
setWindowIcon(QIcon(":/logo.png")); setWindowIcon(QIcon(":/data/logo-client.png"));
setWindowFlags((windowFlags() | Qt::CustomizeWindowHint)); setWindowFlags((windowFlags() | Qt::CustomizeWindowHint));
QUiLoader l_loader(this); QUiLoader l_loader(this);

1
src/widgets/aooptionsdialog.cpp
View File

@ -302,6 +302,7 @@ void AOOptionsDialog::themeChanged(int i)
void AOOptionsDialog::setupUI() void AOOptionsDialog::setupUI()
{ {
setWindowIcon(QIcon(":/data/logo-client.png"));
QUiLoader l_loader(this); QUiLoader l_loader(this);
QFile l_uiFile(Options::getInstance().getUIAsset("options_dialog.ui")); QFile l_uiFile(Options::getInstance().getUIAsset("options_dialog.ui"));
if (!l_uiFile.open(QFile::ReadOnly)) if (!l_uiFile.open(QFile::ReadOnly))

1
src/widgets/direct_connect_dialog.cpp
View File

@ -17,6 +17,7 @@ DirectConnectDialog::DirectConnectDialog(NetworkManager *netManager, QWidget *pa
: QDialog(parent) : QDialog(parent)
, net_manager(netManager) , net_manager(netManager)
{ {
setWindowIcon(QIcon(":/data/logo-client.png"));
QUiLoader l_loader(this); QUiLoader l_loader(this);
QFile l_uiFile(Options::getInstance().getUIAsset(UI_FILE_PATH)); QFile l_uiFile(Options::getInstance().getUIAsset(UI_FILE_PATH));

1
src/widgets/moderator_dialog.cpp
View File

@ -26,6 +26,7 @@ ModeratorDialog::ModeratorDialog(int clientId, bool ban, AOApplication *ao_app,
return; return;
} }
setWindowIcon(QIcon(":/data/logo-client.png"));
QUiLoader loader; QUiLoader loader;
ui_widget = loader.load(&file, this); ui_widget = loader.load(&file, this);
auto layout = new QVBoxLayout(this); auto layout = new QVBoxLayout(this);

2
src/widgets/server_editor_dialog.cpp
View File

@ -1,6 +1,5 @@
#include "server_editor_dialog.h" #include "server_editor_dialog.h"
#include "datatypes.h"
#include "debug_functions.h" #include "debug_functions.h"
#include "gui_utils.h" #include "gui_utils.h"
#include "options.h" #include "options.h"
@ -15,6 +14,7 @@ const QString ServerEditorDialog::UI_FILE_PATH = "favorite_server_dialog.ui";
ServerEditorDialog::ServerEditorDialog(QWidget *parent) ServerEditorDialog::ServerEditorDialog(QWidget *parent)
: QDialog(parent) : QDialog(parent)
{ {
setWindowIcon(QIcon(":/data/logo-client.png"));
QUiLoader loader(this); QUiLoader loader(this);
QFile file(Options::getInstance().getUIAsset(UI_FILE_PATH)); QFile file(Options::getInstance().getUIAsset(UI_FILE_PATH));