Merge branch 'retrodeck-main' into feat/shadps4

This commit is contained in:
XargonWan 2024-09-15 19:02:56 +09:00
commit 65be0fc4dc
2 changed files with 20 additions and 0 deletions

View file

@ -2063,6 +2063,17 @@ void GuiMenu::openESDEConfiguration() {
}); });
s->addRow(row); s->addRow(row);
// COLLECTION SETTINGS
row.elements.clear();
row.addElement(std::make_shared<TextComponent>("GAME COLLECTION SETTINGS",
Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary),
true);
row.addElement(mMenu.makeArrow(), false);
row.makeAcceptInputHandler([this] {
openCollectionSystemOptions();
});
s->addRow(row);
// OTHER SETTINGS // OTHER SETTINGS
row.elements.clear(); row.elements.clear();
row.addElement(std::make_shared<TextComponent>("OTHER SETTINGS", row.addElement(std::make_shared<TextComponent>("OTHER SETTINGS",

View file

@ -1566,6 +1566,15 @@
<platform>pc, pcwindows</platform> <platform>pc, pcwindows</platform>
<theme>ports</theme> <theme>ports</theme>
</system> </system>
<system>
<name>portmaster</name>
<fullname>PortMaster</fullname>
<path>%ROMPATH%/portmaster</path>
<extension>.sh</extension>
<command label="PortMaster">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
<platform>portmaster, pc, pcwindows</platform>
<theme>portmaster</theme>
</system>
<system> <system>
<name>ps2</name> <name>ps2</name>
<fullname>Sony PlayStation 2</fullname> <fullname>Sony PlayStation 2</fullname>