From 44a44b22664144a30a980176edfff86a88266e11 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 24 Jun 2015 13:36:58 +0200 Subject: [PATCH] Rename MENU_LABEL_OPTIONS to MENU_LABEL_ONLINE_UPDATER --- menu/cbs/menu_cbs_deferred_push.c | 2 +- menu/cbs/menu_cbs_ok.c | 2 +- menu/cbs/menu_cbs_title.c | 2 +- menu/intl/menu_hash_de.c | 2 -- menu/intl/menu_hash_fr.c | 2 -- menu/intl/menu_hash_nl.c | 4 ++-- menu/intl/menu_hash_pt.c | 2 -- menu/intl/menu_hash_us.c | 10 +++++----- menu/menu_displaylist.c | 6 +++--- menu/menu_hash.h | 4 ++-- menu/menu_setting.c | 4 ++-- 11 files changed, 17 insertions(+), 23 deletions(-) diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index e79c031cc3..549c3a9172 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -524,7 +524,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label(menu_file_list_cbs_t * case MENU_LABEL_SHADER_OPTIONS: cbs->action_deferred_push = deferred_push_shader_options; break; - case MENU_LABEL_OPTIONS: + case MENU_LABEL_ONLINE_UPDATER: cbs->action_deferred_push = deferred_push_options; break; case MENU_LABEL_CONTENT_SETTINGS: diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 273adfc8f2..0245fb1f01 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -1585,7 +1585,7 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs, case MENU_LABEL_FRONTEND_COUNTERS: case MENU_LABEL_CORE_COUNTERS: case MENU_LABEL_MANAGEMENT: - case MENU_LABEL_OPTIONS: + case MENU_LABEL_ONLINE_UPDATER: case MENU_LABEL_LOAD_CONTENT_LIST: case MENU_LABEL_INFORMATION_LIST: case MENU_LABEL_CONTENT_SETTINGS: diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index b851fa6070..432f8749b6 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -645,7 +645,7 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, break; case MENU_LABEL_CORE_LIST: case MENU_LABEL_MANAGEMENT: - case MENU_LABEL_OPTIONS: + case MENU_LABEL_ONLINE_UPDATER: case MENU_LABEL_SETTINGS: case MENU_LABEL_FRONTEND_COUNTERS: case MENU_LABEL_CORE_COUNTERS: diff --git a/menu/intl/menu_hash_de.c b/menu/intl/menu_hash_de.c index 42ed01ae46..685ff025de 100644 --- a/menu/intl/menu_hash_de.c +++ b/menu/intl/menu_hash_de.c @@ -473,8 +473,6 @@ const char *menu_hash_to_str_de(uint32_t hash) return "Heruntergeladene Archive automatisch entpacken"; case MENU_LABEL_VALUE_SYSTEM_INFORMATION: return "Systeminformationen"; - case MENU_LABEL_VALUE_OPTIONS: - return "Optionen"; /* FIXME */ case MENU_LABEL_VALUE_CORE_INFORMATION: return "Core-Informationen"; case MENU_LABEL_VALUE_DIRECTORY_NOT_FOUND: diff --git a/menu/intl/menu_hash_fr.c b/menu/intl/menu_hash_fr.c index b02b37d41a..bccf32d07a 100644 --- a/menu/intl/menu_hash_fr.c +++ b/menu/intl/menu_hash_fr.c @@ -457,8 +457,6 @@ const char *menu_hash_to_str_fr(uint32_t hash) return "Mise à jour des cores"; case MENU_LABEL_VALUE_SYSTEM_INFORMATION: return "Informations du système"; - case MENU_LABEL_VALUE_OPTIONS: - return "Réglages du core"; case MENU_LABEL_VALUE_CORE_INFORMATION: return "Informations sur le core"; case MENU_LABEL_VALUE_DIRECTORY_NOT_FOUND: diff --git a/menu/intl/menu_hash_nl.c b/menu/intl/menu_hash_nl.c index b1498c3568..85b47240c1 100644 --- a/menu/intl/menu_hash_nl.c +++ b/menu/intl/menu_hash_nl.c @@ -30,8 +30,8 @@ const char *menu_hash_to_str_nl(uint32_t hash) return "Laad Core"; case MENU_LABEL_VALUE_SETTINGS: return "Instellingen"; - case MENU_LABEL_VALUE_OPTIONS: - return "Core Instellingen"; + case MENU_LABEL_VALUE_ONLINE_UPDATER: + return "Online Updaten"; case MENU_LABEL_VALUE_SYSTEM_INFORMATION: return "Systeem Informatie"; default: diff --git a/menu/intl/menu_hash_pt.c b/menu/intl/menu_hash_pt.c index 6d129191a5..4a2c18a3cd 100644 --- a/menu/intl/menu_hash_pt.c +++ b/menu/intl/menu_hash_pt.c @@ -417,8 +417,6 @@ const char *menu_hash_to_str_pt(uint32_t hash) return "Extrair Arquivos Baixados Automaticamente"; case MENU_LABEL_VALUE_SYSTEM_INFORMATION: return "Informação de Sistema"; - case MENU_LABEL_VALUE_OPTIONS: - return "Opções"; /* FIXME */ case MENU_LABEL_VALUE_CORE_INFORMATION: return "Informação de Core"; case MENU_LABEL_VALUE_DIRECTORY_NOT_FOUND: diff --git a/menu/intl/menu_hash_us.c b/menu/intl/menu_hash_us.c index f7cbbd720d..ef9e35f25f 100644 --- a/menu/intl/menu_hash_us.c +++ b/menu/intl/menu_hash_us.c @@ -485,8 +485,8 @@ static const char *menu_hash_to_str_us_label(uint32_t hash) return "core_updater_auto_extract_archive"; case MENU_LABEL_SYSTEM_INFORMATION: return "system_information"; - case MENU_LABEL_OPTIONS: - return "core_settings"; + case MENU_LABEL_ONLINE_UPDATER: + return "online_updater"; case MENU_LABEL_CORE_INFORMATION: return "core_information"; case MENU_LABEL_CORE_LIST: @@ -604,7 +604,7 @@ const char *menu_hash_to_str_us(uint32_t hash) case MENU_LABEL_VALUE_CONFIGURATION_SETTINGS: return "Configuration Settings"; case MENU_LABEL_VALUE_CORE_SETTINGS: - return "Core Settings"; + return "Online Updater"; case MENU_LABEL_VALUE_VIDEO_SETTINGS: return "Video Settings"; case MENU_LABEL_VALUE_LOGGING_SETTINGS: @@ -1039,8 +1039,8 @@ const char *menu_hash_to_str_us(uint32_t hash) return "Automatically extract downloaded archive"; case MENU_LABEL_VALUE_SYSTEM_INFORMATION: return "System Information"; - case MENU_LABEL_VALUE_OPTIONS: - return "Core Settings"; + case MENU_LABEL_VALUE_ONLINE_UPDATER: + return "Online Updater"; case MENU_LABEL_VALUE_CORE_INFORMATION: return "Core Information"; case MENU_LABEL_VALUE_DIRECTORY_NOT_FOUND: diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 1b5f285333..60ea6d23a8 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -1578,10 +1578,10 @@ static int menu_displaylist_parse_load_content_list(menu_displaylist_info_t *inf static int menu_displaylist_parse_options(menu_displaylist_info_t *info) { -#ifdef HAVE_SHADER_MANAGER +#ifdef HAVE_NETWORKING menu_list_push(info->list, - menu_hash_to_str(MENU_LABEL_VALUE_SHADER_OPTIONS), - menu_hash_to_str(MENU_LABEL_SHADER_OPTIONS), + menu_hash_to_str(MENU_LABEL_VALUE_CORE_UPDATER_LIST), + menu_hash_to_str(MENU_LABEL_CORE_UPDATER_LIST), MENU_SETTING_ACTION, 0, 0); #else menu_list_push(info->list, diff --git a/menu/menu_hash.h b/menu/menu_hash.h index e79d1595be..7535dea20c 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -558,8 +558,8 @@ extern "C" { #define MENU_LABEL_VALUE_CORE_LIST 0x0e17fd4eU #define MENU_LABEL_MANAGEMENT 0x2516c88aU #define MENU_LABEL_VALUE_MANAGEMENT 0x97001d0bU -#define MENU_LABEL_OPTIONS 0x2534f97eU -#define MENU_LABEL_VALUE_OPTIONS 0x06795dffU +#define MENU_LABEL_ONLINE_UPDATER 0xcac0025eU +#define MENU_LABEL_VALUE_ONLINE_UPDATER 0x9f3dd2bfU #define MENU_LABEL_SETTINGS 0x1304dc16U #define MENU_LABEL_FRONTEND_COUNTERS 0xe5696877U #define MENU_LABEL_VALUE_FRONTEND_COUNTERS 0x5752bcf8U diff --git a/menu/menu_setting.c b/menu/menu_setting.c index a8edcdc0db..19586a3496 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -3443,8 +3443,8 @@ static bool setting_append_list_main_menu_options( #ifdef HAVE_NETWORKING CONFIG_ACTION( - menu_hash_to_str(MENU_LABEL_CORE_UPDATER_LIST), - menu_hash_to_str(MENU_LABEL_VALUE_CORE_UPDATER_LIST), + menu_hash_to_str(MENU_LABEL_ONLINE_UPDATER), + menu_hash_to_str(MENU_LABEL_VALUE_ONLINE_UPDATER), group_info.name, subgroup_info.name, parent_group);