diff options
author | Zach Hilman <DarkLordZach@users.noreply.github.com> | 2020-04-07 23:16:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-07 23:16:23 +0200 |
commit | 26ed65495d37f74afd12d2c7ed9b541189718bbd (patch) | |
tree | 3907f7a4cf9fe3e130f1e864af5d98bee7493eb8 | |
parent | Merge pull request #3599 from ReinUsesLisp/revert-3499 (diff) | |
parent | Addressed feedback: switched to snake case and fixed clang-format errors (diff) | |
download | yuzu-26ed65495d37f74afd12d2c7ed9b541189718bbd.tar yuzu-26ed65495d37f74afd12d2c7ed9b541189718bbd.tar.gz yuzu-26ed65495d37f74afd12d2c7ed9b541189718bbd.tar.bz2 yuzu-26ed65495d37f74afd12d2c7ed9b541189718bbd.tar.lz yuzu-26ed65495d37f74afd12d2c7ed9b541189718bbd.tar.xz yuzu-26ed65495d37f74afd12d2c7ed9b541189718bbd.tar.zst yuzu-26ed65495d37f74afd12d2c7ed9b541189718bbd.zip |
-rw-r--r-- | src/yuzu/about_dialog.cpp | 9 | ||||
-rw-r--r-- | src/yuzu/main.cpp | 8 |
2 files changed, 15 insertions, 2 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))); } diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 940f24dc8..1717e06f9 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -205,7 +205,13 @@ GMainWindow::GMainWindow() ConnectMenuEvents(); ConnectWidgetEvents(); - LOG_INFO(Frontend, "yuzu Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch, + 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); + + LOG_INFO(Frontend, "yuzu Version: {} | {}-{}", yuzu_build_version, Common::g_scm_branch, Common::g_scm_desc); #ifdef ARCHITECTURE_x86_64 LOG_INFO(Frontend, "Host CPU: {}", Common::GetCPUCaps().cpu_string); |