Don't display SourceRevisionId in titles

https://learn.microsoft.com/en-us/dotnet/core/compatibility/sdk/8.0/source-link
This commit is contained in:
VaDiM 2023-11-21 00:31:09 +03:00
parent d572bd0e64
commit b27482e22b
2 changed files with 13 additions and 7 deletions

View File

@ -10,13 +10,15 @@ namespace AssetStudioGUI
public AboutForm() public AboutForm()
{ {
InitializeComponent(); InitializeComponent();
var productName = Application.ProductName;
var arch = Environment.Is64BitProcess ? "x64" : "x32"; var arch = Environment.Is64BitProcess ? "x64" : "x32";
var appAssembly = typeof(Program).Assembly.GetName();
var productName = appAssembly.Name;
var productVer = appAssembly.Version.ToString();
Text += " " + productName; Text += " " + productName;
productTitleLabel.Text = productName; productTitleLabel.Text = productName;
productVersionLabel.Text = $"v{Application.ProductVersion} [{arch}]"; productVersionLabel.Text = $"v{productVer} [{arch}]";
productNamelabel.Text = productName; productNamelabel.Text = productName;
modVersionLabel.Text = Application.ProductVersion; modVersionLabel.Text = productVer;
licenseRichTextBox.Text = GetLicenseText(); licenseRichTextBox.Text = GetLicenseText();
} }

View File

@ -112,11 +112,15 @@ namespace AssetStudioGUI
[DllImport("gdi32.dll")] [DllImport("gdi32.dll")]
private static extern IntPtr AddFontMemResourceEx(IntPtr pbFont, uint cbFont, IntPtr pdv, [In] ref uint pcFonts); private static extern IntPtr AddFontMemResourceEx(IntPtr pbFont, uint cbFont, IntPtr pdv, [In] ref uint pcFonts);
private string guiTitle = string.Empty;
public AssetStudioGUIForm() public AssetStudioGUIForm()
{ {
Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US"); Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US");
InitializeComponent(); InitializeComponent();
Text = $"{Application.ProductName} v{Application.ProductVersion}"; var appAssembly = typeof(Program).Assembly.GetName();
guiTitle = $"{appAssembly.Name} v{appAssembly.Version}";
Text = guiTitle;
delayTimer = new System.Timers.Timer(800); delayTimer = new System.Timers.Timer(800);
delayTimer.Elapsed += new ElapsedEventHandler(delayTimer_Elapsed); delayTimer.Elapsed += new ElapsedEventHandler(delayTimer_Elapsed);
displayAll.Checked = Properties.Settings.Default.displayAll; displayAll.Checked = Properties.Settings.Default.displayAll;
@ -223,11 +227,11 @@ namespace AssetStudioGUI
if (!string.IsNullOrEmpty(productName)) if (!string.IsNullOrEmpty(productName))
{ {
Text = $"{Application.ProductName} v{Application.ProductVersion} - {productName} - {assetsManager.assetsFileList[0].unityVersion} - {assetsManager.assetsFileList[0].m_TargetPlatform}"; Text = $"{guiTitle} - {productName} - {assetsManager.assetsFileList[0].unityVersion} - {assetsManager.assetsFileList[0].m_TargetPlatform}";
} }
else else
{ {
Text = $"{Application.ProductName} v{Application.ProductVersion} - no productName - {assetsManager.assetsFileList[0].unityVersion} - {assetsManager.assetsFileList[0].m_TargetPlatform}"; Text = $"{guiTitle} - no productName - {assetsManager.assetsFileList[0].unityVersion} - {assetsManager.assetsFileList[0].m_TargetPlatform}";
} }
assetListView.VirtualListSize = visibleAssets.Count; assetListView.VirtualListSize = visibleAssets.Count;
@ -1340,7 +1344,7 @@ namespace AssetStudioGUI
private void ResetForm() private void ResetForm()
{ {
Text = $"{Application.ProductName} v{Application.ProductVersion}"; Text = guiTitle;
assetsManager.Clear(); assetsManager.Clear();
assemblyLoader.Clear(); assemblyLoader.Clear();
exportableAssets.Clear(); exportableAssets.Clear();