diff --git a/src/BizHawk.Client.EmuHawk/BizBox.Designer.cs b/src/BizHawk.Client.EmuHawk/BizBox.Designer.cs index 2a67401dac..bd72bd337a 100644 --- a/src/BizHawk.Client.EmuHawk/BizBox.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/BizBox.Designer.cs @@ -60,7 +60,7 @@ this.pictureBox1.Location = new System.Drawing.Point(12, 10); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(164, 164); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.pictureBox1.TabIndex = 1; this.pictureBox1.TabStop = false; // @@ -73,7 +73,7 @@ this.linkLabel1.Size = new System.Drawing.Size(102, 13); this.linkLabel1.TabIndex = 2; this.linkLabel1.TabStop = true; - this.linkLabel1.Text = "Bizhawk Homepage"; + this.linkLabel1.Text = "BizHawk Homepage"; this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); // // label3 @@ -81,14 +81,14 @@ this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label3.Location = new System.Drawing.Point(197, 10); this.label3.Name = "label3"; - this.label3.Text = "BizHawk"; + this.label3.Text = "EmuHawk"; // // label4 // this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label4.Location = new System.Drawing.Point(207, 31); this.label4.Name = "label4"; - this.label4.Text = "\"A multi-platform emulator...\r\nfor productive people.\""; + this.label4.Text = "\"A multi-system emulator...\r\nfor productive people.\""; // // CoreInfoPanel // @@ -178,7 +178,7 @@ this.MinimumSize = new System.Drawing.Size(453, 253); this.Name = "BizBox"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = " BizHawk"; + this.Text = "About EmuHawk"; this.Load += new System.EventHandler(this.BizBox_Load); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); diff --git a/src/BizHawk.Client.EmuHawk/BizBox.cs b/src/BizHawk.Client.EmuHawk/BizBox.cs index 87b048c06a..d26cb5f668 100644 --- a/src/BizHawk.Client.EmuHawk/BizBox.cs +++ b/src/BizHawk.Client.EmuHawk/BizBox.cs @@ -31,19 +31,22 @@ namespace BizHawk.Client.EmuHawk private void BizBox_Load(object sender, EventArgs e) { - string mainVersion = VersionInfo.MainVersion; - if (IntPtr.Size == 8) - { - mainVersion += " (x64)"; - } - DeveloperBuildLabel.Visible = VersionInfo.DeveloperBuild; - Text = VersionInfo.DeveloperBuild - ? $" BizHawk (GIT {VersionInfo.GIT_BRANCH}#{VersionInfo.GIT_SHORTHASH})" - : $"Version {mainVersion} (GIT {VersionInfo.GIT_BRANCH}#{VersionInfo.GIT_SHORTHASH})"; - - VersionLabel.Text = $"Version {mainVersion}"; +#if true //TODO prepare for re-adding x86 and adding ARM/RISC-V + const string targetArch = "x64"; +#else + var targetArch = IntPtr.Size is 8 ? "x64" : "x86"; +#endif +#if DEBUG + const string buildConfig = "Debug"; +#else + const string buildConfig = "Release"; +#endif + VersionLabel.Text = $"Version {VersionInfo.MainVersion}"; + VersionLabel.Text += VersionInfo.DeveloperBuild + ? $" — dev build ({buildConfig}, {targetArch})" + : $" ({targetArch})"; DateLabel.Text = VersionInfo.ReleaseDate; foreach (var core in CoreInventory.Instance.SystemsFlat.Where(core => core.CoreAttr.Released) @@ -55,7 +58,7 @@ namespace BizHawk.Client.EmuHawk }); } - linkLabel2.Text = $"Commit # {VersionInfo.GIT_SHORTHASH}"; + linkLabel2.Text = $"Commit :{VersionInfo.GIT_BRANCH}@{VersionInfo.GIT_SHORTHASH}"; } private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/images/corphawk.png b/src/BizHawk.Client.EmuHawk/images/corphawk.png index 7319ce8267..5c873126bc 100644 Binary files a/src/BizHawk.Client.EmuHawk/images/corphawk.png and b/src/BizHawk.Client.EmuHawk/images/corphawk.png differ