mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-26 21:07:18 +02:00
Merge pull request #3621 from SilverBeamx/fullnamefix
Log version and about section version fix
This commit is contained in:
commit
26ed65495d
@ -3,15 +3,22 @@
|
|||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
#include <QIcon>
|
#include <QIcon>
|
||||||
|
#include <fmt/format.h>
|
||||||
#include "common/scm_rev.h"
|
#include "common/scm_rev.h"
|
||||||
#include "ui_aboutdialog.h"
|
#include "ui_aboutdialog.h"
|
||||||
#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 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->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(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)));
|
QString::fromUtf8(Common::g_scm_desc), QString::fromUtf8(Common::g_build_date).left(10)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -205,7 +205,13 @@ GMainWindow::GMainWindow()
|
|||||||
ConnectMenuEvents();
|
ConnectMenuEvents();
|
||||||
ConnectWidgetEvents();
|
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);
|
Common::g_scm_desc);
|
||||||
#ifdef ARCHITECTURE_x86_64
|
#ifdef ARCHITECTURE_x86_64
|
||||||
LOG_INFO(Frontend, "Host CPU: {}", Common::GetCPUCaps().cpu_string);
|
LOG_INFO(Frontend, "Host CPU: {}", Common::GetCPUCaps().cpu_string);
|
||||||
|
Loading…
Reference in New Issue
Block a user