diff --git a/BizHawk.Client.EmuHawk/AboutBox.Designer.cs b/BizHawk.Client.EmuHawk/AboutBox.Designer.cs index 6ce6402235..702733471c 100644 --- a/BizHawk.Client.EmuHawk/AboutBox.Designer.cs +++ b/BizHawk.Client.EmuHawk/AboutBox.Designer.cs @@ -35,7 +35,6 @@ this.timer1 = new System.Windows.Forms.Timer(this.components); this.label3 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); - this.HR = new BizHawk.Client.EmuHawk.HorizontalLine(); this.label5 = new System.Windows.Forms.Label(); this.mom2 = new System.Windows.Forms.PictureBox(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); @@ -43,9 +42,14 @@ this.pictureBox4 = new System.Windows.Forms.PictureBox(); this.pictureBox3 = new System.Windows.Forms.PictureBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.pictureBox5 = new BizHawk.Client.EmuHawk.MyViewportPanel(); this.CloseBtn = new System.Windows.Forms.Button(); this.btnBizBox = new System.Windows.Forms.Button(); + this.tbBranch = new System.Windows.Forms.TextBox(); + this.tbCommit = new System.Windows.Forms.TextBox(); + this.label6 = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.pictureBox5 = new BizHawk.Client.EmuHawk.MyViewportPanel(); + this.HR = new BizHawk.Client.EmuHawk.HorizontalLine(); ((System.ComponentModel.ISupportInitialize)(this.mom2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.mom1)).BeginInit(); @@ -100,15 +104,6 @@ this.label4.TabIndex = 5; this.label4.Text = "(LEVAR BURTON\r\nCAMEO)"; // - // HR - // - this.HR.Font = new System.Drawing.Font("Microsoft Sans Serif", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.HR.Location = new System.Drawing.Point(349, 213); - this.HR.Name = "HR"; - this.HR.Size = new System.Drawing.Size(158, 2); - this.HR.TabIndex = 4; - this.HR.Text = "COPYRITE 2001"; - // // label5 // this.label5.AutoSize = true; @@ -178,17 +173,9 @@ this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; // - // pictureBox5 - // - this.pictureBox5.Enabled = false; - this.pictureBox5.Location = new System.Drawing.Point(71, 223); - this.pictureBox5.Name = "pictureBox5"; - this.pictureBox5.Size = new System.Drawing.Size(376, 48); - this.pictureBox5.TabIndex = 15; - this.pictureBox5.TabStop = false; - // // CloseBtn // + this.CloseBtn.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.CloseBtn.Location = new System.Drawing.Point(424, 462); this.CloseBtn.Name = "CloseBtn"; this.CloseBtn.Size = new System.Drawing.Size(75, 23); @@ -200,6 +187,7 @@ // // btnBizBox // + this.btnBizBox.DialogResult = System.Windows.Forms.DialogResult.Cancel; this.btnBizBox.Location = new System.Drawing.Point(-4, -3); this.btnBizBox.Name = "btnBizBox"; this.btnBizBox.Size = new System.Drawing.Size(75, 23); @@ -208,12 +196,69 @@ this.btnBizBox.UseVisualStyleBackColor = true; this.btnBizBox.Click += new System.EventHandler(this.btnBizBox_Click); // + // tbBranch + // + this.tbBranch.Location = new System.Drawing.Point(49, 476); + this.tbBranch.Name = "tbBranch"; + this.tbBranch.ReadOnly = true; + this.tbBranch.Size = new System.Drawing.Size(100, 20); + this.tbBranch.TabIndex = 20; + // + // tbCommit + // + this.tbCommit.Location = new System.Drawing.Point(203, 476); + this.tbCommit.Name = "tbCommit"; + this.tbCommit.ReadOnly = true; + this.tbCommit.Size = new System.Drawing.Size(100, 20); + this.tbCommit.TabIndex = 20; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(2, 479); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(44, 13); + this.label6.TabIndex = 21; + this.label6.Text = "Branch:"; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(155, 479); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(44, 13); + this.label7.TabIndex = 22; + this.label7.Text = "Commit:"; + // + // pictureBox5 + // + this.pictureBox5.Enabled = false; + this.pictureBox5.Location = new System.Drawing.Point(71, 223); + this.pictureBox5.Name = "pictureBox5"; + this.pictureBox5.Size = new System.Drawing.Size(376, 48); + this.pictureBox5.TabIndex = 15; + this.pictureBox5.TabStop = false; + // + // HR + // + this.HR.Font = new System.Drawing.Font("Microsoft Sans Serif", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.HR.Location = new System.Drawing.Point(349, 213); + this.HR.Name = "HR"; + this.HR.Size = new System.Drawing.Size(158, 2); + this.HR.TabIndex = 4; + this.HR.Text = "COPYRITE 2001"; + // // AboutBox // this.AcceptButton = this.CloseBtn; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this.CloseBtn; this.ClientSize = new System.Drawing.Size(519, 497); + this.Controls.Add(this.label7); + this.Controls.Add(this.label6); + this.Controls.Add(this.tbCommit); + this.Controls.Add(this.tbBranch); this.Controls.Add(this.btnBizBox); this.Controls.Add(this.CloseBtn); this.Controls.Add(this.pictureBox5); @@ -268,5 +313,9 @@ private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.Button CloseBtn; private System.Windows.Forms.Button btnBizBox; + private System.Windows.Forms.TextBox tbBranch; + private System.Windows.Forms.TextBox tbCommit; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label7; } } \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/AboutBox.cs b/BizHawk.Client.EmuHawk/AboutBox.cs index 0aec2ff897..1c6b3be5de 100644 --- a/BizHawk.Client.EmuHawk/AboutBox.cs +++ b/BizHawk.Client.EmuHawk/AboutBox.cs @@ -37,6 +37,9 @@ namespace BizHawk.Client.EmuHawk pictureBox2.BringToFront(); pictureBox1.BringToFront(); pictureBox5.Visible = false; + + tbBranch.Text = SubWCRev.GIT_BRANCH; + tbCommit.Text = SubWCRev.GIT_SHORTHASH; } protected override void OnClosed(EventArgs e) @@ -160,9 +163,9 @@ namespace BizHawk.Client.EmuHawk private void AboutBox_Load(object sender, EventArgs e) { #if DEBUG - Text = "BizHawk Developer Build (DEBUG MODE) GIT " + SubWCRev.GIT_BRANCH + "-" + SubWCRev.SVN_REV + "#" + SubWCRev.GIT_SHORTHASH; + Text = "BizHawk Developer Build (DEBUG MODE) GIT " + SubWCRev.GIT_BRANCH + "#" + SubWCRev.GIT_SHORTHASH; #else - Text = "BizHawk Developer Build (RELEASE MODE) GIT " + SubWCRev.GIT_BRANCH + "-"+SubWCRev.SVN_REV + "#" + SubWCRev.GIT_SHORTHASH; + Text = "BizHawk Developer Build (RELEASE MODE) GIT " + SubWCRev.GIT_BRANCH + "#" + SubWCRev.GIT_SHORTHASH; #endif if (DateTime.Now.Month == 12) if (DateTime.Now.Day > 17 && DateTime.Now.Day <= 25) diff --git a/BizHawk.Client.EmuHawk/BizBox.Designer.cs b/BizHawk.Client.EmuHawk/BizBox.Designer.cs index 7484442a31..2cc054603d 100644 --- a/BizHawk.Client.EmuHawk/BizBox.Designer.cs +++ b/BizHawk.Client.EmuHawk/BizBox.Designer.cs @@ -36,7 +36,6 @@ this.label2 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); - this.VersionLabel = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label(); @@ -44,6 +43,9 @@ this.label37 = new System.Windows.Forms.Label(); this.CoreInfoPanel = new System.Windows.Forms.Panel(); this.textBox1 = new System.Windows.Forms.TextBox(); + this.VersionLabel = new System.Windows.Forms.Label(); + this.btnCopyHash = new System.Windows.Forms.Button(); + this.linkLabel2 = new System.Windows.Forms.LinkLabel(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -119,14 +121,6 @@ this.label4.TabIndex = 6; this.label4.Text = "A multi-Platform Emulator"; // - // VersionLabel - // - this.VersionLabel.AutoSize = true; - this.VersionLabel.Location = new System.Drawing.Point(198, 52); - this.VersionLabel.Name = "VersionLabel"; - this.VersionLabel.Size = new System.Drawing.Size(0, 13); - this.VersionLabel.TabIndex = 7; - // // label5 // this.label5.AutoSize = true; @@ -196,6 +190,39 @@ this.textBox1.TabIndex = 16; this.textBox1.Text = "jabo_direct3d8_patched.dll is distributed with the special permission of the auth" + "or."; + // + // VersionLabel + // + this.VersionLabel.AutoSize = true; + this.VersionLabel.Location = new System.Drawing.Point(198, 52); + this.VersionLabel.Name = "VersionLabel"; + this.VersionLabel.Size = new System.Drawing.Size(0, 13); + this.VersionLabel.TabIndex = 7; + // + // btnCopyHash + // + this.btnCopyHash.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.btnCopyHash.AutoSize = true; + this.btnCopyHash.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.btnCopyHash.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Duplicate; + this.btnCopyHash.Location = new System.Drawing.Point(12, 505); + this.btnCopyHash.Name = "btnCopyHash"; + this.btnCopyHash.Size = new System.Drawing.Size(22, 22); + this.btnCopyHash.TabIndex = 18; + this.btnCopyHash.UseVisualStyleBackColor = true; + this.btnCopyHash.Click += new System.EventHandler(this.btnCopyHash_Click); + // + // linkLabel2 + // + this.linkLabel2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.linkLabel2.AutoSize = true; + this.linkLabel2.Location = new System.Drawing.Point(40, 509); + this.linkLabel2.Name = "linkLabel2"; + this.linkLabel2.Size = new System.Drawing.Size(100, 13); + this.linkLabel2.TabIndex = 19; + this.linkLabel2.TabStop = true; + this.linkLabel2.Text = "Commit #XXXXXXX"; + this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked); // // BizBox // @@ -204,6 +231,8 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.OK; this.ClientSize = new System.Drawing.Size(448, 536); + this.Controls.Add(this.linkLabel2); + this.Controls.Add(this.btnCopyHash); this.Controls.Add(this.textBox1); this.Controls.Add(this.CoreInfoPanel); this.Controls.Add(this.label37); @@ -240,7 +269,6 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label VersionLabel; private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label6; private System.Windows.Forms.Label label7; @@ -248,5 +276,8 @@ private System.Windows.Forms.Label label37; private System.Windows.Forms.Panel CoreInfoPanel; private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.Label VersionLabel; + private System.Windows.Forms.Button btnCopyHash; + private System.Windows.Forms.LinkLabel linkLabel2; } } \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/BizBox.cs b/BizHawk.Client.EmuHawk/BizBox.cs index cbef7d3edc..d32b3a65ed 100644 --- a/BizHawk.Client.EmuHawk/BizBox.cs +++ b/BizHawk.Client.EmuHawk/BizBox.cs @@ -28,11 +28,11 @@ namespace BizHawk.Client.EmuHawk { if (VersionInfo.DeveloperBuild) { - Text = " BizHawk (GIT " + SubWCRev.GIT_BRANCH + "-" + SubWCRev.SVN_REV + "#" + SubWCRev.GIT_SHORTHASH + ")"; + Text = " BizHawk (GIT " + SubWCRev.GIT_BRANCH + "#" + SubWCRev.GIT_SHORTHASH + ")"; } else { - Text = "Version " + VersionInfo.MAINVERSION + " (GIT " + SubWCRev.GIT_BRANCH + "-" + SubWCRev.SVN_REV + "#" + SubWCRev.GIT_SHORTHASH + ")"; + Text = "Version " + VersionInfo.MAINVERSION + " (GIT " + SubWCRev.GIT_BRANCH + "#" + SubWCRev.GIT_SHORTHASH + ")"; } VersionLabel.Text = "Version " + VersionInfo.MAINVERSION + " " + VersionInfo.RELEASEDATE; @@ -55,6 +55,18 @@ namespace BizHawk.Client.EmuHawk }); } + + linkLabel2.Text = "Commit # " + SubWCRev.GIT_SHORTHASH; + } + + private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + System.Diagnostics.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); } } } diff --git a/Version/VersionInfo.cs b/Version/VersionInfo.cs index e08f42ee47..59a2dfdef9 100644 --- a/Version/VersionInfo.cs +++ b/Version/VersionInfo.cs @@ -7,6 +7,6 @@ static class VersionInfo public static string GetEmuVersion() { - return DeveloperBuild ? "SVN " + SubWCRev.SVN_REV : ("Version " + MAINVERSION); + return DeveloperBuild ? ("GIT " + SubWCRev.GIT_BRANCH + "#" + SubWCRev.GIT_SHORTHASH) : ("Version " + MAINVERSION); } }