Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-16 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set the default controller button graphics to Xbox for the input configurator.

Browse source
This commit is contained in:
Leon Styhre 2021-03-02 17:34:10 +01:00
parent ea68f33b8b
commit 7f4179f327
14 changed files with 69 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
es-core/src/guis/GuiDetectDevice.cpp
View file

@ -55,19 +55,19 @@ GuiDetectDevice::GuiDetectDevice(
// Message.
if (numDevices > 0) {
mMsg1 = std::make_shared<TextComponent>(mWindow,
"HOLD A BUTTON ON YOUR GAMEPAD OR KEYBOARD TO CONFIGURE IT.",
"HOLD A BUTTON ON YOUR GAMEPAD OR KEYBOARD TO CONFIGURE IT",
Font::get(FONT_SIZE_SMALL), 0x777777FF, ALIGN_CENTER);
}
else {
mMsg1 = std::make_shared<TextComponent>(mWindow,
"HOLD A BUTTON ON YOUR KEYBOARD TO CONFIGURE IT.",
"HOLD A BUTTON ON YOUR KEYBOARD TO CONFIGURE IT",
Font::get(FONT_SIZE_SMALL), 0x777777FF, ALIGN_CENTER);
}
mGrid.setEntry(mMsg1, Vector2i(0, 2), false, true);
const std::string msg2str = firstRun ?
"PRESS ESC TO SKIP (OR F4 TO QUIT AT ANY TIME)." : "PRESS ESC TO CANCEL.";
"PRESS ESC TO SKIP (OR F4 TO QUIT AT ANY TIME)" : "PRESS ESC TO CANCEL";
mMsg2 = std::make_shared<TextComponent>(mWindow, msg2str,
Font::get(FONT_SIZE_SMALL), 0x777777FF, ALIGN_CENTER);
mGrid.setEntry(mMsg2, Vector2i(0, 3), false, true);

8
es-core/src/guis/GuiInputConfig.cpp
View file

@ -32,10 +32,10 @@ static const InputConfigStructure GUI_INPUT_CONFIG_LIST[inputCount] =
{ "Right", false, "D-PAD RIGHT", ":/help/dpad_right.svg" },
{ "Start", true, "START", ":/help/button_start.svg" },
{ "Select", true, "SELECT", ":/help/button_select.svg" },
{ "A", false, "BUTTON A / EAST", ":/help/buttons_east.svg" },
{ "B", true, "BUTTON B / SOUTH", ":/help/buttons_south.svg" },
{ "X", true, "BUTTON X / NORTH", ":/help/buttons_north.svg" },
{ "Y", true, "BUTTON Y / WEST", ":/help/buttons_west.svg" },
{ "A", false, "BUTTON A / SOUTH", ":/help/buttons_south_XBOX.svg" },
{ "B", true, "BUTTON B / EAST", ":/help/buttons_east_XBOX.svg" },
{ "X", true, "BUTTON X / WEST", ":/help/buttons_west_XBOX.svg" },
{ "Y", true, "BUTTON Y / NORTH", ":/help/buttons_north_XBOX.svg" },
{ "LeftShoulder", true, "LEFT SHOULDER", ":/help/button_l.svg" },
{ "RightShoulder", true, "RIGHT SHOULDER", ":/help/button_r.svg" },
{ "LeftTrigger", true, "LEFT TRIGGER", ":/help/button_lt.svg" },

8
resources/help/buttons_east_PS.svg Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64" height="64" version="1.1" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
<circle id="outline_east" cx="50" cy="32" r="10" fill="none" stroke="#fff" stroke-width="2" />
<circle id="outline_south" cx="32" cy="50" r="10" fill="none" stroke="#fff" stroke-width="2" />
<circle id="outline_north" cx="32" cy="14" r="10" fill="none" stroke="#fff" stroke-width="2" />
<circle id="outline_west" cx="14" cy="32" r="10" fill="none" stroke="#fff" stroke-width="2" />
<path id="circle" d="M 50,21 A 11,11 0 0 0 39,32 11,11 0 0 0 50,43 11,11 0 0 0 61,32 11,11 0 0 0 50,21 Z m 0,3.535715 c 4.113215,0 7.464285,3.351188 7.464285,7.464285 0,4.113097 -3.351189,7.464285 -7.464285,7.464285 -4.113097,0 -7.464285,-3.351188 -7.464285,-7.464285 0,-4.113097 3.351188,-7.464285 7.464285,-7.464285 z m 0,1.571428 c -3.263857,0 -5.892857,2.629 -5.892857,5.892857 0,3.263857 2.629,5.892857 5.892857,5.892857 3.263857,0 5.892857,-2.629 5.892857,-5.892857 0,-3.263857 -2.629,-5.892857 -5.892857,-5.892857 z" style="fill:#ffffff;stroke-width:0.39285716"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

0
resources/help/buttons_east.svg → resources/help/buttons_east_SNES.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 872 B

After

Width:  |  Height:  |  Size: 872 B

8
resources/help/buttons_east_XBOX.svg Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64" height="64" version="1.1" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
<circle id="outline_east" cx="32" cy="50" r="10" style="fill:none;stroke:#ffffff;stroke-width:2" />
<circle id="outline_south" cx="32" cy="50" r="10" fill="none" stroke="#fff" stroke-width="2" />
<circle id="outline_north" cx="32" cy="14" r="10" fill="none" stroke="#fff" stroke-width="2" />
<circle id="outline_west" cx="14" cy="32" r="10" fill="none" stroke="#fff" stroke-width="2" />
<path id="button_south" d="M 50,22 A 10,10 0 0 0 40,32 10,10 0 0 0 50,42 10,10 0 0 0 60,32 10,10 0 0 0 50,22 Z m -3.507812,4.289062 h 3.15625 c 1.270833,0 2.195312,0.23698 2.773437,0.710938 0.578125,0.473958 0.867187,1.229167 0.867187,2.265625 0,0.661458 -0.15625,1.229167 -0.46875,1.703125 -0.213541,0.338542 -0.520833,0.583333 -0.921874,0.734375 0.557291,0.213542 0.963541,0.536458 1.21875,0.96875 0.260416,0.427083 0.390624,0.979167 0.390624,1.65625 0,1.052083 -0.304687,1.877604 -0.914062,2.476563 -0.604167,0.59375 -1.416667,0.895833 -2.4375,0.90625 H 46.492188 Z M 49.09375,28.40625 V 30.75 h 0.617188 c 0.307291,0 0.526041,-0.09896 0.65625,-0.296875 0.130208,-0.203125 0.195312,-0.505208 0.195312,-0.90625 0,-0.40625 -0.07552,-0.697917 -0.226562,-0.875 -0.145834,-0.177083 -0.380209,-0.265625 -0.703126,-0.265625 z m 0,4.398438 v 2.765624 h 0.710938 c 0.625,0 0.9375,-0.48177 0.9375,-1.445312 0,-0.880208 -0.322917,-1.320312 -0.96875,-1.320312 z" style="fill:#ffffff" />
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

8
resources/help/buttons_north_PS.svg Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64" height="64" version="1.1" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
<circle id="outline_east" cx="50" cy="32" r="10" fill="none" stroke="#fff" stroke-width="2" />
<circle id="outline_south" cx="32" cy="50" r="10" fill="none" stroke="#fff" stroke-width="2" />
<circle id="outline_north" cx="32" cy="14" r="10" fill="none" stroke="#fff" stroke-width="2" />
<circle id="outline_west" cx="14" cy="32" r="10" fill="none" stroke="#fff" stroke-width="2" />
<path id="button_triangle" d="M 32,2.9999998 A 11,11 0 0 0 21,14 11,11 0 0 0 32,25 11,11 0 0 0 43,14 11,11 0 0 0 32,2.9999998 Z m -0.02072,2.7500004 a 0.78579286,0.78579286 0 0 1 0.711267,0.410496 L 38.950333,17.690854 A 0.78579286,0.78579286 0 0 1 38.260515,18.851 H 25.739765 A 0.78579286,0.78579286 0 0 1 25.049947,17.690854 L 31.309733,6.1604962 a 0.78579286,0.78579286 0 0 1 0.669859,-0.410496 z M 32,8.1823362 27.061,17.279336 h 9.878393 l -4.939,-9.0969998 z" style="fill:#ffffff;stroke-width:0.39285716"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

0
resources/help/buttons_north.svg → resources/help/buttons_north_SNES.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 849 B

After

Width:  |  Height:  |  Size: 849 B

8
resources/help/buttons_north_XBOX.svg Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64" height="64" version="1.1" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
<circle id="outline_east" cx="50" cy="32" r="10" fill="none" stroke="#fff" stroke-width="2" />
<circle id="outline_south" cx="32" cy="50" r="10" fill="none" stroke="#fff" stroke-width="2" />
<circle id="outline_north" cx="14" cy="32" r="10" style="fill:none;stroke:#ffffff;stroke-width:2" />
<circle id="outline_west" cx="14" cy="32" r="10" fill="none" stroke="#fff" stroke-width="2" />
<path id="button_west" d="M 32,4 A 10,10 0 0 0 22,14 10,10 0 0 0 32,24 10,10 0 0 0 42,14 10,10 0 0 0 32,4 Z m -4.042969,4.289062 h 2.859375 l 1.195313,3.539063 c 0.385416,-1.130208 0.78125,-2.309896 1.1875,-3.539063 h 2.84375 l -2.695313,6.8125 v 4.609376 h -2.703125 v -4.53125 z" style="fill:#ffffff" />
</svg>
Side by side

After

Width:  |  Height:  |  Size: 842 B

7
resources/help/buttons_south_PS.svg Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64" height="64" version="1.1" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
<circle id="outline_east" cx="50" cy="32" r="10" fill="none" stroke="#fff" stroke-width="2" />
<circle id="outline_north" cx="32" cy="14" r="10" fill="none" stroke="#fff" stroke-width="2" />
<circle id="outline_west" cx="14" cy="32" r="10" fill="none" stroke="#fff" stroke-width="2" />
<path id="button_xing" d="M 32,39 A 11,11 0 0 0 21,50 11,11 0 0 0 32,61 11,11 0 0 0 43,50 11,11 0 0 0 32,39 Z m -5.50825,4.706429 a 0.78579286,0.78579286 0 0 1 0.563946,0.237863 l 4.944501,4.9445 4.9445,-4.9445 a 0.78579286,0.78579286 0 0 1 0.540178,-0.237863 0.78579286,0.78579286 0 0 1 0.570861,1.348914 l -4.9445,4.9445 4.9445,4.9445 a 0.78579286,0.78579286 0 1 1 -1.111039,1.111039 l -4.9445,-4.9445 -4.944501,4.9445 a 0.78579286,0.78579286 0 1 1 -1.111039,-1.111039 l 4.9445,-4.9445 -4.9445,-4.9445 a 0.78579286,0.78579286 0 0 1 0.547093,-1.348914 z" style="fill:#ffffff;stroke-width:0.39285713"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

0
resources/help/buttons_south.svg → resources/help/buttons_south_SNES.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

8
resources/help/buttons_south_XBOX.svg Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64" height="64" version="1.1" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
<circle id="outline_east" cx="50" cy="32" r="10" fill="none" stroke="#fff" stroke-width="2" />
<circle id="outline_south" cx="50" cy="32" r="10" style="fill:none;stroke:#ffffff;stroke-width:2" />
<circle id="outline_north" cx="32" cy="14" r="10" fill="none" stroke="#fff" stroke-width="2" />
<circle id="outline_west" cx="14" cy="32" r="10" fill="none" stroke="#fff" stroke-width="2" />
<path id="button_east" d="M 32,40 A 10,10 0 0 0 22,50 10,10 0 0 0 32,60 10,10 0 0 0 42,50 10,10 0 0 0 32,40 Z m -1.695312,4.265625 H 33.6875 l 2.84375,11.46875 h -2.75 L 33.148438,52.9375 H 30.84375 l -0.632812,2.796875 H 27.46875 Z m 1.695312,3.5 c -0.08333,0.401042 -0.304687,1.403646 -0.664062,3.007813 h 1.34375 z" style="fill:#ffffff" />
</svg>
Side by side

After

Width:  |  Height:  |  Size: 879 B

7
resources/help/buttons_west_PS.svg Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64" height="64" version="1.1" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
<circle id="outline_east" cx="50" cy="32" r="10" fill="none" stroke="#fff" stroke-width="2" />
<circle id="outline_south" cx="32" cy="50" r="10" fill="none" stroke="#fff" stroke-width="2" />
<circle id="outline_north" cx="32" cy="14" r="10" fill="none" stroke="#fff" stroke-width="2" />
<path id="button_square" d="M 14,21 A 11,11 0 0 0 3,32 11,11 0 0 0 14,43 11,11 0 0 0 25,32 11,11 0 0 0 14,21 Z m -5.5,4.714286 h 11 A 0.78579286,0.78579286 0 0 1 20.285714,26.5 v 11 A 0.78579286,0.78579286 0 0 1 19.5,38.285714 H 8.5 A 0.78579286,0.78579286 0 0 1 7.714286,37.5 v -11 A 0.78579286,0.78579286 0 0 1 8.5,25.714286 Z m 0.785714,1.571428 v 9.428572 h 9.428572 v -9.428572 z" style="fill:#ffffff;stroke-width:0.39285716"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 868 B

0
resources/help/buttons_west.svg → resources/help/buttons_west_SNES.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 821 B

After

Width:  |  Height:  |  Size: 821 B

8
resources/help/buttons_west_XBOX.svg Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64" height="64" version="1.1" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg">
<circle id="outline_east" cx="50" cy="32" r="10" fill="none" stroke="#fff" stroke-width="2" />
<circle id="outline_south" cx="32" cy="50" r="10" fill="none" stroke="#fff" stroke-width="2" />
<circle id="outline_north" cx="32" cy="14" r="10" fill="none" stroke="#fff" stroke-width="2" />
<circle id="outline_west" cx="32" cy="14" r="10" style="fill:none;stroke:#ffffff;stroke-width:2" />
<path id="button_north" d="M 14,22 A 10,10 0 0 0 4,32 10,10 0 0 0 14,42 10,10 0 0 0 24,32 10,10 0 0 0 14,22 Z m -3.894531,4.289062 h 2.75 l 1.171875,2.90625 1.015625,-2.90625 h 2.84375 l -2.414063,5.578126 2.609375,5.84375 h -2.820312 l -1.3125,-3.257813 -1.203125,3.257813 H 9.917969 l 2.609375,-5.929688 z" style="fill:#ffffff" />
</svg>
Side by side

After

Width:  |  Height:  |  Size: 868 B