yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

Merge pull request #6326 from Morph1984/fix-version 

yuzu/main: Fix version info in logging and about dialog
This commit is contained in:
bunnei 2021-05-16 20:09:54 -07:00 committed by GitHub
parent 440eb840ea af69b48390
commit 0a74d8490a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/yuzu/about_dialog.cpp
View File

@ -9,17 +9,19 @@
#include "yuzu/about_dialog.h" #include "yuzu/about_dialog.h"
AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent), ui(new Ui::AboutDialog) { 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 build_id = std::string(Common::g_build_id);
const auto fmt = std::string(Common::g_title_bar_format_idle);
const auto yuzu_build_version = const auto yuzu_build = fmt::format("yuzu Development Build | {}-{}", branch_name, description);
fmt::format(fmt.empty() ? "yuzu Development Build" : fmt, std::string{}, std::string{}, const auto override_build = fmt::format(std::string(Common::g_title_bar_format_idle), build_id);
std::string{}, std::string{}, std::string{}, build_id); const auto yuzu_build_version = override_build.empty() ? yuzu_build : override_build;
ui->setupUi(this); ui->setupUi(this);
ui->labelLogo->setPixmap(QIcon::fromTheme(QStringLiteral("yuzu")).pixmap(200)); ui->labelLogo->setPixmap(QIcon::fromTheme(QStringLiteral("yuzu")).pixmap(200));
ui->labelBuildInfo->setText(ui->labelBuildInfo->text().arg( ui->labelBuildInfo->setText(
QString::fromStdString(yuzu_build_version), QString::fromUtf8(Common::g_scm_branch), ui->labelBuildInfo->text().arg(QString::fromStdString(yuzu_build_version),
QString::fromUtf8(Common::g_scm_desc), QString::fromUtf8(Common::g_build_date).left(10))); QString::fromUtf8(Common::g_build_date).left(10)));
} }
AboutDialog::~AboutDialog() = default; AboutDialog::~AboutDialog() = default;

2
src/yuzu/aboutdialog.ui
View File

@ -70,7 +70,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;%1 | %2-%3 (%4)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;%1 (%2)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>

13
src/yuzu/main.cpp
View File

@ -241,14 +241,15 @@ GMainWindow::GMainWindow()
ConnectMenuEvents(); ConnectMenuEvents();
ConnectWidgetEvents(); ConnectWidgetEvents();
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 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, const auto yuzu_build = fmt::format("yuzu Development Build | {}-{}", branch_name, description);
Common::g_scm_desc); 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;
LOG_INFO(Frontend, "yuzu Version: {}", yuzu_build_version);
#ifdef ARCHITECTURE_x86_64 #ifdef ARCHITECTURE_x86_64
const auto& caps = Common::GetCPUCaps(); const auto& caps = Common::GetCPUCaps();
std::string cpu_string = caps.cpu_string; std::string cpu_string = caps.cpu_string;