Explicitly set app icon on widgets (#1098)
This commit is contained in:
parent
2977ed8620
commit
cde34538dc
@ -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");
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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))
|
||||
|
@ -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));
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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));
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user