Skip to content

Commit

Permalink
Bump version to 1.5 and update about text
Browse files Browse the repository at this point in the history
  • Loading branch information
fleroviux committed May 29, 2022
1 parent ed85adb commit 56b7ec3
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ See [COMPILING.md](https://github.com/fleroviux/NanoboyAdvance/blob/master/docs/

## Copyright

NanoBoyAdvance is Copyright © 2015 - 2021 fleroviux.<br>
NanoBoyAdvance is Copyright © 2015 - 2022 fleroviux.<br>
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.
6 changes: 3 additions & 3 deletions src/platform/qt/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
10 changes: 5 additions & 5 deletions src/platform/qt/rc/app.rc
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
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
BLOCK "040904E4"
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

Expand Down
10 changes: 5 additions & 5 deletions src/platform/qt/src/widget/main_window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ MainWindow::MainWindow(
QApplication* app,
QWidget* parent
) : QMainWindow(parent) {
setWindowTitle("NanoBoyAdvance 1.4");
setWindowTitle("NanoBoyAdvance 1.5");

screen = std::make_shared<Screen>(this, config);
setCentralWidget(screen.get());
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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.<br><br>"
box.setText(tr("NanoBoyAdvance is a Game Boy Advance emulator focused on accuracy.<br><br>"
"Copyright © 2015 - 2022 fleroviux<br><br>"
"NanoBoyAdvance is licensed under the GPLv3 or any later version.<br><br>"
"GitHub: <a href=\"https://github.com/nba-emu/NanoBoyAdvance\">https://github.com/nba-emu/NanoBoyAdvance</a><br><br>"
Expand Down Expand Up @@ -397,7 +397,7 @@ void MainWindow::Stop() {
config->audio_dev->Close();
screen->Clear();

setWindowTitle("NanoBoyAdvance 1.4");
setWindowTitle("NanoBoyAdvance 1.5");
}
}

Expand Down

0 comments on commit 56b7ec3

Please sign in to comment.