diff options
| author | Zach Hilman <DarkLordZach@users.noreply.github.com> | 2020-04-07 17:16:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-07 17:16:23 -0400 |
| commit | 26ed65495d37f74afd12d2c7ed9b541189718bbd (patch) | |
| tree | 3907f7a4cf9fe3e130f1e864af5d98bee7493eb8 /src/yuzu/about_dialog.cpp | |
| parent | f316911248e8046a3044fd0fdcd434663a5e588e (diff) | |
| parent | 863f7385dc6f7c232877bbabb5ff1068d06a7f96 (diff) | |
Merge pull request #3621 from SilverBeamx/fullnamefix
Log version and about section version fix
Diffstat (limited to 'src/yuzu/about_dialog.cpp')
| -rw-r--r-- | src/yuzu/about_dialog.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/yuzu/about_dialog.cpp b/src/yuzu/about_dialog.cpp index d39b3f07a..695b2ef5f 100644 --- a/src/yuzu/about_dialog.cpp +++ b/src/yuzu/about_dialog.cpp @@ -3,15 +3,22 @@ // Refer to the license.txt file included. #include <QIcon> +#include <fmt/format.h> #include "common/scm_rev.h" #include "ui_aboutdialog.h" #include "yuzu/about_dialog.h" AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent), ui(new Ui::AboutDialog) { + const auto build_id = std::string(Common::g_build_id); + const auto fmt = std::string(Common::g_title_bar_format_idle); + const auto yuzu_build_version = + fmt::format(fmt.empty() ? "yuzu Development Build" : fmt, std::string{}, std::string{}, + std::string{}, std::string{}, std::string{}, build_id); + ui->setupUi(this); ui->labelLogo->setPixmap(QIcon::fromTheme(QStringLiteral("yuzu")).pixmap(200)); ui->labelBuildInfo->setText(ui->labelBuildInfo->text().arg( - QString::fromUtf8(Common::g_build_fullname), QString::fromUtf8(Common::g_scm_branch), + QString::fromStdString(yuzu_build_version), QString::fromUtf8(Common::g_scm_branch), QString::fromUtf8(Common::g_scm_desc), QString::fromUtf8(Common::g_build_date).left(10))); } |
