gaming/RetroArch
gaming/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2024-07-08 20:25:47 +00:00
Code Issues Projects Releases Wiki Activity

Try to declutter Quick Menu

Browse Source
This commit is contained in:
sonninnos 2023-05-05 18:09:09 +03:00 committed by LibretroAdmin
parent ead88eebfe
commit 99375ff787
2 changed files with 72 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.def.h
View File

@ -629,10 +629,10 @@
#define DEFAULT_QUICK_MENU_SHOW_RESTART_CONTENT true
#define DEFAULT_QUICK_MENU_SHOW_CLOSE_CONTENT true
#define DEFAULT_QUICK_MENU_SHOW_TAKE_SCREENSHOT true
#define DEFAULT_QUICK_MENU_SHOW_SAVESTATE_SUBMENU false
#define DEFAULT_QUICK_MENU_SHOW_SAVESTATE_SUBMENU true
#define DEFAULT_QUICK_MENU_SHOW_SAVE_LOAD_STATE true
#define DEFAULT_QUICK_MENU_SHOW_REPLAY true
#define DEFAULT_QUICK_MENU_SHOW_UNDO_SAVE_LOAD_STATE true
#define DEFAULT_QUICK_MENU_SHOW_REPLAY false
#define DEFAULT_QUICK_MENU_SHOW_ADD_TO_FAVORITES true
#define DEFAULT_QUICK_MENU_SHOW_START_RECORDING true
#define DEFAULT_QUICK_MENU_SHOW_START_STREAMING true

141
menu/menu_displaylist.c
View File

@ -3430,92 +3430,59 @@ static int menu_displaylist_parse_load_content_settings(
0, 0, NULL))
count++;
if (settings->bools.quick_menu_show_savestate_submenu)
if ( savestates_enabled
&& settings->bools.quick_menu_show_savestate_submenu)
{
if (savestates_enabled)
if (menu_entries_append(list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SAVESTATE_LIST),
msg_hash_to_str(MENU_ENUM_LABEL_SAVESTATE_LIST),
MENU_ENUM_LABEL_SAVESTATE_LIST,
MENU_SETTING_ACTION, 0, 0, NULL))
count++;
if (menu_entries_append(list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SAVESTATE_LIST),
msg_hash_to_str(MENU_ENUM_LABEL_SAVESTATE_LIST),
MENU_ENUM_LABEL_SAVESTATE_LIST,
MENU_SETTING_ACTION, 0, 0, NULL))
count++;
}
else
else if (savestates_enabled)
{
if (savestates_enabled)
if (settings->bools.quick_menu_show_save_load_state)
{
if (settings->bools.quick_menu_show_save_load_state)
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_STATE_SLOT, PARSE_ONLY_INT, true) == 0)
count++;
if (menu_entries_append(list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SAVE_STATE),
msg_hash_to_str(MENU_ENUM_LABEL_SAVE_STATE),
MENU_ENUM_LABEL_SAVE_STATE,
MENU_SETTING_ACTION_SAVESTATE, 0, 0, NULL))
count++;
if (menu_entries_append(list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LOAD_STATE),
msg_hash_to_str(MENU_ENUM_LABEL_LOAD_STATE),
MENU_ENUM_LABEL_LOAD_STATE,
MENU_SETTING_ACTION_LOADSTATE, 0, 0, NULL))
count++;
if (settings->bools.quick_menu_show_undo_save_load_state)
{
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_STATE_SLOT, PARSE_ONLY_INT, true) == 0)
count++;
if (menu_entries_append(list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SAVE_STATE),
msg_hash_to_str(MENU_ENUM_LABEL_SAVE_STATE),
MENU_ENUM_LABEL_SAVE_STATE,
MENU_SETTING_ACTION_SAVESTATE, 0, 0, NULL))
count++;
if (menu_entries_append(list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LOAD_STATE),
msg_hash_to_str(MENU_ENUM_LABEL_LOAD_STATE),
MENU_ENUM_LABEL_LOAD_STATE,
MENU_SETTING_ACTION_LOADSTATE, 0, 0, NULL))
count++;
if (settings->bools.quick_menu_show_undo_save_load_state)
{
#ifdef HAVE_CHEEVOS
if (!rcheevos_hardcore_active())
if (!rcheevos_hardcore_active())
#endif
{
if (menu_entries_append(list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_UNDO_LOAD_STATE),
msg_hash_to_str(MENU_ENUM_LABEL_UNDO_LOAD_STATE),
MENU_ENUM_LABEL_UNDO_LOAD_STATE,
MENU_SETTING_ACTION_LOADSTATE, 0, 0, NULL))
count++;
}
{
if (menu_entries_append(list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_UNDO_SAVE_STATE),
msg_hash_to_str(MENU_ENUM_LABEL_UNDO_SAVE_STATE),
MENU_ENUM_LABEL_UNDO_SAVE_STATE,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_UNDO_LOAD_STATE),
msg_hash_to_str(MENU_ENUM_LABEL_UNDO_LOAD_STATE),
MENU_ENUM_LABEL_UNDO_LOAD_STATE,
MENU_SETTING_ACTION_LOADSTATE, 0, 0, NULL))
count++;
}
}
#ifdef HAVE_BSV_MOVIE
if (settings->bools.quick_menu_show_replay)
{
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_REPLAY_SLOT, PARSE_ONLY_INT, true) == 0)
count++;
if (menu_entries_append(list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RECORD_REPLAY),
msg_hash_to_str(MENU_ENUM_LABEL_RECORD_REPLAY),
MENU_ENUM_LABEL_RECORD_REPLAY,
MENU_SETTING_ACTION_RECORDREPLAY, 0, 0, NULL))
count++;
if (menu_entries_append(list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAY_REPLAY),
msg_hash_to_str(MENU_ENUM_LABEL_PLAY_REPLAY),
MENU_ENUM_LABEL_PLAY_REPLAY,
MENU_SETTING_ACTION_PLAYREPLAY, 0, 0, NULL))
count++;
if (menu_entries_append(list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_HALT_REPLAY),
msg_hash_to_str(MENU_ENUM_LABEL_HALT_REPLAY),
MENU_ENUM_LABEL_HALT_REPLAY,
MENU_SETTING_ACTION_HALTREPLAY, 0, 0, NULL))
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_UNDO_SAVE_STATE),
msg_hash_to_str(MENU_ENUM_LABEL_UNDO_SAVE_STATE),
MENU_ENUM_LABEL_UNDO_SAVE_STATE,
MENU_SETTING_ACTION_LOADSTATE, 0, 0, NULL))
count++;
}
#endif
}
}
@ -3613,6 +3580,38 @@ static int menu_displaylist_parse_load_content_settings(
}
}
#ifdef HAVE_BSV_MOVIE
if ( savestates_enabled
&& !settings->bools.quick_menu_show_savestate_submenu
&& settings->bools.quick_menu_show_replay)
{
if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
MENU_ENUM_LABEL_REPLAY_SLOT, PARSE_ONLY_INT, true) == 0)
count++;
if (menu_entries_append(list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RECORD_REPLAY),
msg_hash_to_str(MENU_ENUM_LABEL_RECORD_REPLAY),
MENU_ENUM_LABEL_RECORD_REPLAY,
MENU_SETTING_ACTION_RECORDREPLAY, 0, 0, NULL))
count++;
if (menu_entries_append(list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAY_REPLAY),
msg_hash_to_str(MENU_ENUM_LABEL_PLAY_REPLAY),
MENU_ENUM_LABEL_PLAY_REPLAY,
MENU_SETTING_ACTION_PLAYREPLAY, 0, 0, NULL))
count++;
if (menu_entries_append(list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_HALT_REPLAY),
msg_hash_to_str(MENU_ENUM_LABEL_HALT_REPLAY),
MENU_ENUM_LABEL_HALT_REPLAY,
MENU_SETTING_ACTION_HALTREPLAY, 0, 0, NULL))
count++;
}
#endif
if (
settings->bools.quick_menu_show_add_to_favorites
&& settings->bools.menu_content_show_favorites