Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-29 19:55:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed the order of some buttons in the code to be more consistent.

Browse source
This commit is contained in:
Leon Styhre 2023-01-21 11:34:35 +01:00
parent ff5273c265
commit 0466232c39
3 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
es-core/src/HelpStyle.cpp
View file

@ -112,10 +112,10 @@ void HelpStyle::applyTheme(const std::shared_ptr<ThemeData>& theme, const std::s
mCustomButtons.button_x_SNES = elem->get<std::string>(PREFIX "button_x_SNES");
if (elem->has(PREFIX "button_y_SNES"))
mCustomButtons.button_y_SNES = elem->get<std::string>(PREFIX "button_y_SNES");
if (elem->has(PREFIX "button_start_SNES"))
mCustomButtons.button_start_SNES = elem->get<std::string>(PREFIX "button_start_SNES");
if (elem->has(PREFIX "button_back_SNES"))
mCustomButtons.button_back_SNES = elem->get<std::string>(PREFIX "button_back_SNES");
if (elem->has(PREFIX "button_start_SNES"))
mCustomButtons.button_start_SNES = elem->get<std::string>(PREFIX "button_start_SNES");
// PlayStation.
if (elem->has(PREFIX "button_a_PS"))
@ -126,18 +126,18 @@ void HelpStyle::applyTheme(const std::shared_ptr<ThemeData>& theme, const std::s
mCustomButtons.button_x_PS = elem->get<std::string>(PREFIX "button_x_PS");
if (elem->has(PREFIX "button_y_PS"))
mCustomButtons.button_y_PS = elem->get<std::string>(PREFIX "button_y_PS");
if (elem->has(PREFIX "button_start_PS3"))
mCustomButtons.button_start_PS3 = elem->get<std::string>(PREFIX "button_start_PS3");
if (elem->has(PREFIX "button_back_PS3"))
mCustomButtons.button_back_PS3 = elem->get<std::string>(PREFIX "button_back_PS3");
if (elem->has(PREFIX "button_start_PS4"))
mCustomButtons.button_start_PS4 = elem->get<std::string>(PREFIX "button_start_PS4");
if (elem->has(PREFIX "button_start_PS3"))
mCustomButtons.button_start_PS3 = elem->get<std::string>(PREFIX "button_start_PS3");
if (elem->has(PREFIX "button_back_PS4"))
mCustomButtons.button_back_PS4 = elem->get<std::string>(PREFIX "button_back_PS4");
if (elem->has(PREFIX "button_start_PS5"))
mCustomButtons.button_start_PS5 = elem->get<std::string>(PREFIX "button_start_PS5");
if (elem->has(PREFIX "button_start_PS4"))
mCustomButtons.button_start_PS4 = elem->get<std::string>(PREFIX "button_start_PS4");
if (elem->has(PREFIX "button_back_PS5"))
mCustomButtons.button_back_PS5 = elem->get<std::string>(PREFIX "button_back_PS5");
if (elem->has(PREFIX "button_start_PS5"))
mCustomButtons.button_start_PS5 = elem->get<std::string>(PREFIX "button_start_PS5");
// XBOX.
if (elem->has(PREFIX "button_a_XBOX"))
@ -148,12 +148,12 @@ void HelpStyle::applyTheme(const std::shared_ptr<ThemeData>& theme, const std::s
mCustomButtons.button_x_XBOX = elem->get<std::string>(PREFIX "button_x_XBOX");
if (elem->has(PREFIX "button_y_XBOX"))
mCustomButtons.button_y_XBOX = elem->get<std::string>(PREFIX "button_y_XBOX");
if (elem->has(PREFIX "button_start_XBOX"))
mCustomButtons.button_start_XBOX = elem->get<std::string>(PREFIX "button_start_XBOX");
if (elem->has(PREFIX "button_back_XBOX"))
mCustomButtons.button_back_XBOX = elem->get<std::string>(PREFIX "button_back_XBOX");
if (elem->has(PREFIX "button_start_XBOX360"))
mCustomButtons.button_start_XBOX360 = elem->get<std::string>(PREFIX "button_start_XBOX360");
if (elem->has(PREFIX "button_start_XBOX"))
mCustomButtons.button_start_XBOX = elem->get<std::string>(PREFIX "button_start_XBOX");
if (elem->has(PREFIX "button_back_XBOX360"))
mCustomButtons.button_back_XBOX360 = elem->get<std::string>(PREFIX "button_back_XBOX360");
if (elem->has(PREFIX "button_start_XBOX360"))
mCustomButtons.button_start_XBOX360 = elem->get<std::string>(PREFIX "button_start_XBOX360");
}

12
es-core/src/HelpStyle.h
View file

@ -49,30 +49,30 @@ struct HelpStyle {
std::string button_b_SNES;
std::string button_x_SNES;
std::string button_y_SNES;
std::string button_start_SNES;
std::string button_back_SNES;
std::string button_start_SNES;
// PlayStation
std::string button_a_PS;
std::string button_b_PS;
std::string button_x_PS;
std::string button_y_PS;
std::string button_start_PS3;
std::string button_back_PS3;
std::string button_start_PS4;
std::string button_start_PS3;
std::string button_back_PS4;
std::string button_start_PS5;
std::string button_start_PS4;
std::string button_back_PS5;
std::string button_start_PS5;
// XBOX
std::string button_a_XBOX;
std::string button_b_XBOX;
std::string button_x_XBOX;
std::string button_y_XBOX;
std::string button_start_XBOX;
std::string button_back_XBOX;
std::string button_start_XBOX360;
std::string button_start_XBOX;
std::string button_back_XBOX360;
std::string button_start_XBOX360;
};
CustomButtonIcons mCustomButtons;

36
es-core/src/components/HelpComponent.cpp
View file

@ -74,12 +74,12 @@ void HelpComponent::assignIcons()
sIconPathMap["y"] = mStyle.mCustomButtons.button_y_SNES.empty() ?
":/graphics/help/button_y_SNES.svg" :
mStyle.mCustomButtons.button_y_SNES;
sIconPathMap["start"] = mStyle.mCustomButtons.button_start_SNES.empty() ?
":/graphics/help/button_start_SNES.svg" :
mStyle.mCustomButtons.button_start_SNES;
sIconPathMap["back"] = mStyle.mCustomButtons.button_back_SNES.empty() ?
":/graphics/help/button_back_SNES.svg" :
mStyle.mCustomButtons.button_back_SNES;
sIconPathMap["start"] = mStyle.mCustomButtons.button_start_SNES.empty() ?
":/graphics/help/button_start_SNES.svg" :
mStyle.mCustomButtons.button_start_SNES;
}
else if (controllerType == "ps3") {
sIconPathMap["a"] = mStyle.mCustomButtons.button_a_PS.empty() ?
@ -94,12 +94,12 @@ void HelpComponent::assignIcons()
sIconPathMap["y"] = mStyle.mCustomButtons.button_y_PS.empty() ?
":/graphics/help/button_y_PS.svg" :
mStyle.mCustomButtons.button_y_PS;
sIconPathMap["start"] = mStyle.mCustomButtons.button_start_PS3.empty() ?
":/graphics/help/button_start_PS3.svg" :
mStyle.mCustomButtons.button_start_PS3;
sIconPathMap["back"] = mStyle.mCustomButtons.button_back_PS3.empty() ?
":/graphics/help/button_back_PS3.svg" :
mStyle.mCustomButtons.button_back_PS3;
sIconPathMap["start"] = mStyle.mCustomButtons.button_start_PS3.empty() ?
":/graphics/help/button_start_PS3.svg" :
mStyle.mCustomButtons.button_start_PS3;
}
else if (controllerType == "ps4") {
sIconPathMap["a"] = mStyle.mCustomButtons.button_a_PS.empty() ?
@ -114,12 +114,12 @@ void HelpComponent::assignIcons()
sIconPathMap["y"] = mStyle.mCustomButtons.button_y_PS.empty() ?
":/graphics/help/button_y_PS.svg" :
mStyle.mCustomButtons.button_y_PS;
sIconPathMap["start"] = mStyle.mCustomButtons.button_start_PS4.empty() ?
":/graphics/help/button_start_PS4.svg" :
mStyle.mCustomButtons.button_start_PS4;
sIconPathMap["back"] = mStyle.mCustomButtons.button_back_PS4.empty() ?
":/graphics/help/button_back_PS4.svg" :
mStyle.mCustomButtons.button_back_PS4;
sIconPathMap["start"] = mStyle.mCustomButtons.button_start_PS4.empty() ?
":/graphics/help/button_start_PS4.svg" :
mStyle.mCustomButtons.button_start_PS4;
}
else if (controllerType == "ps5") {
sIconPathMap["a"] = mStyle.mCustomButtons.button_a_PS.empty() ?
@ -134,12 +134,12 @@ void HelpComponent::assignIcons()
sIconPathMap["y"] = mStyle.mCustomButtons.button_y_PS.empty() ?
":/graphics/help/button_y_PS.svg" :
mStyle.mCustomButtons.button_y_PS;
sIconPathMap["start"] = mStyle.mCustomButtons.button_start_PS5.empty() ?
":/graphics/help/button_start_PS5.svg" :
mStyle.mCustomButtons.button_start_PS5;
sIconPathMap["back"] = mStyle.mCustomButtons.button_back_PS5.empty() ?
":/graphics/help/button_back_PS5.svg" :
mStyle.mCustomButtons.button_back_PS5;
sIconPathMap["start"] = mStyle.mCustomButtons.button_start_PS5.empty() ?
":/graphics/help/button_start_PS5.svg" :
mStyle.mCustomButtons.button_start_PS5;
}
else if (controllerType == "xbox360") {
@ -155,12 +155,12 @@ void HelpComponent::assignIcons()
sIconPathMap["y"] = mStyle.mCustomButtons.button_y_XBOX.empty() ?
":/graphics/help/button_y_XBOX.svg" :
mStyle.mCustomButtons.button_y_XBOX;
sIconPathMap["start"] = mStyle.mCustomButtons.button_start_XBOX360.empty() ?
":/graphics/help/button_start_XBOX360.svg" :
mStyle.mCustomButtons.button_start_XBOX360;
sIconPathMap["back"] = mStyle.mCustomButtons.button_back_XBOX360.empty() ?
":/graphics/help/button_back_XBOX360.svg" :
mStyle.mCustomButtons.button_back_XBOX360;
sIconPathMap["start"] = mStyle.mCustomButtons.button_start_XBOX360.empty() ?
":/graphics/help/button_start_XBOX360.svg" :
mStyle.mCustomButtons.button_start_XBOX360;
}
else {
// Xbox One and later.
@ -176,12 +176,12 @@ void HelpComponent::assignIcons()
sIconPathMap["y"] = mStyle.mCustomButtons.button_y_XBOX.empty() ?
":/graphics/help/button_y_XBOX.svg" :
mStyle.mCustomButtons.button_y_XBOX;
sIconPathMap["start"] = mStyle.mCustomButtons.button_start_XBOX.empty() ?
":/graphics/help/button_start_XBOX.svg" :
mStyle.mCustomButtons.button_start_XBOX;
sIconPathMap["back"] = mStyle.mCustomButtons.button_back_XBOX.empty() ?
":/graphics/help/button_back_XBOX.svg" :
mStyle.mCustomButtons.button_back_XBOX;
sIconPathMap["start"] = mStyle.mCustomButtons.button_start_XBOX.empty() ?
":/graphics/help/button_start_XBOX.svg" :
mStyle.mCustomButtons.button_start_XBOX;
}
// Invalidate cache for icons that have changed.