(menu displaylist) Cleanups

This commit is contained in:
twinaphex 2019-04-21 04:33:22 +02:00
parent 2d9f0ea7ce
commit 565e25d2ab
2 changed files with 18 additions and 30 deletions

View File

@ -4396,6 +4396,23 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct
switch (type)
{
case DISPLAYLIST_PRIVACY_SETTINGS_LIST:
{
menu_displaylist_build_info_t build_list[] = {
{MENU_ENUM_LABEL_CAMERA_ALLOW, PARSE_ONLY_BOOL},
{MENU_ENUM_LABEL_DISCORD_ALLOW, PARSE_ONLY_BOOL},
{MENU_ENUM_LABEL_LOCATION_ALLOW, 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_SAVING_SETTINGS_LIST:
{
menu_displaylist_build_info_t build_list[] = {
@ -6074,6 +6091,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
case DISPLAYLIST_ONSCREEN_DISPLAY_SETTINGS_LIST:
case DISPLAYLIST_POWER_MANAGEMENT_SETTINGS_LIST:
case DISPLAYLIST_SETTINGS_ALL:
case DISPLAYLIST_PRIVACY_SETTINGS_LIST:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
count = menu_displaylist_build_list(info->list, type);
@ -6595,14 +6613,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
MENU_ENUM_LABEL_UI_COMPANION_TOGGLE,
PARSE_ONLY_BOOL, false);
#endif
#if defined(_3DS)
menu_displaylist_parse_settings_enum(info->list,
MENU_ENUM_LABEL_VIDEO_3DS_DISPLAY_MODE,
PARSE_ONLY_UINT, false);
menu_displaylist_parse_settings_enum(info->list,
MENU_ENUM_LABEL_VIDEO_3DS_LCD_BOTTOM,
PARSE_ONLY_BOOL, false);
#endif
info->need_refresh = true;
info->need_push = true;
break;
@ -6837,32 +6853,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
MENU_ENUM_LABEL_NO_SETTINGS_FOUND,
0, 0, 0);
info->need_refresh = true;
info->need_push = true;
break;
case DISPLAYLIST_PRIVACY_SETTINGS_LIST:
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
if (menu_displaylist_parse_settings_enum(info->list,
MENU_ENUM_LABEL_CAMERA_ALLOW,
PARSE_ONLY_BOOL, false) == 0)
count++;
if (menu_displaylist_parse_settings_enum(info->list,
MENU_ENUM_LABEL_DISCORD_ALLOW,
PARSE_ONLY_BOOL, false) == 0)
count++;
if (menu_displaylist_parse_settings_enum(info->list,
MENU_ENUM_LABEL_LOCATION_ALLOW,
PARSE_ONLY_BOOL, true) == 0)
count++;
if (count == 0)
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_SETTINGS_FOUND),
msg_hash_to_str(MENU_ENUM_LABEL_NO_SETTINGS_FOUND),
MENU_ENUM_LABEL_NO_SETTINGS_FOUND,
0, 0, 0);
info->need_refresh = true;
info->need_push = true;
break;

View File

@ -956,7 +956,6 @@ enum msg_hash_enums
MENU_LABEL(DESKTOP_MENU_ENABLE),
MENU_LABEL(UI_MENUBAR_ENABLE),
#if defined(_3DS)
MENU_LABEL(VIDEO_3DS_LCD_BOTTOM),
MENU_LABEL(VIDEO_3DS_DISPLAY_MODE),
@ -964,7 +963,6 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D,
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_400x240,
MENU_ENUM_LABEL_VALUE_CTR_VIDEO_MODE_2D_800x240,
#endif
MENU_ENUM_LABEL_FILE_CONFIG,
MENU_ENUM_LABEL_FILE_BROWSER_COMPRESSED_ARCHIVE,