libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-23 16:09:47 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Ability to hide 'Input Settings'

Browse Source
This commit is contained in:
twinaphex 2019-08-21 00:27:40 +02:00
parent 7bce5783aa
commit 039daf3374
27 changed files with 217 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.def.h
View File

@ -335,6 +335,8 @@
#define DEFAULT_OZONE_TRUNCATE_PLAYLIST_NAME true
#endif
#define DEFAULT_SETTINGS_SHOW_INPUT true
#define DEFAULT_QUICK_MENU_SHOW_RESUME_CONTENT true
#define DEFAULT_QUICK_MENU_SHOW_RESTART_CONTENT true

1
configuration.c
View File

@ -1453,6 +1453,7 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
SETTING_BOOL("menu_core_enable", &settings->bools.menu_core_enable, true, true, false);
SETTING_BOOL("menu_show_sublabels", &settings->bools.menu_show_sublabels, true, menu_show_sublabels, false);
SETTING_BOOL("menu_dynamic_wallpaper_enable", &settings->bools.menu_dynamic_wallpaper_enable, true, false, false);
SETTING_BOOL("settings_show_input", &settings->bools.settings_show_input, true, DEFAULT_SETTINGS_SHOW_INPUT, false);
SETTING_BOOL("quick_menu_show_resume_content", &settings->bools.quick_menu_show_resume_content, true, DEFAULT_QUICK_MENU_SHOW_RESUME_CONTENT, false);
SETTING_BOOL("quick_menu_show_restart_content", &settings->bools.quick_menu_show_restart_content, true, DEFAULT_QUICK_MENU_SHOW_RESTART_CONTENT, false);
SETTING_BOOL("quick_menu_show_close_content", &settings->bools.quick_menu_show_close_content, true, DEFAULT_QUICK_MENU_SHOW_CLOSE_CONTENT, false);

1
configuration.h
View File

@ -203,6 +203,7 @@ typedef struct settings
bool menu_use_preferred_system_color_theme;
bool menu_preferred_system_color_theme_set;
bool menu_unified_controls;
bool settings_show_input;
bool quick_menu_show_resume_content;
bool quick_menu_show_restart_content;
bool quick_menu_show_close_content;

8
intl/msg_hash_ar.h
View File

@ -3854,3 +3854,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_RESUME_CONTENT,
"Show/hide the 'Resume Content' option."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_INPUT,
"Show Input"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_SETTINGS_SHOW_INPUT,
"Show or hide 'Input Settings' on the Settings screen."
)

8
intl/msg_hash_chs.h
View File

@ -4872,3 +4872,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_RESUME_CONTENT,
"Show/hide the 'Resume Content' option."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_INPUT,
"Show Input"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_SETTINGS_SHOW_INPUT,
"Show or hide 'Input Settings' on the Settings screen."
)

8
intl/msg_hash_cht.h
View File

@ -3630,3 +3630,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_RESUME_CONTENT,
"Show/hide the 'Resume Content' option."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_INPUT,
"Show Input"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_SETTINGS_SHOW_INPUT,
"Show or hide 'Input Settings' on the Settings screen."
)

8
intl/msg_hash_de.h
View File

@ -3759,3 +3759,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_RESUME_CONTENT,
"Show/hide the 'Resume Content' option."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_INPUT,
"Show Input"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_SETTINGS_SHOW_INPUT,
"Show or hide 'Input Settings' on the Settings screen."
)

8
intl/msg_hash_el.h
View File

@ -7836,3 +7836,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_RESUME_CONTENT,
"Show/hide the 'Resume Content' option."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_INPUT,
"Show Input"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_SETTINGS_SHOW_INPUT,
"Show or hide 'Input Settings' on the Settings screen."
)

8
intl/msg_hash_eo.h
View File

@ -3518,3 +3518,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_RESUME_CONTENT,
"Show/hide the 'Resume Content' option."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_INPUT,
"Show Input"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_SETTINGS_SHOW_INPUT,
"Show or hide 'Input Settings' on the Settings screen."
)

8
intl/msg_hash_es.h
View File

@ -7988,3 +7988,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_RESUME_CONTENT,
"Show/hide the 'Resume Content' option."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_INPUT,
"Show Input"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_SETTINGS_SHOW_INPUT,
"Show or hide 'Input Settings' on the Settings screen."
)

8
intl/msg_hash_fr.h
View File

@ -8776,3 +8776,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_RESUME_CONTENT,
"Show/hide the 'Resume Content' option."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_INPUT,
"Show Input"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_SETTINGS_SHOW_INPUT,
"Show or hide 'Input Settings' on the Settings screen."
)

8
intl/msg_hash_it.h
View File

@ -3739,3 +3739,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_RESUME_CONTENT,
"Show/hide the 'Resume Content' option."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_INPUT,
"Show Input"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_SETTINGS_SHOW_INPUT,
"Show or hide 'Input Settings' on the Settings screen."
)

8
intl/msg_hash_ja.h
View File

@ -9151,3 +9151,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_RESUME_CONTENT,
"Show/hide the 'Resume Content' option."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_INPUT,
"Show Input"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_SETTINGS_SHOW_INPUT,
"Show or hide 'Input Settings' on the Settings screen."
)

8
intl/msg_hash_ko.h
View File

@ -8983,3 +8983,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_RESUME_CONTENT,
"Show/hide the 'Resume Content' option."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_INPUT,
"Show Input"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_SETTINGS_SHOW_INPUT,
"Show or hide 'Input Settings' on the Settings screen."
)

2
intl/msg_hash_lbl.h
View File

@ -1987,3 +1987,5 @@ MSG_HASH(MENU_ENUM_LABEL_QUICK_MENU_SHOW_RESTART_CONTENT,
"quick_menu_show_restart_content")
MSG_HASH(MENU_ENUM_LABEL_QUICK_MENU_SHOW_CLOSE_CONTENT,
"quick_menu_show_close_content")
MSG_HASH(MENU_ENUM_LABEL_SETTINGS_SHOW_INPUT,
"settings_show_input")

8
intl/msg_hash_nl.h
View File

@ -3512,3 +3512,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_RESUME_CONTENT,
"Show/hide the 'Resume Content' option."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_INPUT,
"Show Input"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_SETTINGS_SHOW_INPUT,
"Show or hide 'Input Settings' on the Settings screen."
)

8
intl/msg_hash_pl.h
View File

@ -4303,3 +4303,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_RESUME_CONTENT,
"Show/hide the 'Resume Content' option."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_INPUT,
"Show Input"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_SETTINGS_SHOW_INPUT,
"Show or hide 'Input Settings' on the Settings screen."
)

8
intl/msg_hash_pt_br.h
View File

@ -9063,3 +9063,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_RESUME_CONTENT,
"Show/hide the 'Resume Content' option."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_INPUT,
"Show Input"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_SETTINGS_SHOW_INPUT,
"Show or hide 'Input Settings' on the Settings screen."
)

8
intl/msg_hash_pt_pt.h
View File

@ -3584,3 +3584,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_RESUME_CONTENT,
"Show/hide the 'Resume Content' option."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_INPUT,
"Show Input"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_SETTINGS_SHOW_INPUT,
"Show or hide 'Input Settings' on the Settings screen."
)

8
intl/msg_hash_ru.h
View File

@ -3782,3 +3782,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_RESUME_CONTENT,
"Show/hide the 'Resume Content' option."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_INPUT,
"Show Input"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_SETTINGS_SHOW_INPUT,
"Show or hide 'Input Settings' on the Settings screen."
)

8
intl/msg_hash_tr.h
View File

@ -8788,3 +8788,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_RESUME_CONTENT,
"Show/hide the 'Resume Content' option."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_INPUT,
"Show Input"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_SETTINGS_SHOW_INPUT,
"Show or hide 'Input Settings' on the Settings screen."
)

8
intl/msg_hash_us.h
View File

@ -9119,3 +9119,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_SETTINGS_VIEWS_SETTINGS,
"Show or hide elements on the Settings screen."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_INPUT,
"Show Input"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_SETTINGS_SHOW_INPUT,
"Show or hide 'Input Settings' on the Settings screen."
)

8
intl/msg_hash_vn.h
View File

@ -3674,3 +3674,11 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_RESUME_CONTENT,
"Show/hide the 'Resume Content' option."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_INPUT,
"Show Input"
)
MSG_HASH(
MENU_ENUM_SUBLABEL_SETTINGS_SHOW_INPUT,
"Show or hide 'Input Settings' on the Settings screen."
)

4
menu/cbs/menu_cbs_sublabel.c
View File

@ -470,6 +470,7 @@ default_sublabel_macro(action_bind_sublabel_menu_framebuffer_opacity,
default_sublabel_macro(action_bind_sublabel_menu_horizontal_animation, MENU_ENUM_SUBLABEL_MENU_HORIZONTAL_ANIMATION)
default_sublabel_macro(action_bind_sublabel_menu_ribbon_enable, MENU_ENUM_SUBLABEL_XMB_RIBBON_ENABLE)
default_sublabel_macro(action_bind_sublabel_menu_font, MENU_ENUM_SUBLABEL_XMB_FONT)
default_sublabel_macro(action_bind_sublabel_settings_show_input, MENU_ENUM_SUBLABEL_SETTINGS_SHOW_INPUT)
default_sublabel_macro(action_bind_sublabel_quick_menu_show_take_screenshot, MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_TAKE_SCREENSHOT)
default_sublabel_macro(action_bind_sublabel_quick_menu_show_resume_content, MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_RESUME_CONTENT)
default_sublabel_macro(action_bind_sublabel_quick_menu_show_restart_content, MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_RESTART_CONTENT)
@ -1384,6 +1385,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_GOTO_FAVORITES:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_goto_favorites);
break;
case MENU_ENUM_LABEL_SETTINGS_SHOW_INPUT:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_settings_show_input);
break;
case MENU_ENUM_LABEL_QUICK_MENU_SHOW_RESUME_CONTENT:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_quick_menu_show_resume_content);
break;

63
menu/menu_displaylist.c
View File

@ -4779,34 +4779,36 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct
break;
case DISPLAYLIST_SETTINGS_ALL:
{
menu_displaylist_build_info_t build_list[] = {
{MENU_ENUM_LABEL_DRIVER_SETTINGS, PARSE_ACTION},
{MENU_ENUM_LABEL_VIDEO_SETTINGS, PARSE_ACTION},
{MENU_ENUM_LABEL_AUDIO_SETTINGS, PARSE_ACTION},
{MENU_ENUM_LABEL_INPUT_SETTINGS, PARSE_ACTION},
{MENU_ENUM_LABEL_LATENCY_SETTINGS,PARSE_ACTION},
{MENU_ENUM_LABEL_CORE_SETTINGS, PARSE_ACTION},
{MENU_ENUM_LABEL_CONFIGURATION_SETTINGS, PARSE_ACTION},
{MENU_ENUM_LABEL_SAVING_SETTINGS, PARSE_ACTION},
{MENU_ENUM_LABEL_LOGGING_SETTINGS,PARSE_ACTION},
{MENU_ENUM_LABEL_FRAME_THROTTLE_SETTINGS, PARSE_ACTION},
{MENU_ENUM_LABEL_RECORDING_SETTINGS,PARSE_ACTION},
{MENU_ENUM_LABEL_ONSCREEN_DISPLAY_SETTINGS,PARSE_ACTION},
{MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS, PARSE_ACTION},
{MENU_ENUM_LABEL_POWER_MANAGEMENT_SETTINGS,PARSE_ACTION},
{MENU_ENUM_LABEL_RETRO_ACHIEVEMENTS_SETTINGS,PARSE_ACTION},
{MENU_ENUM_LABEL_WIFI_SETTINGS,PARSE_ACTION},
{MENU_ENUM_LABEL_NETWORK_SETTINGS,PARSE_ACTION},
{MENU_ENUM_LABEL_NETPLAY_LAN_SCAN_SETTINGS,PARSE_ACTION},
{MENU_ENUM_LABEL_LAKKA_SERVICES,PARSE_ACTION},
{MENU_ENUM_LABEL_PLAYLIST_SETTINGS,PARSE_ACTION},
{MENU_ENUM_LABEL_USER_SETTINGS,PARSE_ACTION},
{MENU_ENUM_LABEL_DIRECTORY_SETTINGS,PARSE_ACTION},
settings_t *settings = config_get_ptr();
menu_displaylist_build_info_selective_t build_list[] = {
{MENU_ENUM_LABEL_DRIVER_SETTINGS, PARSE_ACTION, true},
{MENU_ENUM_LABEL_VIDEO_SETTINGS, PARSE_ACTION, true},
{MENU_ENUM_LABEL_AUDIO_SETTINGS, PARSE_ACTION, true},
{MENU_ENUM_LABEL_INPUT_SETTINGS, PARSE_ACTION, settings->bools.settings_show_input},
{MENU_ENUM_LABEL_LATENCY_SETTINGS,PARSE_ACTION, true},
{MENU_ENUM_LABEL_CORE_SETTINGS, PARSE_ACTION, true},
{MENU_ENUM_LABEL_CONFIGURATION_SETTINGS, PARSE_ACTION, true},
{MENU_ENUM_LABEL_SAVING_SETTINGS, PARSE_ACTION, true},
{MENU_ENUM_LABEL_LOGGING_SETTINGS,PARSE_ACTION, true},
{MENU_ENUM_LABEL_FRAME_THROTTLE_SETTINGS, PARSE_ACTION, true},
{MENU_ENUM_LABEL_RECORDING_SETTINGS,PARSE_ACTION, true},
{MENU_ENUM_LABEL_ONSCREEN_DISPLAY_SETTINGS,PARSE_ACTION, true},
{MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS, PARSE_ACTION, true},
{MENU_ENUM_LABEL_POWER_MANAGEMENT_SETTINGS,PARSE_ACTION, true},
{MENU_ENUM_LABEL_RETRO_ACHIEVEMENTS_SETTINGS,PARSE_ACTION, true},
{MENU_ENUM_LABEL_WIFI_SETTINGS,PARSE_ACTION, true},
{MENU_ENUM_LABEL_NETWORK_SETTINGS,PARSE_ACTION, true},
{MENU_ENUM_LABEL_NETPLAY_LAN_SCAN_SETTINGS,PARSE_ACTION, true},
{MENU_ENUM_LABEL_LAKKA_SERVICES,PARSE_ACTION, true},
{MENU_ENUM_LABEL_PLAYLIST_SETTINGS,PARSE_ACTION, true},
{MENU_ENUM_LABEL_USER_SETTINGS,PARSE_ACTION, true},
{MENU_ENUM_LABEL_DIRECTORY_SETTINGS,PARSE_ACTION, true},
};
for (i = 0; i < ARRAY_SIZE(build_list); i++)
{
if (menu_displaylist_parse_settings_enum(list,
if (build_list[i].checked &&
menu_displaylist_parse_settings_enum(list,
build_list[i].enum_idx, build_list[i].parse_type,
false) == 0)
count++;
@ -4902,6 +4904,19 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct
}
break;
case DISPLAYLIST_SETTINGS_VIEWS_SETTINGS_LIST:
{
menu_displaylist_build_info_t build_list[] = {
{MENU_ENUM_LABEL_SETTINGS_SHOW_INPUT, PARSE_ONLY_BOOL},
};
for (i = 0; i < ARRAY_SIZE(build_list); i++)
{
if (menu_displaylist_parse_settings_enum(list,
build_list[i].enum_idx, build_list[i].parse_type,
false) == 0)
count++;
}
}
break;
case DISPLAYLIST_QUICK_MENU_VIEWS_SETTINGS_LIST:
{

15
menu/menu_setting.c
View File

@ -12961,6 +12961,21 @@ static bool setting_append_list(
SD_FLAG_NONE);
#endif
CONFIG_BOOL(
list, list_info,
&settings->bools.settings_show_input,
MENU_ENUM_LABEL_SETTINGS_SHOW_INPUT,
MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_INPUT,
DEFAULT_SETTINGS_SHOW_INPUT,
MENU_ENUM_LABEL_VALUE_OFF,
MENU_ENUM_LABEL_VALUE_ON,
&group_info,
&subgroup_info,
parent_group,
general_write_handler,
general_read_handler,
SD_FLAG_NONE);
CONFIG_BOOL(
list, list_info,
&settings->bools.quick_menu_show_take_screenshot,

1
msg_hash.h
View File

@ -960,6 +960,7 @@ enum msg_hash_enums
MENU_LABEL(OZONE_TRUNCATE_PLAYLIST_NAME),
MENU_LABEL(MATERIALUI_MENU_COLOR_THEME),
MENU_LABEL(QUICK_MENU_OVERRIDE_OPTIONS),
MENU_LABEL(SETTINGS_SHOW_INPUT),
MENU_LABEL(QUICK_MENU_SHOW_RESUME_CONTENT),
MENU_LABEL(QUICK_MENU_SHOW_RESTART_CONTENT),
MENU_LABEL(QUICK_MENU_SHOW_CLOSE_CONTENT),