aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCrystalwarrior <varsash@gmail.com>2019-10-20 17:59:38 +0300
committerCrystalwarrior <varsash@gmail.com>2019-10-20 17:59:38 +0300
commit7d73347618719dc7b8bf0312ba5c782995c95e9f (patch)
treef22c942c88c4f9359fd9b8378f81e3e13213511e
parent3605f223d2f8bf0548f9a9802b470fdbc4d71ba3 (diff)
Version 2.8.0.5
Add Killing Fever Online icon (mac icon not updated yet)
-rw-r--r--Attorney_Online.pro2
-rw-r--r--include/lobby.h2
-rw-r--r--resource/logo.icobin99678 -> 99678 bytes
-rw-r--r--resource/logo.pngbin29302 -> 22609 bytes
-rw-r--r--resource/logo_ao2.icobin0 -> 99678 bytes
-rw-r--r--resource/logo_ao2.pngbin0 -> 29302 bytes
-rw-r--r--src/lobby.cpp1
7 files changed, 2 insertions, 3 deletions
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
--- a/resource/logo.ico
+++ b/resource/logo.ico
Binary files differ
diff --git a/resource/logo.png b/resource/logo.png
index f53fe30c..d8001233 100644
--- a/resource/logo.png
+++ b/resource/logo.png
Binary files differ
diff --git a/resource/logo_ao2.ico b/resource/logo_ao2.ico
new file mode 100644
index 00000000..b40e7866
--- /dev/null
+++ b/resource/logo_ao2.ico
Binary files differ
diff --git a/resource/logo_ao2.png b/resource/logo_ao2.png
new file mode 100644
index 00000000..f53fe30c
--- /dev/null
+++ b/resource/logo_ao2.png
Binary files 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);