From 7d73347618719dc7b8bf0312ba5c782995c95e9f Mon Sep 17 00:00:00 2001 From: Crystalwarrior Date: Sun, 20 Oct 2019 17:59:38 +0300 Subject: Version 2.8.0.5 Add Killing Fever Online icon (mac icon not updated yet) --- Attorney_Online.pro | 2 +- include/lobby.h | 2 +- resource/logo.ico | Bin 99678 -> 99678 bytes resource/logo.png | Bin 29302 -> 22609 bytes resource/logo_ao2.ico | Bin 0 -> 99678 bytes resource/logo_ao2.png | Bin 0 -> 29302 bytes src/lobby.cpp | 1 - 7 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 resource/logo_ao2.ico create mode 100644 resource/logo_ao2.png diff --git a/Attorney_Online.pro b/Attorney_Online.pro index 4890d808..6061cd95 100644 --- a/Attorney_Online.pro +++ b/Attorney_Online.pro @@ -3,7 +3,7 @@ QT += core gui widgets network TARGET = Attorney_Online TEMPLATE = app -VERSION = 2.8.0.4 +VERSION = 2.8.0.5 INCLUDEPATH += $$PWD/include DESTDIR = $$PWD/bin diff --git a/include/lobby.h b/include/lobby.h index e0cd03da..f0c4227c 100644 --- a/include/lobby.h +++ b/include/lobby.h @@ -32,7 +32,7 @@ public: void append_chatmessage(QString f_name, QString f_message); void append_error(QString f_message); void set_player_count(int players_online, int max_players); - void set_stylesheet(QWidget *widget, QString target_tag); + void set_stylesheet(QWidget *widget); void set_stylesheets(); void set_fonts(); void set_font(QWidget *widget, QString p_identifier); diff --git a/resource/logo.ico b/resource/logo.ico index b40e7866..3c68adff 100644 Binary files a/resource/logo.ico and b/resource/logo.ico differ diff --git a/resource/logo.png b/resource/logo.png index f53fe30c..d8001233 100644 Binary files a/resource/logo.png and b/resource/logo.png differ diff --git a/resource/logo_ao2.ico b/resource/logo_ao2.ico new file mode 100644 index 00000000..b40e7866 Binary files /dev/null and b/resource/logo_ao2.ico differ diff --git a/resource/logo_ao2.png b/resource/logo_ao2.png new file mode 100644 index 00000000..f53fe30c Binary files /dev/null and b/resource/logo_ao2.png differ diff --git a/src/lobby.cpp b/src/lobby.cpp index 4ca4f491..7c61aa7e 100644 --- a/src/lobby.cpp +++ b/src/lobby.cpp @@ -140,7 +140,6 @@ void Lobby::set_widgets() set_size_and_pos(ui_loading_text, "loading_label"); - //WHY IS THIS FONT HARDCODED, WHAT IS WRONG WITH YOU ui_loading_text->setFont(QFont("Arial", 20, QFont::Bold)); ui_loading_text->setReadOnly(true); ui_loading_text->setAlignment(Qt::AlignCenter); -- cgit