Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 22:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #507 from c0d3h4x0r/master

Browse source 
Fixes for issues #503 and #505.
This commit is contained in:
Jools Wills 2019-01-08 19:32:23 +00:00 committed by GitHub
parent bf02819125 8c4c024de1
commit 30a9fb20cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
es-app/src/PlatformId.cpp
View file

@ -61,7 +61,8 @@ namespace PlatformIds
"psvita", "psvita",
"psp", // playstation portable "psp", // playstation portable
"snes", // super nintendo entertainment system "snes", // super nintendo entertainment system
"pcengine", // turbografx-16/pcengine "pcengine", // (aka turbografx-16) HuCards only
"pcenginecd", // (aka turbografx-16) CD-ROMs only
"wonderswan", "wonderswan",
"wonderswancolor", "wonderswancolor",
"zxspectrum", "zxspectrum",

3
es-app/src/PlatformId.h
View file

@ -62,7 +62,8 @@ namespace PlatformIds
PLAYSTATION_VITA, PLAYSTATION_VITA,
PLAYSTATION_PORTABLE, PLAYSTATION_PORTABLE,
SUPER_NINTENDO, SUPER_NINTENDO,
TURBOGRAFX_16, // (also PC Engine) TURBOGRAFX_16, // (aka PC Engine) HuCards only
TURBOGRAFX_CD, // (aka PC Engine) CD-ROMs only
WONDERSWAN, WONDERSWAN,
WONDERSWAN_COLOR, WONDERSWAN_COLOR,
ZX_SPECTRUM, ZX_SPECTRUM,

2
es-app/src/guis/GuiMetaDataEd.cpp
View file

@ -148,7 +148,7 @@ GuiMetaDataEd::GuiMetaDataEd(Window* window, MetaDataList* md, const std::vector
if(mDeleteFunc) if(mDeleteFunc)
{ {
auto deleteFileAndSelf = [&] { mDeleteFunc(); delete this; }; auto deleteFileAndSelf = [&] { mDeleteFunc(); delete this; };
auto deleteBtnFunc = [this, deleteFileAndSelf] { mWindow->pushGui(new GuiMsgBox(mWindow, "THIS WILL DELETE A FILE!\nARE YOU SURE?", "YES", deleteFileAndSelf, "NO", nullptr)); }; auto deleteBtnFunc = [this, deleteFileAndSelf] { mWindow->pushGui(new GuiMsgBox(mWindow, "THIS WILL DELETE THE ACTUAL GAME FILE(S)!\nARE YOU SURE?", "YES", deleteFileAndSelf, "NO", nullptr)); };
buttons.push_back(std::make_shared<ButtonComponent>(mWindow, "DELETE", "delete", deleteBtnFunc)); buttons.push_back(std::make_shared<ButtonComponent>(mWindow, "DELETE", "delete", deleteBtnFunc));
} }

3
es-app/src/scrapers/GamesDBScraper.cpp
View file

@ -64,7 +64,8 @@ const std::map<PlatformId, const char*> gamesdb_platformid_map {
{ PLAYSTATION_VITA, "Sony Playstation Vita" }, { PLAYSTATION_VITA, "Sony Playstation Vita" },
{ PLAYSTATION_PORTABLE, "Sony Playstation Portable" }, { PLAYSTATION_PORTABLE, "Sony Playstation Portable" },
{ SUPER_NINTENDO, "Super Nintendo (SNES)" }, { SUPER_NINTENDO, "Super Nintendo (SNES)" },
{ TURBOGRAFX_16, "TurboGrafx 16" }, { TURBOGRAFX_16, "TurboGrafx 16" }, // HuCards only
{ TURBOGRAFX_CD, "TurboGrafx CD" }, // CD-ROMs only
{ WONDERSWAN, "WonderSwan" }, { WONDERSWAN, "WonderSwan" },
{ WONDERSWAN_COLOR, "WonderSwan Color" }, { WONDERSWAN_COLOR, "WonderSwan Color" },
{ ZX_SPECTRUM, "Sinclair ZX Spectrum" }, { ZX_SPECTRUM, "Sinclair ZX Spectrum" },