diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/aoapplication.cpp | 10 | ||||
| -rw-r--r-- | src/aoapplication.h | 6 | ||||
| -rw-r--r-- | src/lobby.cpp | 30 | ||||
| -rw-r--r-- | src/main.cpp | 2 |
5 files changed, 38 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cdd5952..4dba482 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,6 +144,8 @@ if(CMAKE_BUILD_TYPE STREQUAL "Release") target_link_options(Attorney_Online PRIVATE -Wl,-O2 -Wl,--as-needed -flto -fuse-ld=lld) endif() +target_compile_definitions(Attorney_Online PRIVATE AO_BUILD_PROFILE="${CMAKE_BUILD_TYPE}") + set_target_properties(Attorney_Online PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/bin") if(WIN32) diff --git a/src/aoapplication.cpp b/src/aoapplication.cpp index f253a5a..490c60e 100644 --- a/src/aoapplication.cpp +++ b/src/aoapplication.cpp @@ -126,6 +126,16 @@ QString AOApplication::get_version_string() return QString::number(RELEASE) + "." + QString::number(MAJOR_VERSION) + "." + QString::number(MINOR_VERSION); } +QString AOApplication::get_revision_string() +{ + return "1176bb5f 2026-02-06"; +} + +QString AOApplication::get_sof_version_string() +{ + return "SoF-6"; +} + QString AOApplication::find_image(QStringList p_list) { QString image_path; diff --git a/src/aoapplication.h b/src/aoapplication.h index e3db417..a2c88ca 100644 --- a/src/aoapplication.h +++ b/src/aoapplication.h @@ -109,6 +109,12 @@ public: */ static QString get_version_string(); + // The upstream commit identifier and date. + static QString get_revision_string(); + + // Our downstream version. + static QString get_sof_version_string(); + static const int RELEASE = 2; static const int MAJOR_VERSION = 11; static const int MINOR_VERSION = 0; diff --git a/src/lobby.cpp b/src/lobby.cpp index 6c0e551..002c70b 100644 --- a/src/lobby.cpp +++ b/src/lobby.cpp @@ -6,12 +6,14 @@ #include "networkmanager.h" #include "widgets/direct_connect_dialog.h" #include "widgets/server_editor_dialog.h" +#include "miniaudio.h" #include <QImageReader> #include <QMessageBox> #include <QUiLoader> #include <QVersionNumber> #include <qnamespace.h> +#include <sodium.h> Lobby::Lobby(AOApplication *p_ao_app, NetworkManager *p_net_manager) : QMainWindow{} @@ -118,7 +120,7 @@ void Lobby::loadUI() l_loader.load(&l_uiFile, this); FROM_UI(QLabel, game_version_lbl); - ui_game_version_lbl->setText(tr("Version: %1").arg(ao_app->get_version_string())); + ui_game_version_lbl->setText(tr("Version: %1").arg(ao_app->get_sof_version_string())); FROM_UI(QPushButton, settings_button); connect(ui_settings_button, &QPushButton::clicked, this, &Lobby::onSettingsRequested); @@ -207,7 +209,6 @@ void Lobby::reloadUi() list_favorites(); list_demos(); get_motd(); - check_for_updates(); reset_selection(); } @@ -273,11 +274,14 @@ void Lobby::on_about_clicked() const bool hasAvif = QImageReader::supportedImageFormats().contains("avif"); const bool hasWebp = QImageReader::supportedImageFormats().contains("webp"); const bool hasApng = QImageReader::supportedImageFormats().contains("apng"); - QString msg = tr("<h2>Attorney Online %1</h2>" + QString msg = tr("<h2>Attorney Online %1 (based on AO revision %2)</h2>" "The courtroom drama simulator." - "<p><b>Source code:</b> " + "<p><b>Source code (original):</b> " "<a href='https://github.com/AttorneyOnline/AO2-Client'>" "https://github.com/AttorneyOnline/AO2-Client</a>" + "<p><b>Source code (modified):</b> " + "<a href='https://git.sof.beauty/ao2-client'>" + "https://git.sof.beauty/ao2-client</a>" "<p><b>Major development:</b><br>" "OmniTroid, stonedDiscord, longbyte1, scatterflower, Cerapter, " "Crystalwarrior, Iamgoofball, in1tiate, Salanto" @@ -307,17 +311,21 @@ void Lobby::on_about_clicked() "is copyright (c) 2016-2022 Attorney Online developers. Open-source " "licenses apply. All other assets are the property of their " "respective owners." - "<p>Running on Qt version %2 with the miniaudio audio engine.<br>" - "<p>AVIF supported: %3<br>" - "WebP supported: %4<br>" - "APNG supported: %5" - "<p>Built on %6") - .arg(ao_app->get_version_string()) + "<p>Running on Qt %3 with miniaudio %4 and libsodium %5." + "<p>AVIF supported: %6<br>" + "WebP supported: %7<br>" + "APNG supported: %8" + "<p>Built on %9 (%10)") + .arg(ao_app->get_sof_version_string()) + .arg(ao_app->get_revision_string()) .arg(QLatin1String(QT_VERSION_STR)) + .arg(ma_version_string()) + .arg(sodium_version_string()) .arg(hasAvif ? tr("Yes") : tr("No")) .arg(hasWebp ? tr("Yes") : tr("No")) .arg(hasApng ? tr("Yes") : tr("No")) - .arg(QLatin1String(__DATE__)); + .arg(QLatin1String(__DATE__)) + .arg(QLatin1String(AO_BUILD_PROFILE)); QMessageBox::about(this, tr("About"), msg); } diff --git a/src/main.cpp b/src/main.cpp index 4141fc0..7b42925 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -28,7 +28,7 @@ int main(int argc, char *argv[]) #endif AOApplication main_app; - QApplication::setApplicationVersion(AOApplication::get_version_string()); + QApplication::setApplicationVersion(AOApplication::get_sof_version_string()); QApplication::setApplicationDisplayName(QObject::tr("Attorney Online %1").arg(QApplication::applicationVersion())); QResource::registerResource(main_app.get_asset("themes/" + Options::getInstance().theme() + ".rcc")); |