From ff7833180d02dff14751e8546fdfb7297303ea7e Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 22 Jun 2015 23:15:45 +0200 Subject: [PATCH] Rename Unload Core to 'Close Content' and move it to Content Settings --- menu/cbs/menu_cbs_ok.c | 6 +++--- menu/menu_displaylist.c | 5 +++++ menu/menu_hash.c | 20 ++++++++++---------- menu/menu_hash.h | 4 ++-- menu/menu_setting.c | 17 ----------------- 5 files changed, 20 insertions(+), 32 deletions(-) diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index c58874bfdc..5de49e1768 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -1242,7 +1242,7 @@ static int action_ok_disk_cycle_tray_status(const char *path, return generic_action_ok_command(EVENT_CMD_DISK_EJECT_TOGGLE); } -static int action_ok_unload_core(const char *path, +static int action_ok_close_content(const char *path, const char *label, unsigned type, size_t idx, size_t entry_idx) { return generic_action_ok_command(EVENT_CMD_UNLOAD_CORE); @@ -1503,8 +1503,8 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs, case MENU_LABEL_QUIT_RETROARCH: cbs->action_ok = action_ok_quit; break; - case MENU_LABEL_UNLOAD_CORE: - cbs->action_ok = action_ok_unload_core; + case MENU_LABEL_CLOSE_CONTENT: + cbs->action_ok = action_ok_close_content; break; case MENU_LABEL_SAVE_NEW_CONFIG: cbs->action_ok = action_ok_save_new_config; diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index c9884719b4..361ec16cf1 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -1449,6 +1449,11 @@ static int menu_displaylist_parse_load_content_settings(menu_displaylist_info_t menu_hash_to_str(MENU_LABEL_RESTART_CONTENT), MENU_SETTING_ACTION_RUN, 0, 0); + menu_list_push(info->list, + menu_hash_to_str(MENU_LABEL_VALUE_CLOSE_CONTENT), + menu_hash_to_str(MENU_LABEL_CLOSE_CONTENT), + MENU_SETTING_ACTION_RUN, 0, 0); + menu_list_push(info->list, menu_hash_to_str(MENU_LABEL_VALUE_TAKE_SCREENSHOT), menu_hash_to_str(MENU_LABEL_TAKE_SCREENSHOT), diff --git a/menu/menu_hash.c b/menu/menu_hash.c index 5dbff0d386..d116159f83 100644 --- a/menu/menu_hash.c +++ b/menu/menu_hash.c @@ -229,8 +229,8 @@ static const char *menu_hash_to_str_german(uint32_t hash) return "Core Liste"; case MENU_LABEL_VALUE_LOAD_CONTENT: return "Lade Content"; /* FIXME */ - case MENU_LABEL_VALUE_UNLOAD_CORE: - return "Entlade Core"; + case MENU_LABEL_VALUE_CLOSE_CONTENT: + return "Entlade Core"; /* FIXME */ case MENU_LABEL_VALUE_MANAGEMENT: return "Management"; case MENU_LABEL_VALUE_SAVE_STATE: @@ -1136,10 +1136,10 @@ static const char *menu_hash_to_str_portuguese(uint32_t hash) return "load_content_default"; case MENU_LABEL_VALUE_LOAD_CONTENT: return "Carregar Conteúdo"; /* FIXME */ - case MENU_LABEL_UNLOAD_CORE: + case MENU_LABEL_CLOSE_CONTENT: return "unload_core"; - case MENU_LABEL_VALUE_UNLOAD_CORE: - return "Descarregar Core"; + case MENU_LABEL_VALUE_CLOSE_CONTENT: + return "Descarregar Core"; /* FIXME */ case MENU_LABEL_MANAGEMENT: return "advanced_management"; case MENU_LABEL_VALUE_MANAGEMENT: @@ -1490,8 +1490,8 @@ static const char *menu_hash_to_str_french(uint32_t hash) return "Charger un core"; case MENU_LABEL_VALUE_LOAD_CONTENT: return "Charger un contenu"; /* FIXME */ - case MENU_LABEL_VALUE_UNLOAD_CORE: - return "Unload core"; + case MENU_LABEL_VALUE_CLOSE_CONTENT: + return "Unload core"; /* FIXME */ case MENU_LABEL_VALUE_MANAGEMENT: return "Gestion avancee"; case MENU_LABEL_VALUE_SAVE_STATE: @@ -2512,10 +2512,10 @@ static const char *menu_hash_to_str_english(uint32_t hash) return "load_content_default"; case MENU_LABEL_VALUE_LOAD_CONTENT: return "Select File"; - case MENU_LABEL_UNLOAD_CORE: + case MENU_LABEL_CLOSE_CONTENT: return "unload_core"; - case MENU_LABEL_VALUE_UNLOAD_CORE: - return "Unload Core"; + case MENU_LABEL_VALUE_CLOSE_CONTENT: + return "Close Content"; case MENU_LABEL_MANAGEMENT: return "advanced_management"; case MENU_LABEL_VALUE_MANAGEMENT: diff --git a/menu/menu_hash.h b/menu/menu_hash.h index 48c3693701..c70560527b 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -499,10 +499,10 @@ extern "C" { #define MENU_LABEL_VALUE_NAVIGATION_WRAPAROUND_VERTICAL 0xfc3b3bdfU #define MENU_LABEL_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE 0xea48426bU #define MENU_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE 0x94af8500U -#define MENU_LABEL_UNLOAD_CORE 0x4b622170U #define MENU_LABEL_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE 0x593d2623U #define MENU_LABEL_VALUE_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE 0x9614c0b2U -#define MENU_LABEL_VALUE_UNLOAD_CORE 0x9b45e571U +#define MENU_LABEL_CLOSE_CONTENT 0x4b622170U +#define MENU_LABEL_VALUE_CLOSE_CONTENT 0x2b3d9556U #define MENU_LABEL_QUIT_RETROARCH 0x84b0bc71U #define MENU_LABEL_VALUE_QUIT_RETROARCH 0x8e7024f2U #define MENU_LABEL_DEFERRED_VIDEO_FILTER 0x966ad201U diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 2307596f1d..fd3c0147bd 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -3430,23 +3430,6 @@ static bool setting_append_list_main_menu_options( (*list)[list_info->index - 1].action_right = core_list_action_toggle; menu_settings_list_current_add_cmd(list, list_info, EVENT_CMD_LOAD_CORE); settings_data_list_current_add_flags(list, list_info, SD_FLAG_BROWSER_ACTION); - - { - struct retro_system_info *info = (struct retro_system_info*) - global ? &global->system.info : NULL; - uint32_t info_library_name_hash = info ? menu_hash_calculate(info->library_name) : 0; - - if (info && (info_library_name_hash != MENU_VALUE_NO_CORE)) - { - CONFIG_ACTION( - menu_hash_to_str(MENU_LABEL_UNLOAD_CORE), - menu_hash_to_str(MENU_LABEL_VALUE_UNLOAD_CORE), - group_info.name, - subgroup_info.name, - parent_group); - menu_settings_list_current_add_cmd(list, list_info, EVENT_CMD_UNLOAD_CORE); - } - } #endif CONFIG_ACTION(