Merge branch 'master' of https://github.com/Attorney-Online-Engineering-Task-Force/Attorney-Online-Client-Remake.git

1 files changed, 5 insertions, 1 deletions

diff --git a/lobby.cpp b/lobby.cpp
index c47b673..cfcc8bf 100644
--- a/lobby.cpp
+++ b/lobby.cpp
@@ -21,6 +21,7 @@ Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow()
   ui_refresh = new AOButton(this, ao_app);
   ui_add_to_fav = new AOButton(this, ao_app);
   ui_connect = new AOButton(this, ao_app);
+  ui_version = new QLabel(this);
   ui_about = new AOButton(this, ao_app);
   ui_server_list = new QListWidget(this);
   ui_player_count = new QLabel(this);
@@ -75,6 +76,9 @@ void Lobby::set_widgets()
   ui_connect->set_image("connect.png");
   set_size_and_pos(ui_connect, "connect");
 
+  ui_version->setText("Version: " + ao_app->get_version_string());
+  set_size_and_pos(ui_version, "version");
+
   ui_about->set_image("about.png");
   set_size_and_pos(ui_about, "about");
 
@@ -95,7 +99,7 @@ void Lobby::set_widgets()
 
   set_size_and_pos(ui_chatbox, "chatbox");
   ui_chatbox->setReadOnly(true);
-  ui_chatbox->setStyleSheet("background-color: rgba(0, 0, 0, 0);");
+  ui_chatbox->setStyleSheet("QPlainTextEdit{background-color: rgba(0, 0, 0, 0);}");
 
   set_size_and_pos(ui_chatname, "chatname");
   ui_chatname->setStyleSheet("background-color: rgba(0, 0, 0, 0);"