diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 34e9ebf128..a507341f44 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -883,113 +883,18 @@
Component
-
- Component
-
-
- Component
-
-
- Component
-
-
+
+
UserControl
-
- VirtualPadA78.cs
+
+ VirtualPadControl.cs
-
- UserControl
-
-
- VirtualPadA78Control.cs
-
-
- Component
-
-
- UserControl
-
-
- VirtualPadC64Keyboard.cs
-
-
- UserControl
-
-
- VirtualPadColeco.cs
-
-
+
Form
-
- VirtualPadForm.cs
-
-
- Component
-
-
- Component
-
-
- Component
-
-
- Component
-
-
- UserControl
-
-
- VirtualPadGen6Button.cs
-
-
- UserControl
-
-
- VirtualPadN64.cs
-
-
- Component
-
-
- Component
-
-
- Component
-
-
- Component
-
-
- UserControl
-
-
- VirtualPadSaturn.cs
-
-
- UserControl
-
-
- VirtualPadSaturnControl.cs
-
-
- Component
-
-
- Component
-
-
- Component
-
-
- Component
-
-
- UserControl
-
-
- VirtualPadWonderSawn.cs
+
+ VirtualpadTool.cs
Form
@@ -1308,38 +1213,11 @@
TI83KeyPad.cs
-
- VirtualPad.cs
+
+ VirtualPadControl.cs
-
- VirtualPadA78.cs
-
-
- VirtualPadA78Control.cs
-
-
- VirtualPadC64Keyboard.cs
-
-
- VirtualPadColeco.cs
-
-
- VirtualPadForm.cs
-
-
- VirtualPadGen6Button.cs
-
-
- VirtualPadN64.cs
-
-
- VirtualPadSaturn.cs
-
-
- VirtualPadSaturnControl.cs
-
-
- VirtualPadWonderSawn.cs
+
+ VirtualpadTool.cs
RamPoke.cs
diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index 8211558416..bb522e9982 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -1042,7 +1042,7 @@ namespace BizHawk.Client.EmuHawk
private void VirtualPadMenuItem_Click(object sender, EventArgs e)
{
- GlobalWin.Tools.Load();
+ GlobalWin.Tools.Load();
}
private void CheatsMenuItem_Click(object sender, EventArgs e)
diff --git a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
index e6d5256553..4dc5631984 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
@@ -350,7 +350,7 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Tools.Load();
break;
case "Virtual Pad":
- GlobalWin.Tools.Load();
+ GlobalWin.Tools.Load();
break;
// Ram Search
diff --git a/BizHawk.Client.EmuHawk/MainForm.Movie.cs b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
index 0e57aac2da..6960617edb 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Movie.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
@@ -106,7 +106,7 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Tools.Restart();
}
- GlobalWin.Tools.Restart();
+ GlobalWin.Tools.Restart();
GlobalWin.DisplayManager.NeedsToPaint = true;
}
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index f2cf3aa7fe..b1c651ab30 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -353,7 +353,7 @@ namespace BizHawk.Client.EmuHawk
if (Global.Config.AutoloadVirtualPad)
{
- GlobalWin.Tools.Load();
+ GlobalWin.Tools.Load();
}
if (Global.Config.AutoLoadLuaConsole)
@@ -579,7 +579,7 @@ namespace BizHawk.Client.EmuHawk
Global.StickyXORAdapter.ClearStickies();
Global.AutofireStickyXORAdapter.ClearStickies();
- if (GlobalWin.Tools.Has())
+ if (GlobalWin.Tools.Has())
{
GlobalWin.Tools.VirtualPad.ClearVirtualPadHolds();
}
@@ -608,7 +608,7 @@ namespace BizHawk.Client.EmuHawk
if (ActiveForm is HotkeyConfig ||
ActiveForm is ControllerConfig ||
ActiveForm is TAStudio ||
- ActiveForm is VirtualPadForm)
+ ActiveForm is VirtualpadTool)
{
return true;
}
diff --git a/BizHawk.Client.EmuHawk/tools/ToolBox.cs b/BizHawk.Client.EmuHawk/tools/ToolBox.cs
index 7e1444a211..1e65ed0e79 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolBox.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolBox.cs
@@ -182,7 +182,7 @@ namespace BizHawk.Client.EmuHawk
private void VirtualpadToolbarItem_Click(object sender, EventArgs e)
{
- GlobalWin.Tools.Load();
+ GlobalWin.Tools.Load();
}
private void SNESGameGenieToolbarItem_Click(object sender, EventArgs e)
diff --git a/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
index b9b939fe63..ffdbfe738b 100644
--- a/BizHawk.Client.EmuHawk/tools/ToolManager.cs
+++ b/BizHawk.Client.EmuHawk/tools/ToolManager.cs
@@ -347,11 +347,11 @@ namespace BizHawk.Client.EmuHawk
}
}
- public VirtualPadForm VirtualPad
+ public VirtualpadTool VirtualPad
{
get
{
- var tool = _tools.FirstOrDefault(x => x is VirtualPadForm);
+ var tool = _tools.FirstOrDefault(x => x is VirtualpadTool);
if (tool != null)
{
if (tool.IsDisposed)
@@ -360,11 +360,11 @@ namespace BizHawk.Client.EmuHawk
}
else
{
- return tool as VirtualPadForm;
+ return tool as VirtualpadTool;
}
}
- var newTool = new VirtualPadForm();
+ var newTool = new VirtualpadTool();
_tools.Add(newTool);
return newTool;
}
diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/IVirtualPad.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/IVirtualPad.cs
index 58974dd226..34df3ba60a 100644
--- a/BizHawk.Client.EmuHawk/tools/VirtualPads/IVirtualPad.cs
+++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/IVirtualPad.cs
@@ -1,10 +1,11 @@
-namespace BizHawk.Client.EmuHawk
+using BizHawk.Emulation.Common;
+
+namespace BizHawk.Client.EmuHawk
{
public interface IVirtualPad
{
- string Controller { get; set; }
- string GetMnemonic();
+ IController Get();
+ void Set(IController controller);
void Clear();
- void SetButtons(string buttons);
}
}