mirror of
https://github.com/RetroDECK/ES-DE.git
synced 2024-11-25 15:45:38 +00:00
Merge branch 'retrodeck-main' into feat/shadps4
This commit is contained in:
commit
65be0fc4dc
|
@ -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",
|
||||||
|
|
|
@ -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>
|
||||||
|
|
Loading…
Reference in a new issue