From 56b7ec3a3129820baf3ca34e7a513e32da161d16 Mon Sep 17 00:00:00 2001 From: fleroviux Date: Sun, 29 May 2022 19:11:10 +0200 Subject: [PATCH] Bump version to 1.5 and update about text --- README.md | 2 +- src/platform/qt/CMakeLists.txt | 6 +++--- src/platform/qt/rc/app.rc | 10 +++++----- src/platform/qt/src/widget/main_window.cpp | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index f30b559ab..efa2398e3 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ See [COMPILING.md](https://github.com/fleroviux/NanoboyAdvance/blob/master/docs/ ## Copyright -NanoBoyAdvance is Copyright © 2015 - 2021 fleroviux.
+NanoBoyAdvance is Copyright © 2015 - 2022 fleroviux.
It is licensed under the terms of the GNU General Public License (GPL) 3.0 or any later version. See [LICENSE](LICENSE) for details. Game Boy Advance is a registered trademark of Nintendo Co., Ltd. diff --git a/src/platform/qt/CMakeLists.txt b/src/platform/qt/CMakeLists.txt index a1a14825d..deade0a69 100644 --- a/src/platform/qt/CMakeLists.txt +++ b/src/platform/qt/CMakeLists.txt @@ -62,9 +62,9 @@ if (APPLE AND MACOS_BUILD_APP_BUNDLE) set(MACOSX_BUNDLE_ICON_FILE "NanoBoyAdvance.icns") set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.github.fleroviux.NanoBoyAdvance") set(MACOSX_BUNDLE_INFO_STRING "Game Boy Advance emulator") - set(MACOSX_BUNDLE_SHORT_VERSION_STRING "1.4") - set(MACOSX_BUNDLE_LONG_VERSION_STRING "1.4") - set(MACOSX_BUNDLE_BUNDLE_VERSION "1.4") + set(MACOSX_BUNDLE_SHORT_VERSION_STRING "1.5") + set(MACOSX_BUNDLE_LONG_VERSION_STRING "1.5") + set(MACOSX_BUNDLE_BUNDLE_VERSION "1.5") list(APPEND RESOURCES rc/NanoBoyAdvance.icns) add_executable(NanoBoyAdvance-Qt MACOSX_BUNDLE ${SOURCES} ${HEADERS} ${RESOURCES}) diff --git a/src/platform/qt/rc/app.rc b/src/platform/qt/rc/app.rc index 919bce8b6..266666fb0 100644 --- a/src/platform/qt/rc/app.rc +++ b/src/platform/qt/rc/app.rc @@ -4,8 +4,8 @@ IDI_ICON1 ICON DISCARDABLE "app.ico" VS_VERSION_INFO VERSIONINFO -FILEVERSION 1,4 -PRODUCTVERSION 1,4 +FILEVERSION 1,5 +PRODUCTVERSION 1,5 BEGIN BLOCK "StringFileInfo" BEGIN @@ -13,12 +13,12 @@ BEGIN BEGIN VALUE "CompanyName", "fleroviux" VALUE "FileDescription", "NanoBoyAdvance" - VALUE "FileVersion", "1.4" + VALUE "FileVersion", "1.5" VALUE "InternalName", "NanoBoyAdvance.exe" - VALUE "LegalCopyright", "(c) 2015 - 2021 fleroviux" + VALUE "LegalCopyright", "(c) 2015 - 2022 fleroviux" VALUE "OriginalFilename", "NanoBoyAdvance.exe" VALUE "ProductName", "NanoBoyAdvance" - VALUE "ProductVersion", "1.4" + VALUE "ProductVersion", "1.5" END END diff --git a/src/platform/qt/src/widget/main_window.cpp b/src/platform/qt/src/widget/main_window.cpp index 6602899a2..c2e5dba3b 100644 --- a/src/platform/qt/src/widget/main_window.cpp +++ b/src/platform/qt/src/widget/main_window.cpp @@ -22,7 +22,7 @@ MainWindow::MainWindow( QApplication* app, QWidget* parent ) : QMainWindow(parent) { - setWindowTitle("NanoBoyAdvance 1.4"); + setWindowTitle("NanoBoyAdvance 1.5"); screen = std::make_shared(this, config); setCentralWidget(screen.get()); @@ -54,9 +54,9 @@ MainWindow::MainWindow( connect(this, &MainWindow::UpdateFrameRate, this, [this](int fps) { if (config->window.show_fps) { auto percent = fps / 59.7275 * 100; - setWindowTitle(QString::fromStdString(fmt::format("NanoBoyAdvance 1.4 [{} fps | {:.2f}%]", fps, percent))); + setWindowTitle(QString::fromStdString(fmt::format("NanoBoyAdvance 1.5 [{} fps | {:.2f}%]", fps, percent))); } else { - setWindowTitle("NanoBoyAdvance 1.4"); + setWindowTitle("NanoBoyAdvance 1.5"); } }, Qt::BlockingQueuedConnection); @@ -282,7 +282,7 @@ void MainWindow::CreateHelpMenu(QMenuBar* menu_bar) { connect(about_app, &QAction::triggered, [&] { QMessageBox box{ this }; box.setTextFormat(Qt::RichText); - box.setText(tr("NanoBoyAdvance is a Game Boy Advance emulator with a focus on high accuracy.

" + box.setText(tr("NanoBoyAdvance is a Game Boy Advance emulator focused on accuracy.

" "Copyright © 2015 - 2022 fleroviux

" "NanoBoyAdvance is licensed under the GPLv3 or any later version.

" "GitHub: https://github.com/nba-emu/NanoBoyAdvance

" @@ -397,7 +397,7 @@ void MainWindow::Stop() { config->audio_dev->Close(); screen->Clear(); - setWindowTitle("NanoBoyAdvance 1.4"); + setWindowTitle("NanoBoyAdvance 1.5"); } }