VirtualPad Schema - don't show display name if icon is preset, default to Name if displayName is not present (and no icon). Delete a lot of now redundant DisplayName assignments

This commit is contained in:
adelikat 2020-03-21 15:22:26 -05:00
parent 6f84582aa5
commit c1e2f6afe5
26 changed files with 7 additions and 253 deletions

View File

@ -59,9 +59,13 @@ namespace BizHawk.Client.EmuHawk
var buttonControl = new VirtualPadButton
{
Name = button.Name,
Text = button.DisplayName,
Text = button.Icon != null
? null
: string.IsNullOrWhiteSpace(button.DisplayName)
? button.Name
: button.DisplayName,
Location = UIHelper.Scale(button.Location),
Image = button.Icon,
Image = button.Icon
};
if (button.Icon != null && UIHelper.AutoScaleFactorX > 1F && UIHelper.AutoScaleFactorY > 1F)
{
@ -110,7 +114,6 @@ namespace BizHawk.Client.EmuHawk
PadBox.Controls.Add(new VirtualPadDiscManager(button.SecondaryNames)
{
Name = button.Name,
//DisplayName = button.DisplayName,
Location = UIHelper.Scale(button.Location),
Size = UIHelper.Scale(button.TargetSize),
OwnerEmulator = button.OwnerEmulator

View File

@ -55,7 +55,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(23, 15),
Type = PadSchema.PadInputType.Boolean
@ -63,7 +62,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(23, 36),
Type = PadSchema.PadInputType.Boolean
@ -71,7 +69,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(2, 24),
Type = PadSchema.PadInputType.Boolean
@ -79,7 +76,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(44, 24),
Type = PadSchema.PadInputType.Boolean
@ -156,7 +152,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(23, 15),
Type = PadSchema.PadInputType.Boolean
@ -164,7 +159,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(23, 36),
Type = PadSchema.PadInputType.Boolean
@ -172,7 +166,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(2, 24),
Type = PadSchema.PadInputType.Boolean
@ -180,7 +173,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(44, 24),
Type = PadSchema.PadInputType.Boolean
@ -263,21 +255,18 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Select",
DisplayName = "Select",
Location = new Point(10, 15),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "Reset",
DisplayName = "Reset",
Location = new Point(60, 15),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "Power",
DisplayName = "Power",
Location = new Point(108, 15),
Type = PadSchema.PadInputType.Boolean
},

View File

@ -64,7 +64,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(23, 15),
Type = PadSchema.PadInputType.Boolean
@ -72,7 +71,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(23, 36),
Type = PadSchema.PadInputType.Boolean
@ -80,7 +78,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(2, 24),
Type = PadSchema.PadInputType.Boolean
@ -88,7 +85,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(44, 24),
Type = PadSchema.PadInputType.Boolean
@ -124,7 +120,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(23, 15),
Type = PadSchema.PadInputType.Boolean
@ -132,7 +127,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(23, 36),
Type = PadSchema.PadInputType.Boolean
@ -140,7 +134,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(2, 24),
Type = PadSchema.PadInputType.Boolean
@ -148,7 +141,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(44, 24),
Type = PadSchema.PadInputType.Boolean
@ -235,35 +227,30 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Select",
DisplayName = "Select",
Location = new Point(10, 15),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "Reset",
DisplayName = "Reset",
Location = new Point(60, 15),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "Power",
DisplayName = "Power",
Location = new Point(108, 15),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "Pause",
DisplayName = "Pause",
Location = new Point(158, 15),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "BW",
DisplayName = "BW",
Location = new Point(158, 15),
Type = PadSchema.PadInputType.Boolean
}

View File

@ -35,91 +35,78 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "1",
DisplayName = "1",
Location = new Point(46, 18),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "2",
DisplayName = "2",
Location = new Point(70, 18),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "3",
DisplayName = "3",
Location = new Point(94, 18),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "4",
DisplayName = "4",
Location = new Point(118, 18),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "5",
DisplayName = "5",
Location = new Point(142, 18),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "6",
DisplayName = "6",
Location = new Point(166, 18),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "7",
DisplayName = "7",
Location = new Point(190, 18),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "8",
DisplayName = "8",
Location = new Point(214, 18),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "9",
DisplayName = "9",
Location = new Point(238, 18),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "0",
DisplayName = "0",
Location = new Point(262, 18),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "-",
DisplayName = "-",
Location = new Point(286, 18),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "=",
DisplayName = "=",
Location = new Point(307, 18),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "Delete",
DisplayName = "Delete",
Location = new Point(331, 18),
Type = PadSchema.PadInputType.Boolean
},
@ -135,7 +122,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Q",
DisplayName = "Q",
Location = new Point(52, 42),
Type = PadSchema.PadInputType.Boolean
},
@ -143,77 +129,66 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "W",
DisplayName = "W",
Location = new Point(78, 42),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "E",
DisplayName = "E",
Location = new Point(106, 42),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "R",
DisplayName = "R",
Location = new Point(130, 42),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "T",
DisplayName = "T",
Location = new Point(156, 42),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "Y",
DisplayName = "Y",
Location = new Point(180, 42),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "U",
DisplayName = "U",
Location = new Point(204, 42),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "I",
DisplayName = "I",
Location = new Point(230, 42),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "O",
DisplayName = "O",
Location = new Point(250, 42),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "P",
DisplayName = "P",
Location = new Point(276, 42),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "[",
DisplayName = "[",
Location = new Point(302, 42),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "]",
DisplayName = "]",
Location = new Point(325, 42),
Type = PadSchema.PadInputType.Boolean
},
@ -236,84 +211,72 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "A",
DisplayName = "A",
Location = new Point(66, 66),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "S",
DisplayName = "S",
Location = new Point(90, 66),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "D",
DisplayName = "D",
Location = new Point(114, 66),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "F",
DisplayName = "F",
Location = new Point(140, 66),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "G",
DisplayName = "G",
Location = new Point(164, 66),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "H",
DisplayName = "H",
Location = new Point(190, 66),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "J",
DisplayName = "J",
Location = new Point(216, 66),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "K",
DisplayName = "K",
Location = new Point(238, 66),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "L",
DisplayName = "L",
Location = new Point(262, 66),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = ";",
DisplayName = ";",
Location = new Point(286, 66),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "'",
DisplayName = "'",
Location = new Point(307, 66),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "Return",
DisplayName = "Return",
Location = new Point(328, 66),
Type = PadSchema.PadInputType.Boolean
},
@ -329,70 +292,60 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Z",
DisplayName = "Z",
Location = new Point(80, 90),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "X",
DisplayName = "X",
Location = new Point(106, 90),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "C",
DisplayName = "C",
Location = new Point(130, 90),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "V",
DisplayName = "V",
Location = new Point(154, 90),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "B",
DisplayName = "B",
Location = new Point(178, 90),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "N",
DisplayName = "N",
Location = new Point(202, 90),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "M",
DisplayName = "M",
Location = new Point(226, 90),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = ",",
DisplayName = ",",
Location = new Point(252, 90),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = ".",
DisplayName = ".",
Location = new Point(272, 90),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "/",
DisplayName = "/",
Location = new Point(292, 90),
Type = PadSchema.PadInputType.Boolean
},
@ -447,7 +400,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(289, 114),
Type = PadSchema.PadInputType.Boolean
@ -456,7 +408,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(311, 114),
Type = PadSchema.PadInputType.Boolean
@ -465,7 +416,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(333, 114),
Type = PadSchema.PadInputType.Boolean
@ -474,7 +424,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(355, 114),
Type = PadSchema.PadInputType.Boolean

View File

@ -29,7 +29,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(23, 15),
Type = PadSchema.PadInputType.Boolean
@ -37,7 +36,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(23, 36),
Type = PadSchema.PadInputType.Boolean
@ -45,7 +43,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(2, 24),
Type = PadSchema.PadInputType.Boolean
@ -53,7 +50,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(44, 24),
Type = PadSchema.PadInputType.Boolean

View File

@ -48,7 +48,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(50, 11),
Type = PadSchema.PadInputType.Boolean
@ -56,7 +55,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(50, 32),
Type = PadSchema.PadInputType.Boolean
@ -64,7 +62,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(29, 22),
Type = PadSchema.PadInputType.Boolean
@ -72,7 +69,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(71, 22),
Type = PadSchema.PadInputType.Boolean
@ -197,7 +193,6 @@ namespace BizHawk.Client.EmuHawk
Name = $"P{controller} Disc X",
AxisRange = controllerDefRanges[0],
SecondaryAxisRange = controllerDefRanges[1],
DisplayName = "",
Location = new Point(6, 14),
Type = PadSchema.PadInputType.AnalogStick
},
@ -223,7 +218,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(50, 11),
Type = PadSchema.PadInputType.Boolean
@ -231,7 +225,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(50, 32),
Type = PadSchema.PadInputType.Boolean
@ -239,7 +232,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(29, 22),
Type = PadSchema.PadInputType.Boolean
@ -247,7 +239,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(71, 22),
Type = PadSchema.PadInputType.Boolean

View File

@ -26,7 +26,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(14, 12),
Type = PadSchema.PadInputType.Boolean
@ -34,7 +33,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(14, 56),
Type = PadSchema.PadInputType.Boolean
@ -42,7 +40,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(2, 34),
Type = PadSchema.PadInputType.Boolean
@ -50,7 +47,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(24, 34),
Type = PadSchema.PadInputType.Boolean

View File

@ -34,7 +34,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Tilt X",
DisplayName = "Tilt X",
Location = new Point(10, 15),
Type = PadSchema.PadInputType.FloatSingle,
TargetSize = new Size(226, 69),
@ -44,7 +43,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Tilt Y",
DisplayName = "Tilt Y",
Location = new Point(10, 94),
Type = PadSchema.PadInputType.FloatSingle,
TargetSize = new Size(226, 69),
@ -54,7 +52,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Tilt Z",
DisplayName = "Tilt Z",
Location = new Point(10, 173),
Type = PadSchema.PadInputType.FloatSingle,
TargetSize = new Size(226, 69),
@ -64,7 +61,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Light Sensor",
DisplayName = "Light Sensor",
Location = new Point(10, 252),
Type = PadSchema.PadInputType.FloatSingle,
TargetSize = new Size(226, 69),
@ -85,7 +81,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(29, 17),
Type = PadSchema.PadInputType.Boolean
@ -93,7 +88,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(29, 61),
Type = PadSchema.PadInputType.Boolean
@ -101,7 +95,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(17, 39),
Type = PadSchema.PadInputType.Boolean
@ -109,7 +102,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(39, 39),
Type = PadSchema.PadInputType.Boolean
@ -117,14 +109,12 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "B",
DisplayName = "B",
Location = new Point(130, 39),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "A",
DisplayName = "A",
Location = new Point(154, 39),
Type = PadSchema.PadInputType.Boolean
},
@ -145,14 +135,12 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "L",
DisplayName = "L",
Location = new Point(2, 12),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "R",
DisplayName = "R",
Location = new Point(166, 12),
Type = PadSchema.PadInputType.Boolean
}
@ -172,7 +160,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Power",
DisplayName = "Power",
Location = new Point(10, 15),
Type = PadSchema.PadInputType.Boolean
}

View File

@ -41,7 +41,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(14, 12),
Type = PadSchema.PadInputType.Boolean
@ -49,7 +48,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(14, 56),
Type = PadSchema.PadInputType.Boolean
@ -57,7 +55,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(2, 34),
Type = PadSchema.PadInputType.Boolean
@ -65,7 +62,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(24, 34),
Type = PadSchema.PadInputType.Boolean
@ -73,14 +69,12 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "B",
DisplayName = "B",
Location = new Point(122, 34),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "A",
DisplayName = "A",
Location = new Point(146, 34),
Type = PadSchema.PadInputType.Boolean
},
@ -114,7 +108,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Power",
DisplayName = "Power",
Location = new Point(10, 15),
Type = PadSchema.PadInputType.Boolean
}
@ -134,7 +127,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "P1 Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(14, 12),
Type = PadSchema.PadInputType.Boolean
@ -142,7 +134,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "P1 Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(14, 56),
Type = PadSchema.PadInputType.Boolean
@ -150,7 +141,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "P1 Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(2, 34),
Type = PadSchema.PadInputType.Boolean
@ -158,7 +148,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "P1 Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(24, 34),
Type = PadSchema.PadInputType.Boolean
@ -207,7 +196,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "P1 Power",
DisplayName = "Power",
Location = new Point(10, 15),
Type = PadSchema.PadInputType.Boolean
}

View File

@ -77,7 +77,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(14, 12),
Type = PadSchema.PadInputType.Boolean
@ -85,7 +84,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(14, 56),
Type = PadSchema.PadInputType.Boolean
@ -93,7 +91,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(2, 34),
Type = PadSchema.PadInputType.Boolean
@ -101,7 +98,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(24, 34),
Type = PadSchema.PadInputType.Boolean
@ -149,7 +145,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(14, 12),
Type = PadSchema.PadInputType.Boolean
@ -157,7 +152,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(14, 56),
Type = PadSchema.PadInputType.Boolean
@ -165,7 +159,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(2, 34),
Type = PadSchema.PadInputType.Boolean
@ -173,7 +166,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(24, 34),
Type = PadSchema.PadInputType.Boolean
@ -335,14 +327,12 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Reset",
DisplayName = "Reset",
Location = new Point(10, 15),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "Power",
DisplayName = "Power",
Location = new Point(58, 15),
Type = PadSchema.PadInputType.Boolean
}
@ -361,7 +351,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(47, 10),
Type = PadSchema.PadInputType.Boolean
@ -369,7 +358,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(47, 73),
Type = PadSchema.PadInputType.Boolean
@ -377,7 +365,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(15, 43),
Type = PadSchema.PadInputType.Boolean
@ -385,7 +372,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(80, 43),
Type = PadSchema.PadInputType.Boolean

View File

@ -410,7 +410,6 @@ namespace BizHawk.Client.EmuHawk
Name = $"P{controller} Disc X",
AxisRange = controllerDefRanges[0],
SecondaryAxisRange = controllerDefRanges[1],
DisplayName = "",
Location = new Point(1, 121),
Type = PadSchema.PadInputType.AnalogStick
}

View File

@ -25,7 +25,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(14, 12),
Type = PadSchema.PadInputType.Boolean
@ -33,7 +32,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(14, 56),
Type = PadSchema.PadInputType.Boolean
@ -41,7 +39,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(2, 34),
Type = PadSchema.PadInputType.Boolean
@ -49,7 +46,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(24, 34),
Type = PadSchema.PadInputType.Boolean

View File

@ -34,7 +34,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} DPad U",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(24, 230),
Type = PadSchema.PadInputType.Boolean
@ -42,7 +41,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} DPad D",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(24, 251),
Type = PadSchema.PadInputType.Boolean
@ -50,7 +48,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} DPad L",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(3, 242),
Type = PadSchema.PadInputType.Boolean
@ -58,7 +55,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} DPad R",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(45, 242),
Type = PadSchema.PadInputType.Boolean
@ -138,7 +134,6 @@ namespace BizHawk.Client.EmuHawk
Name = $"P{controller} X Axis",
AxisRange = controllerDefRanges[0],
SecondaryAxisRange = controllerDefRanges[1],
DisplayName = "",
Location = new Point(6, 14),
Type = PadSchema.PadInputType.AnalogStick
}

View File

@ -25,7 +25,6 @@ namespace BizHawk.Client.EmuHawk.tools.VirtualPads.schema
new PadSchema.ButtonSchema
{
Name = "Lid",
DisplayName = "Lid",
Location = new Point(8, 8),
Type = PadSchema.PadInputType.Boolean
}
@ -44,7 +43,6 @@ namespace BizHawk.Client.EmuHawk.tools.VirtualPads.schema
new PadSchema.ButtonSchema
{
Name = "Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(14, 79),
Type = PadSchema.PadInputType.Boolean
@ -52,7 +50,6 @@ namespace BizHawk.Client.EmuHawk.tools.VirtualPads.schema
new PadSchema.ButtonSchema
{
Name = "Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(14, 122),
Type = PadSchema.PadInputType.Boolean
@ -60,7 +57,6 @@ namespace BizHawk.Client.EmuHawk.tools.VirtualPads.schema
new PadSchema.ButtonSchema
{
Name = "Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(2, 100),
Type = PadSchema.PadInputType.Boolean
@ -68,7 +64,6 @@ namespace BizHawk.Client.EmuHawk.tools.VirtualPads.schema
new PadSchema.ButtonSchema
{
Name = "Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(24, 100),
Type = PadSchema.PadInputType.Boolean
@ -76,28 +71,24 @@ namespace BizHawk.Client.EmuHawk.tools.VirtualPads.schema
new PadSchema.ButtonSchema
{
Name = "L",
DisplayName = "L",
Location = new Point(2, 10),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "R",
DisplayName = "R",
Location = new Point(366, 10),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "Start",
DisplayName = "Start",
Location = new Point(341, 179),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "Select",
DisplayName = "Select",
Location = new Point(341, 201),
Type = PadSchema.PadInputType.Boolean
},
@ -105,21 +96,18 @@ namespace BizHawk.Client.EmuHawk.tools.VirtualPads.schema
new PadSchema.ButtonSchema
{
Name = "Y",
DisplayName = "Y",
Location = new Point(341, 100),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "B",
DisplayName = "B",
Location = new Point(365, 113),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "X",
DisplayName = "X",
Location = new Point(341, 76),
Type = PadSchema.PadInputType.Boolean
},
@ -146,7 +134,6 @@ namespace BizHawk.Client.EmuHawk.tools.VirtualPads.schema
new PadSchema.ButtonSchema
{
Name = "Touch",
DisplayName = "Touch",
Location = new Point(72, 10),
Type = PadSchema.PadInputType.Boolean
}

View File

@ -172,14 +172,12 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Reset",
DisplayName = "Reset",
Location = new Point(10, 15),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "Power",
DisplayName = "Power",
Location = new Point(58, 15),
Type = PadSchema.PadInputType.Boolean
}
@ -194,14 +192,12 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Reset",
DisplayName = "Reset",
Location = new Point(10, 15),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "Power",
DisplayName = "Power",
Location = new Point(58, 15),
Type = PadSchema.PadInputType.Boolean
},
@ -253,7 +249,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(23, 15),
Type = PadSchema.PadInputType.Boolean
@ -261,7 +256,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(23, 36),
Type = PadSchema.PadInputType.Boolean
@ -269,7 +263,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(2, 24),
Type = PadSchema.PadInputType.Boolean
@ -277,7 +270,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(44, 24),
Type = PadSchema.PadInputType.Boolean
@ -328,7 +320,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(23, 15),
Type = PadSchema.PadInputType.Boolean
@ -336,7 +327,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(23, 36),
Type = PadSchema.PadInputType.Boolean
@ -344,7 +334,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(2, 24),
Type = PadSchema.PadInputType.Boolean
@ -352,7 +341,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(44, 24),
Type = PadSchema.PadInputType.Boolean

View File

@ -26,7 +26,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(14, 12),
Type = PadSchema.PadInputType.Boolean
@ -34,7 +33,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(14, 56),
Type = PadSchema.PadInputType.Boolean
@ -42,7 +40,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(2, 34),
Type = PadSchema.PadInputType.Boolean
@ -50,7 +47,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(24, 34),
Type = PadSchema.PadInputType.Boolean
@ -92,7 +88,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Power",
DisplayName = "Power",
Location = new Point(10, 15),
Type = PadSchema.PadInputType.Boolean
}

View File

@ -57,7 +57,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(32, 50),
Type = PadSchema.PadInputType.Boolean
@ -65,7 +64,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(32, 71),
Type = PadSchema.PadInputType.Boolean
@ -73,7 +71,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(11, 62),
Type = PadSchema.PadInputType.Boolean
@ -81,7 +78,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(53, 62),
Type = PadSchema.PadInputType.Boolean
@ -131,7 +127,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Square",
DisplayName = "",
Icon = Properties.Resources.Square,
Location = new Point(148, 62),
Type = PadSchema.PadInputType.Boolean
@ -139,7 +134,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Triangle",
DisplayName = "",
Icon = Properties.Resources.Triangle,
Location = new Point(169, 50),
Type = PadSchema.PadInputType.Boolean
@ -147,7 +141,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Circle",
DisplayName = "",
Icon = Properties.Resources.Circle,
Location = new Point(190, 62),
Type = PadSchema.PadInputType.Boolean
@ -155,7 +148,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Cross",
DisplayName = "",
Icon = Properties.Resources.Cross,
Location = new Point(169, 71),
Type = PadSchema.PadInputType.Boolean
@ -179,7 +171,6 @@ namespace BizHawk.Client.EmuHawk
Name = $"P{controller} LStick X",
AxisRange = stickRanges[0],
SecondaryAxisRange = stickRanges[1],
DisplayName = "",
Location = new Point(3, 120),
Type = PadSchema.PadInputType.AnalogStick
},
@ -188,7 +179,6 @@ namespace BizHawk.Client.EmuHawk
Name = $"P{controller} RStick X",
AxisRange = stickRanges[0],
SecondaryAxisRange = stickRanges[1],
DisplayName = "",
Location = new Point(260, 120),
Type = PadSchema.PadInputType.AnalogStick
}
@ -208,7 +198,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(37, 55),
Type = PadSchema.PadInputType.Boolean
@ -216,7 +205,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(37, 76),
Type = PadSchema.PadInputType.Boolean
@ -224,7 +212,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(16, 67),
Type = PadSchema.PadInputType.Boolean
@ -232,7 +219,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(58, 67),
Type = PadSchema.PadInputType.Boolean
@ -268,7 +254,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Square",
DisplayName = "",
Icon = Properties.Resources.Square,
Location = new Point(153, 67),
Type = PadSchema.PadInputType.Boolean
@ -276,7 +261,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Triangle",
DisplayName = "",
Icon = Properties.Resources.Triangle,
Location = new Point(174, 55),
Type = PadSchema.PadInputType.Boolean
@ -284,7 +268,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Circle",
DisplayName = "",
Icon = Properties.Resources.Circle,
Location = new Point(195, 67),
Type = PadSchema.PadInputType.Boolean
@ -292,7 +275,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Cross",
DisplayName = "",
Icon = Properties.Resources.Cross,
Location = new Point(174, 76),
Type = PadSchema.PadInputType.Boolean
@ -327,7 +309,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(36, 83),
Type = PadSchema.PadInputType.Boolean
@ -335,7 +316,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(36, 104),
Type = PadSchema.PadInputType.Boolean
@ -343,7 +323,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(15, 95),
Type = PadSchema.PadInputType.Boolean
@ -351,7 +330,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(57, 95),
Type = PadSchema.PadInputType.Boolean
@ -444,7 +422,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Reset",
DisplayName = "Reset",
Location = new Point(10, 15),
Type = PadSchema.PadInputType.Boolean
},

View File

@ -59,7 +59,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(14, 12),
Type = PadSchema.PadInputType.Boolean
@ -67,7 +66,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(14, 56),
Type = PadSchema.PadInputType.Boolean
@ -75,7 +73,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(2, 34),
Type = PadSchema.PadInputType.Boolean
@ -83,7 +80,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(24, 34),
Type = PadSchema.PadInputType.Boolean

View File

@ -52,7 +52,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(34, 17),
Type = PadSchema.PadInputType.Boolean
@ -60,7 +59,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(34, 61),
Type = PadSchema.PadInputType.Boolean
@ -68,7 +66,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(22, 39),
Type = PadSchema.PadInputType.Boolean
@ -76,7 +73,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(44, 39),
Type = PadSchema.PadInputType.Boolean

View File

@ -28,7 +28,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controllerNum} Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(14, 12),
Type = PadSchema.PadInputType.Boolean
@ -36,7 +35,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controllerNum} Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(14, 56),
Type = PadSchema.PadInputType.Boolean
@ -44,7 +42,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controllerNum} Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(2, 34),
Type = PadSchema.PadInputType.Boolean
@ -52,7 +49,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controllerNum} Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(24, 34),
Type = PadSchema.PadInputType.Boolean

View File

@ -77,7 +77,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(34, 17),
Type = PadSchema.PadInputType.Boolean
@ -85,7 +84,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(34, 61),
Type = PadSchema.PadInputType.Boolean
@ -93,7 +91,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(22, 39),
Type = PadSchema.PadInputType.Boolean
@ -101,7 +98,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(44, 39),
Type = PadSchema.PadInputType.Boolean
@ -185,7 +181,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(290, 77),
Type = PadSchema.PadInputType.Boolean
@ -193,7 +188,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(290, 121),
Type = PadSchema.PadInputType.Boolean
@ -201,7 +195,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(278, 99),
Type = PadSchema.PadInputType.Boolean
@ -209,7 +202,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(300, 99),
Type = PadSchema.PadInputType.Boolean
@ -269,7 +261,6 @@ namespace BizHawk.Client.EmuHawk
SecondaryNames = new[] { $"P{controller} Stick Vertical" },
AxisRange = axisRanges[0],
SecondaryAxisRange = axisRanges[1],
DisplayName = "",
Location = new Point(6, 74),
Type = PadSchema.PadInputType.AnalogStick
},
@ -368,7 +359,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(150, 20),
Type = PadSchema.PadInputType.Boolean
@ -376,7 +366,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(150, 43),
Type = PadSchema.PadInputType.Boolean
@ -514,7 +503,6 @@ namespace BizHawk.Client.EmuHawk
SecondaryNames = new[] { $"P{controller} Stick Vertical" },
AxisRange = axisRanges[0],
SecondaryAxisRange = axisRanges[1],
DisplayName = "",
Location = new Point(185, 13),
Type = PadSchema.PadInputType.AnalogStick
},
@ -549,7 +537,6 @@ namespace BizHawk.Client.EmuHawk
SecondaryNames = new[] { $"P{controller} Left Stick Vertical" },
AxisRange = axisRanges[3],
SecondaryAxisRange = axisRanges[4],
DisplayName = "",
Location = new Point(58, 13),
Type = PadSchema.PadInputType.AnalogStick
},
@ -570,7 +557,6 @@ namespace BizHawk.Client.EmuHawk
SecondaryNames = new[] { $"P{controller} Right Stick Vertical" },
AxisRange = axisRanges[0],
SecondaryAxisRange = axisRanges[1],
DisplayName = "",
Location = new Point(400, 13),
Type = PadSchema.PadInputType.AnalogStick
},
@ -601,14 +587,12 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Reset",
DisplayName = "Reset",
Location = new Point(10, 15),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "Power",
DisplayName = "Power",
Location = new Point(58, 15),
Type = PadSchema.PadInputType.Boolean
},

View File

@ -152,14 +152,12 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Reset",
DisplayName = "Reset",
Location = new Point(10, 15),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "Pause",
DisplayName = "Pause",
Location = new Point(58, 15),
Type = PadSchema.PadInputType.Boolean
}
@ -179,7 +177,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Reset",
DisplayName = "Reset",
Location = new Point(10, 15),
Type = PadSchema.PadInputType.Boolean
}

View File

@ -119,7 +119,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(34, 17),
Type = PadSchema.PadInputType.Boolean
@ -127,7 +126,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(34, 61),
Type = PadSchema.PadInputType.Boolean
@ -135,7 +133,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(22, 39),
Type = PadSchema.PadInputType.Boolean
@ -143,7 +140,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(44, 39),
Type = PadSchema.PadInputType.Boolean
@ -224,7 +220,6 @@ namespace BizHawk.Client.EmuHawk
Name = $"P{controller} Mouse X",
AxisRange = controllerDefRanges[0],
SecondaryAxisRange = controllerDefRanges[1],
DisplayName = "",
Location = new Point(6, 14),
Type = PadSchema.PadInputType.AnalogStick
},
@ -391,14 +386,12 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Reset",
DisplayName = "Reset",
Location = new Point(10, 15),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "Power",
DisplayName = "Power",
Location = new Point(58, 15),
Type = PadSchema.PadInputType.Boolean
}

View File

@ -26,7 +26,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "L_Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(14, 36),
Type = PadSchema.PadInputType.Boolean
@ -34,7 +33,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "L_Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(14, 80),
Type = PadSchema.PadInputType.Boolean
@ -42,7 +40,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "L_Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(2, 58),
Type = PadSchema.PadInputType.Boolean
@ -50,7 +47,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "L_Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(24, 58),
Type = PadSchema.PadInputType.Boolean
@ -58,14 +54,12 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "B",
DisplayName = "B",
Location = new Point(122, 58),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "A",
DisplayName = "A",
Location = new Point(146, 58),
Type = PadSchema.PadInputType.Boolean
},
@ -86,7 +80,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "R_Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(188, 36),
Type = PadSchema.PadInputType.Boolean
@ -94,7 +87,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "R_Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(188, 80),
Type = PadSchema.PadInputType.Boolean
@ -102,7 +94,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "R_Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(176, 58),
Type = PadSchema.PadInputType.Boolean
@ -110,7 +101,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "R_Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(198, 58),
Type = PadSchema.PadInputType.Boolean
@ -118,17 +108,15 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "L",
DisplayName = "L",
Location = new Point(24, 8),
Type = PadSchema.PadInputType.Boolean
},
new PadSchema.ButtonSchema
{
Name = "R",
DisplayName = "R",
Location = new Point(176, 8),
Type = PadSchema.PadInputType.Boolean
},
}
}
};
}

View File

@ -215,7 +215,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = "Power",
DisplayName = "Power",
Location = new Point(7, 15),
Type = PadSchema.PadInputType.Boolean
}

View File

@ -31,7 +31,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Up",
DisplayName = "",
Icon = Properties.Resources.BlueUp,
Location = new Point(23, 15),
Type = PadSchema.PadInputType.Boolean
@ -39,7 +38,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Down",
DisplayName = "",
Icon = Properties.Resources.BlueDown,
Location = new Point(23, 36),
Type = PadSchema.PadInputType.Boolean
@ -47,7 +45,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Left",
DisplayName = "",
Icon = Properties.Resources.Back,
Location = new Point(2, 24),
Type = PadSchema.PadInputType.Boolean
@ -55,7 +52,6 @@ namespace BizHawk.Client.EmuHawk
new PadSchema.ButtonSchema
{
Name = $"P{controller} Right",
DisplayName = "",
Icon = Properties.Resources.Forward,
Location = new Point(44, 24),
Type = PadSchema.PadInputType.Boolean