diff --git a/BizHawk.Client.EmuHawk/BizBox.Designer.cs b/BizHawk.Client.EmuHawk/BizBox.Designer.cs index 698a2a038e..6f97764189 100644 --- a/BizHawk.Client.EmuHawk/BizBox.Designer.cs +++ b/BizHawk.Client.EmuHawk/BizBox.Designer.cs @@ -39,6 +39,7 @@ this.linkLabel2 = new System.Windows.Forms.LinkLabel(); this.linkLabel3 = new System.Windows.Forms.LinkLabel(); this.DateLabel = new System.Windows.Forms.Label(); + this.DeveloperBuildLabel = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -162,6 +163,16 @@ this.DateLabel.TabIndex = 21; this.DateLabel.Text = "timestamp goes here"; // + // DeveloperBuildLabel + // + this.DeveloperBuildLabel.AutoSize = true; + this.DeveloperBuildLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 24F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.DeveloperBuildLabel.Location = new System.Drawing.Point(194, 137); + this.DeveloperBuildLabel.Name = "DeveloperBuildLabel"; + this.DeveloperBuildLabel.Size = new System.Drawing.Size(240, 37); + this.DeveloperBuildLabel.TabIndex = 22; + this.DeveloperBuildLabel.Text = "Developer Build"; + // // BizBox // this.AcceptButton = this.OK; @@ -169,6 +180,7 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.OK; this.ClientSize = new System.Drawing.Size(448, 536); + this.Controls.Add(this.DeveloperBuildLabel); this.Controls.Add(this.DateLabel); this.Controls.Add(this.linkLabel3); this.Controls.Add(this.linkLabel2); @@ -206,5 +218,6 @@ private System.Windows.Forms.LinkLabel linkLabel2; private System.Windows.Forms.LinkLabel linkLabel3; private System.Windows.Forms.Label DateLabel; + private System.Windows.Forms.Label DeveloperBuildLabel; } } \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/BizBox.cs b/BizHawk.Client.EmuHawk/BizBox.cs index 9bff885393..c560142798 100644 --- a/BizHawk.Client.EmuHawk/BizBox.cs +++ b/BizHawk.Client.EmuHawk/BizBox.cs @@ -1,5 +1,6 @@ using BizHawk.Emulation.Common; using System; +using System.Diagnostics; using System.Linq; using System.Reflection; using System.Windows.Forms; @@ -26,19 +27,19 @@ namespace BizHawk.Client.EmuHawk private void BizBox_Load(object sender, EventArgs e) { - string mainversion = VersionInfo.Mainversion; + string mainVersion = VersionInfo.Mainversion; if (IntPtr.Size == 8) - mainversion += " (x64)"; - if (VersionInfo.DeveloperBuild) { - Text = $" BizHawk (GIT {SubWCRev.GIT_BRANCH}#{SubWCRev.GIT_SHORTHASH})"; - } - else - { - Text = $"Version {mainversion} (GIT {SubWCRev.GIT_BRANCH}#{SubWCRev.GIT_SHORTHASH})"; + mainVersion += " (x64)"; } - VersionLabel.Text = $"Version {mainversion}"; + DeveloperBuildLabel.Visible = VersionInfo.DeveloperBuild; + + Text = VersionInfo.DeveloperBuild + ? $" BizHawk (GIT {SubWCRev.GIT_BRANCH}#{SubWCRev.GIT_SHORTHASH})" + : $"Version {mainVersion} (GIT {SubWCRev.GIT_BRANCH}#{SubWCRev.GIT_SHORTHASH})"; + + VersionLabel.Text = $"Version {mainVersion}"; DateLabel.Text = VersionInfo.RELEASEDATE; var cores = Assembly @@ -63,17 +64,17 @@ namespace BizHawk.Client.EmuHawk private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - System.Diagnostics.Process.Start($"https://github.com/TASVideos/BizHawk/commit/{SubWCRev.GIT_SHORTHASH}"); + Process.Start($"https://github.com/TASVideos/BizHawk/commit/{SubWCRev.GIT_SHORTHASH}"); } private void btnCopyHash_Click(object sender, EventArgs e) { - System.Windows.Forms.Clipboard.SetText(SubWCRev.GIT_SHORTHASH); + Clipboard.SetText(SubWCRev.GIT_SHORTHASH); } private void linkLabel3_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - System.Diagnostics.Process.Start("https://github.com/TASVideos/BizHawk/graphs/contributors"); + Process.Start("https://github.com/TASVideos/BizHawk/graphs/contributors"); } } } diff --git a/Version/VersionInfo.cs b/Version/VersionInfo.cs index b2114a1dde..fc8fe7d640 100644 --- a/Version/VersionInfo.cs +++ b/Version/VersionInfo.cs @@ -29,7 +29,7 @@ internal static class VersionInfo } } - // code copied to avoid depending on code in otherp rojects + // code copied to avoid depending on code in other projects private static string GetExeDirectoryAbsolute() { var path = Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location);