diff --git a/BizHawk.Client.EmuHawk/CustomControls/PrereqsAlert.Designer.cs b/BizHawk.Client.EmuHawk/CustomControls/PrereqsAlert.Designer.cs index 506c08a998..a770cfd30a 100644 --- a/BizHawk.Client.EmuHawk/CustomControls/PrereqsAlert.Designer.cs +++ b/BizHawk.Client.EmuHawk/CustomControls/PrereqsAlert.Designer.cs @@ -34,10 +34,10 @@ this.textBox1 = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); this.linkLabel2 = new System.Windows.Forms.LinkLabel(); - this.label3 = new System.Windows.Forms.Label(); this.button1 = new System.Windows.Forms.Button(); this.label4 = new System.Windows.Forms.Label(); this.textBox2 = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); this.SuspendLayout(); // // linkLabel1 @@ -45,10 +45,10 @@ this.linkLabel1.AutoSize = true; this.linkLabel1.Location = new System.Drawing.Point(21, 214); this.linkLabel1.Name = "linkLabel1"; - this.linkLabel1.Size = new System.Drawing.Size(291, 13); + this.linkLabel1.Size = new System.Drawing.Size(168, 13); this.linkLabel1.TabIndex = 0; this.linkLabel1.TabStop = true; - this.linkLabel1.Text = "https://sourceforge.net/projects/bizhawk/files/Prerequisites"; + this.linkLabel1.Text = "http://tasvideos.org/Bizhawk.html"; this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); // // label1 @@ -74,35 +74,26 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(0, 191); + this.label2.Location = new System.Drawing.Point(4, 191); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(250, 13); + this.label2.Size = new System.Drawing.Size(362, 13); this.label2.TabIndex = 3; - this.label2.Text = "You should run the latest prerequisites installer from:"; + this.label2.Text = "You should run the latest prerequisites installer from the location indexed by:"; // // linkLabel2 // this.linkLabel2.AutoSize = true; this.linkLabel2.Location = new System.Drawing.Point(21, 261); this.linkLabel2.Name = "linkLabel2"; - this.linkLabel2.Size = new System.Drawing.Size(168, 13); + this.linkLabel2.Size = new System.Drawing.Size(150, 13); this.linkLabel2.TabIndex = 4; this.linkLabel2.TabStop = true; - this.linkLabel2.Text = "http://tasvideos.org/Bizhawk.html"; + this.linkLabel2.Text = "http://sf.net/projects/bizhawk"; this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked); // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(3, 238); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(282, 13); - this.label3.TabIndex = 5; - this.label3.Text = "In case that URL is gone, you can get more information at:"; - // // button1 // - this.button1.Location = new System.Drawing.Point(374, 370); + this.button1.Location = new System.Drawing.Point(374, 376); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(75, 23); this.button1.TabIndex = 6; @@ -113,7 +104,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(3, 286); + this.label4.Location = new System.Drawing.Point(4, 286); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(141, 13); this.label4.TabIndex = 7; @@ -121,19 +112,28 @@ // // textBox2 // - this.textBox2.Location = new System.Drawing.Point(12, 315); + this.textBox2.Location = new System.Drawing.Point(12, 308); this.textBox2.Multiline = true; this.textBox2.Name = "textBox2"; this.textBox2.ReadOnly = true; - this.textBox2.Size = new System.Drawing.Size(332, 78); + this.textBox2.Size = new System.Drawing.Size(332, 91); this.textBox2.TabIndex = 8; this.textBox2.Text = resources.GetString("textBox2.Text"); // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(4, 238); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(282, 13); + this.label3.TabIndex = 5; + this.label3.Text = "In case that URL is gone, you can get more information at:"; + // // PrereqsAlert // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(461, 402); + this.ClientSize = new System.Drawing.Size(461, 411); this.Controls.Add(this.textBox2); this.Controls.Add(this.label4); this.Controls.Add(this.button1); @@ -159,10 +159,10 @@ private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label2; private System.Windows.Forms.LinkLabel linkLabel2; - private System.Windows.Forms.Label label3; private System.Windows.Forms.Button button1; public System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.Label label4; private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.Label label3; } } \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/CustomControls/PrereqsAlert.cs b/BizHawk.Client.EmuHawk/CustomControls/PrereqsAlert.cs index f3f2aebf4c..581ea98df5 100644 --- a/BizHawk.Client.EmuHawk/CustomControls/PrereqsAlert.cs +++ b/BizHawk.Client.EmuHawk/CustomControls/PrereqsAlert.cs @@ -19,13 +19,13 @@ namespace BizHawk.Client.EmuHawk.CustomControls private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { linkLabel1.LinkVisited = true; - System.Diagnostics.Process.Start("https://sourceforge.net/projects/bizhawk/files/Prerequisites"); + System.Diagnostics.Process.Start("http://tasvideos.org/Bizhawk.html"); } private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { linkLabel2.LinkVisited = true; - System.Diagnostics.Process.Start("http://tasvideos.org/Bizhawk.html"); + System.Diagnostics.Process.Start("http://sf.net/projects/bizhawk"); } private void button1_Click(object sender, EventArgs e) diff --git a/BizHawk.Client.EmuHawk/CustomControls/PrereqsAlert.resx b/BizHawk.Client.EmuHawk/CustomControls/PrereqsAlert.resx index c4598d71c2..61d62150b1 100644 --- a/BizHawk.Client.EmuHawk/CustomControls/PrereqsAlert.resx +++ b/BizHawk.Client.EmuHawk/CustomControls/PrereqsAlert.resx @@ -119,6 +119,8 @@ We're not checking the version number of the VC 2010 runtime. Be sure you have the SP1 version installed. -DirectX Web Update is reportedly failing for some people as part of our prereqs installer. Try installing it manually. +DirectX Web Update is reportedly failing for some people as part of our prereqs installer. Try installing it manually. +The VC 2015 prerequisite has prerequisites of its own, so install it yourself manually at your own peril. + \ No newline at end of file