From 66e54f86bb75d079f4e3e23775e7ccf46a1559ae Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 15 Jul 2016 02:16:05 +0200 Subject: [PATCH] Remove Menu File Browser settings - now a part of the file browser itself --- menu/cbs/menu_cbs_deferred_push.c | 11 ----------- menu/menu_displaylist.c | 11 ----------- menu/menu_displaylist.h | 1 - 3 files changed, 23 deletions(-) diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index 73608f34df..5eb7384827 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -159,11 +159,6 @@ static int deferred_push_user_interface_settings_list(menu_displaylist_info_t *i return deferred_push_dlist(info, DISPLAYLIST_USER_INTERFACE_SETTINGS_LIST); } -static int deferred_push_menu_file_browser_settings_list(menu_displaylist_info_t *info) -{ - return deferred_push_dlist(info, DISPLAYLIST_MENU_FILE_BROWSER_SETTINGS_LIST); -} - static int deferred_push_retro_achievements_settings_list(menu_displaylist_info_t *info) { return deferred_push_dlist(info, DISPLAYLIST_RETRO_ACHIEVEMENTS_SETTINGS_LIST); @@ -733,12 +728,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label( return 0; } - if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_MENU_FILE_BROWSER_SETTINGS_LIST))) - { - BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_menu_file_browser_settings_list); - return 0; - } - if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_RETRO_ACHIEVEMENTS_SETTINGS_LIST))) { BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_retro_achievements_settings_list); diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index a4b331ea60..389c47ccad 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -3829,7 +3829,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) case DISPLAYLIST_ONSCREEN_OVERLAY_SETTINGS_LIST: case DISPLAYLIST_MENU_SETTINGS_LIST: case DISPLAYLIST_USER_INTERFACE_SETTINGS_LIST: - case DISPLAYLIST_MENU_FILE_BROWSER_SETTINGS_LIST: case DISPLAYLIST_RETRO_ACHIEVEMENTS_SETTINGS_LIST: case DISPLAYLIST_UPDATER_SETTINGS_LIST: case DISPLAYLIST_NETWORK_SETTINGS_LIST: @@ -4406,14 +4405,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) MENU_ENUM_LABEL_UI_MENUBAR_ENABLE, PARSE_ONLY_BOOL, false); - info->need_refresh = true; - info->need_push = true; - break; - case DISPLAYLIST_MENU_FILE_BROWSER_SETTINGS_LIST: - menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE, - PARSE_ONLY_BOOL, false); - info->need_refresh = true; info->need_push = true; break; @@ -4875,8 +4866,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) MENU_ENUM_LABEL_MENU_SETTINGS, PARSE_ACTION, false); ret = menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS, PARSE_ACTION, false); - ret = menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS, PARSE_ACTION, false); ret = menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_RETRO_ACHIEVEMENTS_SETTINGS, PARSE_ACTION, false); ret = menu_displaylist_parse_settings_enum(menu, info, diff --git a/menu/menu_displaylist.h b/menu/menu_displaylist.h index f69a06a539..ff5737fd77 100644 --- a/menu/menu_displaylist.h +++ b/menu/menu_displaylist.h @@ -121,7 +121,6 @@ enum menu_displaylist_ctl_state DISPLAYLIST_ONSCREEN_DISPLAY_SETTINGS_LIST, DISPLAYLIST_MENU_SETTINGS_LIST, DISPLAYLIST_USER_INTERFACE_SETTINGS_LIST, - DISPLAYLIST_MENU_FILE_BROWSER_SETTINGS_LIST, DISPLAYLIST_RETRO_ACHIEVEMENTS_SETTINGS_LIST, DISPLAYLIST_UPDATER_SETTINGS_LIST, DISPLAYLIST_NETWORK_SETTINGS_LIST,