remove old joke about box, you will be missed.

This commit is contained in:
adelikat 2020-01-12 14:55:55 -06:00
parent 5c472bcf77
commit 9a88a94ddc
15 changed files with 4 additions and 720 deletions

View File

@ -1,320 +0,0 @@
namespace BizHawk.Client.EmuHawk
{
partial class AboutBox
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.mom2 = new System.Windows.Forms.PictureBox();
this.pictureBox2 = new System.Windows.Forms.PictureBox();
this.mom1 = new System.Windows.Forms.PictureBox();
this.pictureBox4 = new System.Windows.Forms.PictureBox();
this.pictureBox3 = new System.Windows.Forms.PictureBox();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
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();
((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.SuspendLayout();
//
// label1
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 72F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label1.Location = new System.Drawing.Point(0, -3);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(490, 108);
this.label1.TabIndex = 1;
this.label1.Text = "BIZHAWK";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label2.Location = new System.Drawing.Point(12, 311);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(291, 165);
this.label2.TabIndex = 2;
this.label2.Text = "EMULATES\r\nY̶̷̼̬̟̘̦̼͙̝̯̦̠̜͙͖̘ͨ̒͂͐ͪ͂̒̄ͯͯ͌ͨͯ̽ͨ́͝ͅO̡̝̞̗̩͖͖̼̹̖̫͍̙̖͓̩ͪ͂̊ͭ͑ͮͤ̀̄͌̑ͨͣͩ̿ͫ͂͟͝͞ͅU̴̮̝͍̜̰̦ͥ̓ͩ̌̎̾ͥͪ̋̾́͠Rͨ͊̉̾҉̢̫͔̗͓͖̫̫̘̖̰͟\r\nMOM";
//
// timer1
//
this.timer1.Enabled = true;
this.timer1.Interval = 50;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// label3
//
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label3.Location = new System.Drawing.Point(164, 423);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(311, 39);
this.label3.TabIndex = 3;
this.label3.Text = "COPYRITE 20011";
//
// label4
//
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label4.Location = new System.Drawing.Point(338, 223);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(175, 48);
this.label4.TabIndex = 5;
this.label4.Text = "(LEVAR BURTON\r\nCAMEO)";
//
// label5
//
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label5.Location = new System.Drawing.Point(222, 369);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(104, 55);
this.label5.TabIndex = 8;
this.label5.Text = "--->";
//
// mom2
//
this.mom2.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.mom2.Value;
this.mom2.Location = new System.Drawing.Point(372, 274);
this.mom2.Name = "mom2";
this.mom2.Size = new System.Drawing.Size(115, 150);
this.mom2.TabIndex = 6;
this.mom2.TabStop = false;
//
// pictureBox2
//
this.pictureBox2.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.pictureBox2.Value;
this.pictureBox2.Location = new System.Drawing.Point(353, 97);
this.pictureBox2.Name = "pictureBox2";
this.pictureBox2.Size = new System.Drawing.Size(122, 108);
this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox2.TabIndex = 9;
this.pictureBox2.TabStop = false;
//
// mom1
//
this.mom1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.mom1.Value;
this.mom1.Location = new System.Drawing.Point(372, 274);
this.mom1.Name = "mom1";
this.mom1.Size = new System.Drawing.Size(115, 150);
this.mom1.TabIndex = 7;
this.mom1.TabStop = false;
this.mom1.Visible = false;
//
// pictureBox4
//
this.pictureBox4.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.pictureBox4.Value;
this.pictureBox4.Location = new System.Drawing.Point(21, 89);
this.pictureBox4.Name = "pictureBox4";
this.pictureBox4.Size = new System.Drawing.Size(128, 128);
this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
this.pictureBox4.TabIndex = 16;
this.pictureBox4.TabStop = false;
//
// pictureBox3
//
this.pictureBox3.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.pictureBox3.Value;
this.pictureBox3.Location = new System.Drawing.Point(21, 89);
this.pictureBox3.Name = "pictureBox3";
this.pictureBox3.Size = new System.Drawing.Size(128, 128);
this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
this.pictureBox3.TabIndex = 17;
this.pictureBox3.TabStop = false;
//
// pictureBox1
//
this.pictureBox1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.pictureBox1.Value;
this.pictureBox1.Location = new System.Drawing.Point(155, 108);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(171, 216);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 0;
this.pictureBox1.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);
this.CloseBtn.TabIndex = 18;
this.CloseBtn.Text = "&Close";
this.CloseBtn.UseVisualStyleBackColor = true;
this.CloseBtn.Click += new System.EventHandler(this.Close_Click);
this.CloseBtn.MouseEnter += new System.EventHandler(this.Close_MouseEnter);
//
// 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);
this.btnBizBox.TabIndex = 19;
this.btnBizBox.Text = "BizBox";
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);
this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.pictureBox3);
this.Controls.Add(this.pictureBox4);
this.Controls.Add(this.pictureBox2);
this.Controls.Add(this.label5);
this.Controls.Add(this.mom1);
this.Controls.Add(this.mom2);
this.Controls.Add(this.label4);
this.Controls.Add(this.HR);
this.Controls.Add(this.label3);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.DoubleBuffered = true;
this.Icon = global::BizHawk.Client.EmuHawk.Properties.Resources.logo;
this.MaximizeBox = false;
this.MaximumSize = new System.Drawing.Size(527, 524);
this.MinimumSize = new System.Drawing.Size(527, 524);
this.Name = "AboutBox";
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "EmuHawk Interim Build";
this.Load += new System.EventHandler(this.AboutBox_Load);
((System.ComponentModel.ISupportInitialize)(this.mom2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.mom1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.Label label3;
private HorizontalLine HR;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.PictureBox mom2;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.PictureBox pictureBox2;
private System.Windows.Forms.PictureBox mom1;
private MyViewportPanel pictureBox5;
private System.Windows.Forms.PictureBox pictureBox4;
private System.Windows.Forms.PictureBox pictureBox3;
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;
}
}

View File

@ -1,231 +0,0 @@
using System;
using System.Drawing;
using System.Media;
using System.Windows.Forms;
namespace BizHawk.Client.EmuHawk
{
public partial class AboutBox : Form
{
private readonly SoundPlayer sfx;
private readonly Random r = new Random();
private int ctr;
private Point loc;
public AboutBox()
{
InitializeComponent();
loc = label1.Location;
label1.Text = "";
try
{
sfx = new SoundPlayer(Properties.Resources.nothawk);
sfx.Play();
}
catch
{
}
//panel1.Size = new System.Drawing.Size(1000, 1000);
//pictureBox5.GetType().GetMethod("SetStyle", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.InvokeMethod).Invoke(pictureBox5, new object[] { ControlStyles.SupportsTransparentBackColor | ControlStyles.UserPaint, true });
pictureBox5.BackColor = Color.Transparent;
pictureBox5.SendToBack();
pictureBox3.BringToFront();
pictureBox2.BringToFront();
pictureBox1.BringToFront();
pictureBox5.Visible = false;
tbBranch.Text = SubWCRev.GIT_BRANCH;
tbCommit.Text = SubWCRev.GIT_SHORTHASH;
}
protected override void OnClosed(EventArgs e)
{
if(sfx != null)
sfx.Dispose();
}
//int smack = 0;
private void timer1_Tick(object sender, EventArgs e)
{
ctr++;
if (ctr == 3)
label1.Text = "BIZ";
else if (ctr == 10)
label1.Text = "BIZ HAWK";
else if (ctr == 20)
{
label1.ForeColor = Color.LightGreen;
label1.Text = "BIZHAWK";
}
else if (ctr > 20)
{
if (label1.ForeColor == Color.LightGreen)
label1.ForeColor = Color.Pink;
else label1.ForeColor = Color.LightGreen;
}
if (ctr/5 % 2 ==0)
{
mom1.Visible = true;
mom2.Visible = false;
}
else
{
mom1.Visible = false;
mom2.Visible = true;
}
if (ctr > 30)
{
if(ctr/7%7<4)
label1.Location = new Point(loc.X + r.Next(3) - 1, loc.Y + r.Next(3) - 1);
else
label1.Location = new Point(loc.X + r.Next(5) - 3, loc.Y + r.Next(5) - 3);
}
pictureBox2.Location = new Point((int)(353 + 800 + -800* Math.Abs(Math.Sin(ctr / 18.0))), pictureBox2.Location.Y);
if ((ctr) % 40 == 0)
{
xbleh = -10;
bounceCounter = 0;
pictureBox5.Visible = true;
pictureBox3.Visible = false;
}
if (bounceCounter == 10)
{
bounceCounter++;
xbleh = 0;
pictureBox3.Visible = true;
}
else if (bounceCounter == 30)
{
bounceCounter = -1;
pictureBox5.Visible = false;
}
else if(bounceCounter != -1)
{
bounceCounter++;
if (xbleh == -10)
xbleh = 10;
else xbleh = -10;
}
pictureBox5.Invalidate();
pictureBox5.Update();
pictureBox4.Location = new Point(21 + xbleh, 89);
}
private int xbleh;
private int bounceCounter = -1;
public void PaintJunk(Graphics g)
{
g.FillRectangle(Brushes.Transparent, 0, 0, 1000, 1000);
using (Font font = new Font("Courier New", 20, FontStyle.Bold))
{
if (bounceCounter == -1) return;
const string str = "DEVELOPER BUILD";
float x = 0;
int timefactor = bounceCounter;
for (int i = 0; i < str.Length; i++)
{
string slice = str.Substring(i, 1);
g.PageUnit = GraphicsUnit.Pixel;
x += g.MeasureString(slice, font).Width - 1;
int offset = -i * 3 + timefactor*3;
int yofs = 0;
if (offset < 0)
{ continue; }
else
if (offset < DigitTable.Length)
yofs = DigitTable[offset];
g.DrawString(slice, font, Brushes.Black, 5 + x, 15 - yofs);
}
}
}
private readonly int[] DigitTable ={
0,3,6,9,12,
14,15,15,16,16,16,15,15,14,12,
9,6,3,0,2,4,4,5,5,5,
4,4,2,1,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,
0,0,0,0};
private void AboutBox_Load(object sender, EventArgs e)
{
#if DEBUG
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.GIT_SHORTHASH}";
#endif
if (DateTime.Now.Month == 12)
{
if (DateTime.Now.Day > 17 && DateTime.Now.Day <= 25)
{
pictureBox1.Image = Properties.Resources.alt_about_image;
}
}
}
private void Close_Click(object sender, EventArgs e)
{
Close();
}
private void Close_MouseEnter(object sender, EventArgs e)
{
Random random = new Random();
int width = random.Next(1, Width - CloseBtn.Width);
int height = random.Next(1, Height - CloseBtn.Height);
CloseBtn.Location = new Point(width, height);
CloseBtn.BringToFront();
}
private void btnBizBox_Click(object sender, EventArgs e)
{
using var bizBox = new BizBox();
bizBox.ShowDialog();
}
}
class MyViewportPanel : Control
{
public MyViewportPanel()
{
SetStyle(ControlStyles.AllPaintingInWmPaint, true);
SetStyle(ControlStyles.UserPaint, true);
SetStyle(ControlStyles.DoubleBuffer, true);
SetStyle(ControlStyles.UserMouse, true);
SetStyle(ControlStyles.SupportsTransparentBackColor, true);
}
protected override void OnPaint(PaintEventArgs e)
{
base.OnPaint(e);
AboutBox ab = FindForm() as AboutBox;
if (ab != null)
ab.PaintJunk(e.Graphics);
}
protected override CreateParams CreateParams
{
get
{
CreateParams cp = base.CreateParams;
cp.Style &= ~0x04000000; //WS_CLIPSIBLINGS
cp.Style &= ~0x02000000; //WS_CLIPCHILDREN
return cp;
}
}
}
}

View File

@ -1,123 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

View File

@ -71,14 +71,8 @@
</PropertyGroup> </PropertyGroup>
<Import Project="DotNetBuild.NuGet.targets" Condition=" '$(OS)' != 'Windows_NT' " /> <Import Project="DotNetBuild.NuGet.targets" Condition=" '$(OS)' != 'Windows_NT' " />
<ItemGroup Condition=" '$(OS)' == 'Windows_NT' "> <ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
<Reference <Reference HintPath="../packages/Newtonsoft.Json.12.0.3/lib/net45/Newtonsoft.Json.dll" Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed" Private="true" />
HintPath="../packages/Newtonsoft.Json.12.0.3/lib/net45/Newtonsoft.Json.dll" <Reference HintPath="../packages/SharpZipLib.1.1.0/lib/net45/ICSharpCode.SharpZipLib.dll" Include="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73" Private="true" />
Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
Private="true" />
<Reference
HintPath="../packages/SharpZipLib.1.1.0/lib/net45/ICSharpCode.SharpZipLib.dll"
Include="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73"
Private="true" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="GongShell"> <Reference Include="GongShell">
@ -130,12 +124,6 @@
<Compile Include="..\Version\VersionInfo.cs"> <Compile Include="..\Version\VersionInfo.cs">
<Link>VersionInfo.cs</Link> <Link>VersionInfo.cs</Link>
</Compile> </Compile>
<Compile Include="AboutBox.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="AboutBox.Designer.cs">
<DependentUpon>AboutBox.cs</DependentUpon>
</Compile>
<Compile Include="ArchiveChooser.cs"> <Compile Include="ArchiveChooser.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
@ -1463,16 +1451,9 @@
<EmbeddedResource Include="CustomControls\MsgBox.resx"> <EmbeddedResource Include="CustomControls\MsgBox.resx">
<DependentUpon>MsgBox.cs</DependentUpon> <DependentUpon>MsgBox.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="images/AboutBox/mom1.png" />
<EmbeddedResource Include="images/AboutBox/mom2.png" />
<EmbeddedResource Include="images/AboutBox/pictureBox1.png" />
<EmbeddedResource Include="images/AboutBox/pictureBox2.png" />
<EmbeddedResource Include="images/AboutBox/pictureBox3.png" />
<EmbeddedResource Include="images/AboutBox/pictureBox4.png" />
<EmbeddedResource Include="images/add.png" /> <EmbeddedResource Include="images/add.png" />
<EmbeddedResource Include="images/AddEdit.png" /> <EmbeddedResource Include="images/AddEdit.png" />
<EmbeddedResource Include="images/addWatch.ico" /> <EmbeddedResource Include="images/addWatch.ico" />
<EmbeddedResource Include="images/alt_about_image.png" />
<EmbeddedResource Include="images/arrow_black_down.png" /> <EmbeddedResource Include="images/arrow_black_down.png" />
<EmbeddedResource Include="images/atari_controller.png" /> <EmbeddedResource Include="images/atari_controller.png" />
<EmbeddedResource Include="images/AudioHS.png" /> <EmbeddedResource Include="images/AudioHS.png" />
@ -1497,8 +1478,6 @@
<EmbeddedResource Include="images/Circle.png" /> <EmbeddedResource Include="images/Circle.png" />
<EmbeddedResource Include="images/Close.png" /> <EmbeddedResource Include="images/Close.png" />
<EmbeddedResource Include="images/connect_16x16.png" /> <EmbeddedResource Include="images/connect_16x16.png" />
<EmbeddedResource Include="images/console16x16.png" />
<EmbeddedResource Include="images/console32x32.png" />
<EmbeddedResource Include="images/ControllerImages/A78Joystick.png" /> <EmbeddedResource Include="images/ControllerImages/A78Joystick.png" />
<EmbeddedResource Include="images/ControllerImages/AppleIIKeyboard.png" /> <EmbeddedResource Include="images/ControllerImages/AppleIIKeyboard.png" />
<EmbeddedResource Include="images/ControllerImages/ArcadeController.jpg" /> <EmbeddedResource Include="images/ControllerImages/ArcadeController.jpg" />
@ -1941,10 +1920,6 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="AboutBox.resx">
<DependentUpon>AboutBox.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="ArchiveChooser.resx"> <EmbeddedResource Include="ArchiveChooser.resx">
<DependentUpon>ArchiveChooser.cs</DependentUpon> <DependentUpon>ArchiveChooser.cs</DependentUpon>
<SubType>Designer</SubType> <SubType>Designer</SubType>

View File

@ -2940,16 +2940,8 @@ namespace BizHawk.Client.EmuHawk
private void AboutMenuItem_Click(object sender, EventArgs e) private void AboutMenuItem_Click(object sender, EventArgs e)
{ {
if (VersionInfo.DeveloperBuild) using var form = new BizBox();
{ form.ShowDialog();
using var form = new AboutBox();
form.ShowDialog();
}
else
{
using var form = new BizBox();
form.ShowDialog();
}
} }
#endregion #endregion

View File

@ -18,16 +18,9 @@ namespace BizHawk.Client.EmuHawk.Properties {
/// <param name="filename">Dir separator is '<c>.</c>'. Filename is relative to <c>&lt;NS>/images</c> and omits <c>.ico</c> extension.</param> /// <param name="filename">Dir separator is '<c>.</c>'. Filename is relative to <c>&lt;NS>/images</c> and omits <c>.ico</c> extension.</param>
private static Icon ReadEmbeddedIcon(string filename) => new Icon(Asm.GetManifestResourceStream($"BizHawk.Client.EmuHawk.images.{filename}.ico")); private static Icon ReadEmbeddedIcon(string filename) => new Icon(Asm.GetManifestResourceStream($"BizHawk.Client.EmuHawk.images.{filename}.ico"));
internal static readonly Lazy<Bitmap> mom1 = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("AboutBox.mom1"));
internal static readonly Lazy<Bitmap> mom2 = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("AboutBox.mom2"));
internal static readonly Lazy<Bitmap> pictureBox1 = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("AboutBox.pictureBox1"));
internal static readonly Lazy<Bitmap> pictureBox2 = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("AboutBox.pictureBox2"));
internal static readonly Lazy<Bitmap> pictureBox3 = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("AboutBox.pictureBox3"));
internal static readonly Lazy<Bitmap> pictureBox4 = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("AboutBox.pictureBox4"));
internal static readonly Bitmap add = ReadEmbeddedBitmap("add"); internal static readonly Bitmap add = ReadEmbeddedBitmap("add");
internal static readonly Bitmap AddEdit = ReadEmbeddedBitmap("AddEdit"); internal static readonly Bitmap AddEdit = ReadEmbeddedBitmap("AddEdit");
internal static readonly Bitmap addWatch = ReadEmbeddedBitmapAt("images.addWatch.ico"); internal static readonly Bitmap addWatch = ReadEmbeddedBitmapAt("images.addWatch.ico");
internal static readonly Bitmap alt_about_image = ReadEmbeddedBitmap("alt_about_image");
internal static readonly Bitmap arrow_black_down = ReadEmbeddedBitmap("arrow_black_down"); internal static readonly Bitmap arrow_black_down = ReadEmbeddedBitmap("arrow_black_down");
internal static readonly Lazy<Bitmap> atari_controller = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("atari_controller")); internal static readonly Lazy<Bitmap> atari_controller = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("atari_controller"));
internal static readonly Bitmap AudioHS = ReadEmbeddedBitmap("AudioHS"); internal static readonly Bitmap AudioHS = ReadEmbeddedBitmap("AudioHS");
@ -53,8 +46,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
internal static readonly Bitmap Circle = ReadEmbeddedBitmap("Circle"); internal static readonly Bitmap Circle = ReadEmbeddedBitmap("Circle");
internal static readonly Bitmap Close = ReadEmbeddedBitmap("Close"); internal static readonly Bitmap Close = ReadEmbeddedBitmap("Close");
internal static readonly Bitmap connect_16x16 = ReadEmbeddedBitmap("connect_16x16"); internal static readonly Bitmap connect_16x16 = ReadEmbeddedBitmap("connect_16x16");
internal static readonly Bitmap console16x16 = ReadEmbeddedBitmap("console16x16");
internal static readonly Bitmap console32x32 = ReadEmbeddedBitmap("console32x32");
internal static readonly Lazy<Bitmap> A78Joystick = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("ControllerImages.A78Joystick")); internal static readonly Lazy<Bitmap> A78Joystick = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("ControllerImages.A78Joystick"));
internal static readonly Lazy<Bitmap> AppleIIKeyboard = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("ControllerImages.AppleIIKeyboard")); internal static readonly Lazy<Bitmap> AppleIIKeyboard = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("ControllerImages.AppleIIKeyboard"));
internal static readonly Lazy<Bitmap> ArcadeController = new Lazy<Bitmap>(() => ReadEmbeddedBitmapAt("images.ControllerImages.ArcadeController.jpg")); internal static readonly Lazy<Bitmap> ArcadeController = new Lazy<Bitmap>(() => ReadEmbeddedBitmapAt("images.ControllerImages.ArcadeController.jpg"));

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 115 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 682 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 684 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 567 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB