diff options
| author | TrickyLeifa <date.epoch@gmail.com> | 2024-05-17 16:39:30 +0200 |
|---|---|---|
| committer | TrickyLeifa <date.epoch@gmail.com> | 2024-05-17 19:04:57 +0200 |
| commit | 1ef96383c8f7ed136a0e028aef0835b4838b5e95 (patch) | |
| tree | e87a9df097a50b4d1f918f8a4f37d210562d10d6 /src/aoapplication.cpp | |
| parent | 39e4354b1dae5d8487ea5b84be9f304b1950a61a (diff) | |
Lightly reworked `NetworkManager`, ...
* Lightly reworked `NetworkManager`
* Added new modules to handle various connection types.
* TCP
* WebSocket
* Added general string splitter alias based on Qt version.
* Replaced `lobby_constructed` and `courtroom_constructed`
* Refactored and partially reimplemented the following classes:
* `AOBlipPlayer`
* `AOEmotePreview`
* `AOMusicPlayer`
* `AOSfxPlayer`
* `AOTextArea`
Diffstat (limited to 'src/aoapplication.cpp')
| -rw-r--r-- | src/aoapplication.cpp | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/src/aoapplication.cpp b/src/aoapplication.cpp index edd241b6..b0b90e22 100644 --- a/src/aoapplication.cpp +++ b/src/aoapplication.cpp @@ -40,16 +40,20 @@ AOApplication::~AOApplication() qInstallMessageHandler(original_message_handler); } +bool AOApplication::is_lobby_constructed() +{ + return w_lobby; +} + void AOApplication::construct_lobby() { - if (lobby_constructed) + if (is_lobby_constructed()) { qWarning() << "lobby was attempted constructed when it already exists"; return; } w_lobby = new Lobby(this, net_manager); - lobby_constructed = true; QRect geometry = QGuiApplication::primaryScreen()->geometry(); int x = (geometry.width() - w_lobby->width()) / 2; @@ -71,7 +75,7 @@ void AOApplication::construct_lobby() void AOApplication::destruct_lobby() { - if (!lobby_constructed) + if (!is_lobby_constructed()) { qWarning() << "lobby was attempted destructed when it did not exist"; return; @@ -79,19 +83,22 @@ void AOApplication::destruct_lobby() delete w_lobby; w_lobby = nullptr; - lobby_constructed = false; +} + +bool AOApplication::is_courtroom_constructed() +{ + return w_courtroom; } void AOApplication::construct_courtroom() { - if (courtroom_constructed) + if (is_courtroom_constructed()) { qWarning() << "courtroom was attempted constructed when it already exists"; return; } w_courtroom = new Courtroom(this); - courtroom_constructed = true; QRect geometry = QGuiApplication::primaryScreen()->geometry(); int x = (geometry.width() - w_courtroom->width()) / 2; @@ -110,7 +117,7 @@ void AOApplication::construct_courtroom() void AOApplication::destruct_courtroom() { - if (!courtroom_constructed) + if (!is_courtroom_constructed()) { qWarning() << "courtroom was attempted destructed when it did not exist"; return; @@ -118,7 +125,6 @@ void AOApplication::destruct_courtroom() delete w_courtroom; w_courtroom = nullptr; - courtroom_constructed = false; } QString AOApplication::get_version_string() @@ -128,9 +134,12 @@ QString AOApplication::get_version_string() void AOApplication::server_disconnected() { - if (courtroom_constructed) + if (is_courtroom_constructed()) { - call_notice(tr("Disconnected from server.")); + if (w_courtroom->isVisible()) + { + call_notice(tr("Disconnected from server.")); + } construct_lobby(); destruct_courtroom(); } @@ -145,12 +154,12 @@ void AOApplication::loading_cancelled() void AOApplication::call_settings_menu() { AOOptionsDialog *l_dialog = new AOOptionsDialog(this); - if (courtroom_constructed) + if (is_courtroom_constructed()) { connect(l_dialog, &AOOptionsDialog::reloadThemeRequest, w_courtroom, &Courtroom::on_reload_theme_clicked); } - if (lobby_constructed) + if (is_lobby_constructed()) {} l_dialog->exec(); delete l_dialog; |
