diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj index 3895533f00..357ec74f85 100644 --- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj +++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj @@ -276,6 +276,9 @@ Cheats.cs + + Component + Form @@ -433,6 +436,10 @@ Cheats.cs Designer + + Pad.cs + Designer + HexEditor.cs Designer @@ -524,6 +531,8 @@ + + diff --git a/BizHawk.MultiClient/Properties/Resources.Designer.cs b/BizHawk.MultiClient/Properties/Resources.Designer.cs index 0086387503..bd60dd9306 100644 --- a/BizHawk.MultiClient/Properties/Resources.Designer.cs +++ b/BizHawk.MultiClient/Properties/Resources.Designer.cs @@ -74,6 +74,20 @@ namespace BizHawk.MultiClient.Properties { } } + internal static System.Drawing.Bitmap BlueDown { + get { + object obj = ResourceManager.GetObject("BlueDown", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap BlueUp { + get { + object obj = ResourceManager.GetObject("BlueUp", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap BuilderDialog_delete { get { object obj = ResourceManager.GetObject("BuilderDialog_delete", resourceCulture); diff --git a/BizHawk.MultiClient/Properties/Resources.resx b/BizHawk.MultiClient/Properties/Resources.resx index cbc1231388..f35560fc55 100644 --- a/BizHawk.MultiClient/Properties/Resources.resx +++ b/BizHawk.MultiClient/Properties/Resources.resx @@ -666,4 +666,10 @@ ..\images\ReadOnly.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\BlueDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\images\BlueUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/BizHawk.MultiClient/images/BlueDown.png b/BizHawk.MultiClient/images/BlueDown.png new file mode 100644 index 0000000000..ecb6ff0ede Binary files /dev/null and b/BizHawk.MultiClient/images/BlueDown.png differ diff --git a/BizHawk.MultiClient/images/BlueUp.png b/BizHawk.MultiClient/images/BlueUp.png new file mode 100644 index 0000000000..bd1dda2e6e Binary files /dev/null and b/BizHawk.MultiClient/images/BlueUp.png differ diff --git a/BizHawk.MultiClient/tools/Pad.cs b/BizHawk.MultiClient/tools/Pad.cs new file mode 100644 index 0000000000..28a02c2fc9 --- /dev/null +++ b/BizHawk.MultiClient/tools/Pad.cs @@ -0,0 +1,146 @@ +using System; +using System.Drawing; +using System.Windows.Forms; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Globalization; + +namespace BizHawk.MultiClient +{ + public class VirtualPad : Panel + { + public CheckBox PU; + public CheckBox PD; + public CheckBox PL; + public CheckBox PR; + public CheckBox B1; + public CheckBox B2; + public CheckBox B3; + public CheckBox B4; + + public VirtualPad() + { + SetStyle(ControlStyles.AllPaintingInWmPaint, true); + SetStyle(ControlStyles.UserPaint, true); + SetStyle(ControlStyles.DoubleBuffer, true); + this.BorderStyle = BorderStyle.Fixed3D; + this.Paint += new System.Windows.Forms.PaintEventHandler(this.VirtualPad_Paint); + this.Size = new Size(174, 164); + + Point n = new Point(this.Size); + + this.PU = new CheckBox(); + this.PU.Appearance = System.Windows.Forms.Appearance.Button; + this.PU.AutoSize = true; + this.PU.Image = global::BizHawk.MultiClient.Properties.Resources.BlueUp; + this.PU.ImageAlign = System.Drawing.ContentAlignment.BottomRight; + this.PU.Location = new System.Drawing.Point(14, 2); + this.PU.TabIndex = 1; + this.PU.UseVisualStyleBackColor = true; ; + + this.PD = new CheckBox(); + this.PD.Appearance = System.Windows.Forms.Appearance.Button; + this.PD.AutoSize = true; + this.PD.Image = global::BizHawk.MultiClient.Properties.Resources.BlueDown; + this.PD.ImageAlign = System.Drawing.ContentAlignment.BottomRight; + this.PD.Location = new System.Drawing.Point(14, 46); + this.PD.TabIndex = 4; + this.PD.UseVisualStyleBackColor = true; + + this.PR = new CheckBox(); + this.PR.Appearance = System.Windows.Forms.Appearance.Button; + this.PR.AutoSize = true; + this.PR.Image = global::BizHawk.MultiClient.Properties.Resources.Forward; + this.PR.ImageAlign = System.Drawing.ContentAlignment.BottomRight; + this.PR.Location = new System.Drawing.Point(24, 24); + this.PR.TabIndex = 3; + this.PR.UseVisualStyleBackColor = true; + + this.PL = new CheckBox(); + this.PL.Appearance = System.Windows.Forms.Appearance.Button; + this.PL.AutoSize = true; + this.PL.Image = global::BizHawk.MultiClient.Properties.Resources.Back; + this.PL.ImageAlign = System.Drawing.ContentAlignment.BottomRight; + this.PL.Location = new System.Drawing.Point(2, 24); + this.PL.TabIndex = 2; + this.PL.UseVisualStyleBackColor = true; + + this.B1 = new CheckBox(); + this.B1.Appearance = System.Windows.Forms.Appearance.Button; + this.B1.AutoSize = true; + this.B1.Location = new System.Drawing.Point(52, 24); + this.B1.TabIndex = 5; + this.B1.Text = "s"; + this.B1.TextAlign = System.Drawing.ContentAlignment.BottomCenter; + this.B1.UseVisualStyleBackColor = true; + + this.B2 = new CheckBox(); + this.B2.Appearance = System.Windows.Forms.Appearance.Button; + this.B2.AutoSize = true; + this.B2.Location = new System.Drawing.Point(74, 24); + this.B2.TabIndex = 6; + this.B2.Text = "S"; + this.B2.TextAlign = System.Drawing.ContentAlignment.BottomCenter; + this.B2.UseVisualStyleBackColor = true; + + this.B3 = new CheckBox(); + this.B3.Appearance = System.Windows.Forms.Appearance.Button; + this.B3.AutoSize = true; + this.B3.Location = new System.Drawing.Point(122, 24); + this.B3.TabIndex = 7; + this.B3.Text = "B"; + this.B3.TextAlign = System.Drawing.ContentAlignment.BottomCenter; + this.B3.UseVisualStyleBackColor = true; + + this.B4 = new CheckBox(); + this.B4.Appearance = System.Windows.Forms.Appearance.Button; + this.B4.AutoSize = true; + this.B4.Location = new System.Drawing.Point(146, 24); + this.B4.TabIndex = 8; + this.B4.Text = "A"; + this.B4.TextAlign = System.Drawing.ContentAlignment.BottomCenter; + this.B4.UseVisualStyleBackColor = true; + + this.Controls.Add(this.PU); + this.Controls.Add(this.PD); + this.Controls.Add(this.PL); + this.Controls.Add(this.PR); + this.Controls.Add(this.B1); + this.Controls.Add(this.B2); + this.Controls.Add(this.B3); + this.Controls.Add(this.B4); + } + + protected override bool ProcessCmdKey(ref Message msg, Keys keyData) + { + if (keyData == Keys.Up) + { + //TODO: move to next logical key + this.Refresh(); + } + else if (keyData == Keys.Down) + { + this.Refresh(); + } + else if (keyData == Keys.Left) + { + this.Refresh(); + } + else if (keyData == Keys.Right) + { + this.Refresh(); + } + else if (keyData == Keys.Tab) + { + this.Refresh(); + } + return true; + } + + private void VirtualPad_Paint(object sender, PaintEventArgs e) + { + + } + } +} diff --git a/BizHawk.MultiClient/tools/Pad.resx b/BizHawk.MultiClient/tools/Pad.resx new file mode 100644 index 0000000000..3276f5c015 --- /dev/null +++ b/BizHawk.MultiClient/tools/Pad.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + False + + \ No newline at end of file diff --git a/BizHawk.MultiClient/tools/TAStudio.Designer.cs b/BizHawk.MultiClient/tools/TAStudio.Designer.cs index 6ff9922f39..6ca43c67d5 100644 --- a/BizHawk.MultiClient/tools/TAStudio.Designer.cs +++ b/BizHawk.MultiClient/tools/TAStudio.Designer.cs @@ -70,12 +70,15 @@ this.insertFrameToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.Pad1 = new BizHawk.MultiClient.VirtualPad(); this.menuStrip1.SuspendLayout(); this.toolStripContainer1.TopToolStripPanel.SuspendLayout(); this.toolStripContainer1.SuspendLayout(); this.toolStrip1.SuspendLayout(); this.toolStrip2.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); + this.groupBox1.SuspendLayout(); this.SuspendLayout(); // // menuStrip1 @@ -86,7 +89,7 @@ this.settingsToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(721, 24); + this.menuStrip1.Size = new System.Drawing.Size(844, 24); this.menuStrip1.TabIndex = 0; this.menuStrip1.Text = "menuStrip1"; // @@ -261,10 +264,10 @@ // // toolStripContainer1.ContentPanel // - this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(172, 39); + this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(172, 3); this.toolStripContainer1.Location = new System.Drawing.Point(373, 38); this.toolStripContainer1.Name = "toolStripContainer1"; - this.toolStripContainer1.Size = new System.Drawing.Size(172, 89); + this.toolStripContainer1.Size = new System.Drawing.Size(172, 53); this.toolStripContainer1.TabIndex = 2; this.toolStripContainer1.Text = "toolStripContainer1"; // @@ -419,11 +422,30 @@ this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(147, 22); this.selectAllToolStripMenuItem.Text = "Select All"; // + // groupBox1 + // + this.groupBox1.Controls.Add(this.Pad1); + this.groupBox1.Location = new System.Drawing.Point(373, 108); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(445, 280); + this.groupBox1.TabIndex = 4; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Controllers"; + // + // Pad1 + // + this.Pad1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.Pad1.Location = new System.Drawing.Point(6, 19); + this.Pad1.Name = "Pad1"; + this.Pad1.Size = new System.Drawing.Size(176, 80); + this.Pad1.TabIndex = 0; + // // TAStudio // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(721, 474); + this.ClientSize = new System.Drawing.Size(844, 474); + this.Controls.Add(this.groupBox1); this.Controls.Add(this.ReadOnlyCheckBox); this.Controls.Add(this.toolStripContainer1); this.Controls.Add(this.TASView); @@ -444,6 +466,7 @@ this.toolStrip2.ResumeLayout(false); this.toolStrip2.PerformLayout(); this.contextMenuStrip1.ResumeLayout(false); + this.groupBox1.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -491,5 +514,7 @@ private System.Windows.Forms.ToolStripMenuItem insertFrameToolStripMenuItem1; private System.Windows.Forms.ToolStripSeparator toolStripSeparator5; private System.Windows.Forms.ToolStripMenuItem selectAllToolStripMenuItem; + private System.Windows.Forms.GroupBox groupBox1; + private VirtualPad Pad1; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/tools/TAStudio.cs b/BizHawk.MultiClient/tools/TAStudio.cs index c48ffe929d..e9969fc60f 100644 --- a/BizHawk.MultiClient/tools/TAStudio.cs +++ b/BizHawk.MultiClient/tools/TAStudio.cs @@ -170,5 +170,10 @@ namespace BizHawk.MultiClient if (Global.MainForm.ReadOnly) return; } + + private void Pad1_Paint(object sender, PaintEventArgs e) + { + + } } }