starred/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2026-02-13 09:54:32 +00:00
Code Issues 1.1k Packages Projects Releases 20 Wiki Activity

Qt: Don't include git hash in window title

Browse Source 
It's too verbose and meaningless to the user. Still shown in the about
dialog for reference purposes.
This commit is contained in:
Stenzek
2025-10-07 01:09:39 +10:00
parent 733df6a0ce
commit 39eb2c564f
6 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/duckstation-mini/mini_host.cpp
View File

@@ -1178,7 +1178,7 @@ std::string MiniHost::GetWindowTitle(const std::string& game_title)
#endif
if (System::IsShutdown() || game_title.empty())
return fmt::format("DuckStation {}{}", g_scm_tag_str, suffix);
return fmt::format("DuckStation {}{}", g_scm_version_str, suffix);
else
return fmt::format("{}{}", game_title, suffix);
}

2
src/duckstation-qt/interfacesettingswidget.cpp
View File

@@ -90,7 +90,7 @@ InterfaceSettingsWidget::InterfaceSettingsWidget(SettingsWindow* dialog, QWidget
connect(m_ui.language, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
&InterfaceSettingsWidget::onLanguageChanged);
m_ui.autoUpdateCurrentVersion->setText(tr("%1 (%2)").arg(g_scm_tag_str).arg(g_scm_date_str));
m_ui.autoUpdateCurrentVersion->setText(tr("%1 (%2)").arg(g_scm_version_str).arg(g_scm_date_str));
}
onRenderToSeparateWindowChanged();

2
src/duckstation-qt/qthost.cpp
View File

@@ -298,7 +298,7 @@ bool QtHost::IsRunningOnWayland()
QString QtHost::GetAppNameAndVersion()
{
return QStringLiteral("DuckStation %1").arg(QLatin1StringView(g_scm_tag_str));
return QStringLiteral("DuckStation %1").arg(QLatin1StringView(g_scm_version_str));
}
QString QtHost::GetAppConfigSuffix()

2
src/scmversion/gen_scmversion.bat
View File

@@ -5,6 +5,7 @@ PUSHD %~dp0
FOR /F "tokens=* USEBACKQ" %%g IN (`git rev-parse HEAD`) do (SET "HASH=%%g")
FOR /F "tokens=* USEBACKQ" %%g IN (`git rev-parse --abbrev-ref HEAD`) do (SET "BRANCH=%%g")
FOR /F "tokens=* USEBACKQ" %%g IN (`git describe --dirty`) do (SET "TAG=%%g")
FOR /F "tokens=* USEBACKQ" %%g IN (`powershell -NoProfile -Command "'%TAG%' -replace '-g[0-9a-f]+',''"`) do (SET "VERSION=%%g")
FOR /F "tokens=* USEBACKQ" %%g IN (`git log -1 --date=iso8601-strict "--format=%%cd"`) do (SET "CDATE=%%g")
POPD
@@ -22,6 +23,7 @@ ECHO Updating %VERSIONFILE% with %TAG%...
ECHO const char* g_scm_hash_str = "%HASH%";
ECHO const char* g_scm_branch_str = "%BRANCH%";
ECHO const char* g_scm_tag_str = "%TAG%";
ECHO const char* g_scm_version_str = "%VERSION%";
ECHO const char* g_scm_date_str = "%CDATE%";
)>%VERSIONFILE%

2
src/scmversion/gen_scmversion.sh
View File

@@ -13,6 +13,7 @@ fi
HASH=$(git rev-parse HEAD)
BRANCH=$(git rev-parse --abbrev-ref HEAD | tr -d '\r\n')
TAG=$(git describe --dirty | tr -d '\r\n')
VERSION=$(echo "${TAG}" | sed -E 's/-g[0-9a-f]+//')
DATE=$(git log -1 --date=iso8601-strict --format=%cd)
cd $CURDIR
@@ -34,6 +35,7 @@ ${SIGNATURE_LINE}
const char* g_scm_hash_str = "${HASH}";
const char* g_scm_branch_str = "${BRANCH}";
const char* g_scm_tag_str = "${TAG}";
const char* g_scm_version_str = "${VERSION}";
const char* g_scm_date_str = "${DATE}";
EOF

4
src/scmversion/scmversion.h
View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com>
// SPDX-FileCopyrightText: 2019-2025 Connor McLaughlin <stenzek@gmail.com>
// SPDX-License-Identifier: CC-BY-NC-ND-4.0
#pragma once
@@ -7,4 +7,4 @@ extern const char* g_scm_hash_str;
extern const char* g_scm_branch_str;
extern const char* g_scm_tag_str;
extern const char* g_scm_date_str;
extern const char* g_scm_version_str;