summaryrefslogtreecommitdiff
path: root/src/yuzu/about_dialog.cpp
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2021-05-16 22:17:17 -0400
committerMorph <39850852+Morph1984@users.noreply.github.com>2021-05-16 22:17:17 -0400
commitaf69b483902990b1e0d814bcf8531f9a89a2e610 (patch)
treef98c5fdd46a058c930731db9c9942fb654a3756a /src/yuzu/about_dialog.cpp
parent440eb840ea18352488bd89e08e88d7ee34aab717 (diff)
yuzu/main: Fix version info in logging and about dialog
Diffstat (limited to 'src/yuzu/about_dialog.cpp')
-rw-r--r--src/yuzu/about_dialog.cpp16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/yuzu/about_dialog.cpp b/src/yuzu/about_dialog.cpp
index 695b2ef5f..a2e0e6962 100644
--- a/src/yuzu/about_dialog.cpp
+++ b/src/yuzu/about_dialog.cpp
@@ -9,17 +9,19 @@
#include "yuzu/about_dialog.h"
AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent), ui(new Ui::AboutDialog) {
+ const auto branch_name = std::string(Common::g_scm_branch);
+ const auto description = std::string(Common::g_scm_desc);
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);
+
+ const auto yuzu_build = fmt::format("yuzu Development Build | {}-{}", branch_name, description);
+ const auto override_build = fmt::format(std::string(Common::g_title_bar_format_idle), build_id);
+ const auto yuzu_build_version = override_build.empty() ? yuzu_build : override_build;
ui->setupUi(this);
ui->labelLogo->setPixmap(QIcon::fromTheme(QStringLiteral("yuzu")).pixmap(200));
- ui->labelBuildInfo->setText(ui->labelBuildInfo->text().arg(
- 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)));
+ ui->labelBuildInfo->setText(
+ ui->labelBuildInfo->text().arg(QString::fromStdString(yuzu_build_version),
+ QString::fromUtf8(Common::g_build_date).left(10)));
}
AboutDialog::~AboutDialog() = default;