From 5b0485965779abcdfd04b9a64849e52becacb810 Mon Sep 17 00:00:00 2001 From: Cerapter Date: Thu, 26 Jul 2018 14:41:59 +0200 Subject: Renamed window title. --- lobby.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lobby.cpp') diff --git a/lobby.cpp b/lobby.cpp index 13ef5508..e68fdfba 100644 --- a/lobby.cpp +++ b/lobby.cpp @@ -12,7 +12,7 @@ Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow() { ao_app = p_ao_app; - this->setWindowTitle("Attorney Online 2"); + this->setWindowTitle("Attorney Online 2 -- Case Café Custom Client"); ui_background = new AOImage(this, ao_app); ui_public_servers = new AOButton(this, ao_app); -- cgit From 78be99422ecec29c07f221d0fcb690af5d472fd1 Mon Sep 17 00:00:00 2001 From: Cerapter Date: Tue, 7 Aug 2018 19:41:41 +0200 Subject: CCCC version now displayed ingame. --- lobby.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lobby.cpp') diff --git a/lobby.cpp b/lobby.cpp index e68fdfba..e642fae7 100644 --- a/lobby.cpp +++ b/lobby.cpp @@ -98,7 +98,7 @@ void Lobby::set_widgets() ui_connect->set_image("connect.png"); set_size_and_pos(ui_version, "version"); - ui_version->setText("Version: " + ao_app->get_version_string()); + ui_version->setText("AO Version: " + ao_app->get_version_string() + " | CCCC Version: " + ao_app->get_cccc_version_string()); set_size_and_pos(ui_about, "about"); ui_about->set_image("about.png"); -- cgit From d314b8dd07f72d94724c3902258dfb2641d3435c Mon Sep 17 00:00:00 2001 From: Cerapter Date: Sun, 19 Aug 2018 09:37:34 +0200 Subject: Moved includes out of the CPP files into the header files. Reimplementation of `30a87d23c9c63bed072b3460e7482075dc530b2c` from the old origin. --- lobby.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'lobby.cpp') diff --git a/lobby.cpp b/lobby.cpp index e642fae7..5d2d6de2 100644 --- a/lobby.cpp +++ b/lobby.cpp @@ -5,9 +5,6 @@ #include "networkmanager.h" #include "aosfxplayer.h" -#include -#include - Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow() { ao_app = p_ao_app; -- cgit From d54064d892c26a26641e6ed67412b33d7db3f6c2 Mon Sep 17 00:00:00 2001 From: Cerapter Date: Sat, 15 Sep 2018 03:33:10 +0200 Subject: Server messages are now coloured differently. --- lobby.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lobby.cpp') diff --git a/lobby.cpp b/lobby.cpp index 5d2d6de2..9a649bed 100644 --- a/lobby.cpp +++ b/lobby.cpp @@ -357,7 +357,7 @@ void Lobby::list_favorites() void Lobby::append_chatmessage(QString f_name, QString f_message) { - ui_chatbox->append_chatmessage(f_name, f_message); + ui_chatbox->append_chatmessage(f_name, f_message, ao_app->get_color("ooc_default_color", "courtroom_design.ini").name()); } void Lobby::append_error(QString f_message) -- cgit From fc72ff42345fdda694cd6cf62a77c6cc99a59bc5 Mon Sep 17 00:00:00 2001 From: Cerapter Date: Tue, 23 Oct 2018 10:39:54 +0200 Subject: The connect button is disabled until you get an FL package from a server. --- lobby.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'lobby.cpp') diff --git a/lobby.cpp b/lobby.cpp index 9a649bed..8a986323 100644 --- a/lobby.cpp +++ b/lobby.cpp @@ -48,6 +48,8 @@ Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow() connect(ui_chatmessage, SIGNAL(returnPressed()), this, SLOT(on_chatfield_return_pressed())); connect(ui_cancel, SIGNAL(clicked()), ao_app, SLOT(loading_cancelled())); + ui_connect->setEnabled(false); + set_widgets(); } @@ -311,6 +313,8 @@ void Lobby::on_server_list_clicked(QModelIndex p_model) ui_player_count->setText("Offline"); + ui_connect->setEnabled(false); + ao_app->net_manager->connect_to_server(f_server); } @@ -371,6 +375,11 @@ void Lobby::set_player_count(int players_online, int max_players) ui_player_count->setText(f_string); } +void Lobby::enable_connect_button() +{ + ui_connect->setEnabled(true); +} + Lobby::~Lobby() { -- cgit From 56ec03a23a0f687b79d3ce324e517563a41c0032 Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Sat, 10 Nov 2018 23:08:43 -0600 Subject: Clean up style of merged in code --- lobby.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lobby.cpp') diff --git a/lobby.cpp b/lobby.cpp index 8c7ca8bc..aa1f43f2 100644 --- a/lobby.cpp +++ b/lobby.cpp @@ -9,7 +9,7 @@ Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow() { ao_app = p_ao_app; - this->setWindowTitle("Attorney Online 2 -- Case Café Custom Client"); + this->setWindowTitle("Attorney Online 2"); ui_background = new AOImage(this, ao_app); ui_public_servers = new AOButton(this, ao_app); @@ -98,7 +98,7 @@ void Lobby::set_widgets() ui_connect->set_image("connect.png"); set_size_and_pos(ui_version, "version"); - ui_version->setText("AO Version: " + ao_app->get_version_string() + " | CCCC Version: " + ao_app->get_cccc_version_string()); + ui_version->setText("Version: " + ao_app->get_version_string()); set_size_and_pos(ui_about, "about"); ui_about->set_image("about.png"); -- cgit From 33cae53665ef2a1a0db8cf664faca0faf08770f6 Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Sat, 10 Nov 2018 23:50:51 -0600 Subject: Merge AOV 2.5.1 into mainline --- lobby.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lobby.cpp') diff --git a/lobby.cpp b/lobby.cpp index aa1f43f2..28da1fa9 100644 --- a/lobby.cpp +++ b/lobby.cpp @@ -9,7 +9,7 @@ Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow() { ao_app = p_ao_app; - this->setWindowTitle("Attorney Online 2"); + this->setWindowTitle("Attorney Online Vidya (AO2)"); ui_background = new AOImage(this, ao_app); ui_public_servers = new AOButton(this, ao_app); -- cgit From 8d61f6007ecfa3e19aa7cce6afb97aa39f143fac Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Mon, 12 Nov 2018 15:18:23 -0600 Subject: Remove AOV-specific changes --- lobby.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lobby.cpp') diff --git a/lobby.cpp b/lobby.cpp index 28da1fa9..aa1f43f2 100644 --- a/lobby.cpp +++ b/lobby.cpp @@ -9,7 +9,7 @@ Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow() { ao_app = p_ao_app; - this->setWindowTitle("Attorney Online Vidya (AO2)"); + this->setWindowTitle("Attorney Online 2"); ui_background = new AOImage(this, ao_app); ui_public_servers = new AOButton(this, ao_app); -- cgit From 30e5b72ad0bb333dbe874d544c1159df1176239a Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Fri, 14 Dec 2018 22:53:51 -0600 Subject: Update about dialog --- lobby.cpp | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'lobby.cpp') diff --git a/lobby.cpp b/lobby.cpp index aa1f43f2..5158a1fb 100644 --- a/lobby.cpp +++ b/lobby.cpp @@ -10,6 +10,7 @@ Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow() ao_app = p_ao_app; this->setWindowTitle("Attorney Online 2"); + this->setWindowIcon(QIcon(":/logo.png")); ui_background = new AOImage(this, ao_app); ui_public_servers = new AOButton(this, ao_app); @@ -264,21 +265,19 @@ void Lobby::on_connect_released() void Lobby::on_about_clicked() { - call_notice("Attorney Online 2 is built using Qt 5.7\n\n" - "Lead development:\n" - "OmniTroid\n\n" - "stonedDiscord\n" - "longbyte1\n" - "Supporting development:\n" - "Fiercy\n\n" - "UI design:\n" - "Ruekasu\n" - "Draxirch\n\n" - "Special thanks:\n" - "Unishred\n" - "Argoneus\n" - "Noevain\n" - "Cronnicossy"); + QString msg = tr("

Attorney Online %1

" + "The courtroom drama simulator" + "

Source code: " + "" + "https://github.com/AttorneyOnline/AO2-Client" + "

Major development:
" + "OmniTroid, stonedDiscord, longbyte1, gameboyprinter, Cerapter" + "

Special thanks:
" + "Remy, Iamgoofball, Hibiki, Qubrick (webAO), Ruekasu (UI design), " + "Draxirch (UI design), Unishred, Argoneus (tsuserver), Fiercy, " + "Noevain, Cronnicossy") + .arg(ao_app->get_version_string()); + QMessageBox::about(this, "About", msg); } void Lobby::on_server_list_clicked(QModelIndex p_model) -- cgit