diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index 94b4411a24..a139a9ddd0 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -84,6 +84,11 @@ static int deferred_push_rdb_collection(menu_displaylist_info_t *info) return deferred_push_dlist(info, DISPLAYLIST_PLAYLIST_COLLECTION); } +static int deferred_main_menu_list(menu_displaylist_info_t *info) +{ + return deferred_push_dlist(info, DISPLAYLIST_MAIN_MENU); +} + static int deferred_user_binds_list(menu_displaylist_info_t *info) { return deferred_push_dlist(info, DISPLAYLIST_USER_BINDS_LIST); @@ -608,6 +613,9 @@ static int menu_cbs_init_bind_deferred_push_compare_label( { switch (cbs->enum_idx) { + case MENU_ENUM_LABEL_MAIN_MENU: + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_main_menu_list); + break; case MENU_ENUM_LABEL_DEFERRED_USER_BINDS_LIST: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_user_binds_list); break; diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index 067fca16f5..93496ebd13 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -299,6 +299,13 @@ static int action_get_title_group_settings(const char *path, const char *label, return 0; } +static int action_get_title_main_menu(const char *path, const char *label, + unsigned menu_type, char *s, size_t len) +{ + sanitize_to_string(s, menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_MAIN_MENU), len); + return 0; +} + static int action_get_user_accounts_cheevos_list(const char *path, const char *label, unsigned menu_type, char *s, size_t len) { @@ -707,7 +714,7 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, switch (cbs->enum_idx) { case MENU_ENUM_LABEL_MAIN_MENU: - BIND_ACTION_GET_TITLE(cbs, action_get_title_group_settings); + BIND_ACTION_GET_TITLE(cbs, action_get_title_main_menu); break; case MENU_ENUM_LABEL_DEFERRED_DATABASE_MANAGER_LIST: BIND_ACTION_GET_TITLE(cbs, action_get_title_deferred_database_manager_list); diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index 1c111a92aa..dd59b1a3c0 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -1257,7 +1257,7 @@ static void mui_preswitch_tabs(mui_handle_t *mui, unsigned action) { case MUI_SYSTEM_TAB_MAIN: menu_stack->list[stack_size - 1].label = - strdup(menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_MAIN_MENU)); + strdup(menu_hash_to_str_enum(MENU_ENUM_LABEL_MAIN_MENU)); menu_stack->list[stack_size - 1].type = MENU_SETTINGS; break; diff --git a/menu/drivers/menu_generic.c b/menu/drivers/menu_generic.c index dd6275d962..73510bfdf4 100644 --- a/menu/drivers/menu_generic.c +++ b/menu/drivers/menu_generic.c @@ -400,7 +400,7 @@ bool generic_menu_init_list(void *data) file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); strlcpy(info.label, - menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_MAIN_MENU), sizeof(info.label)); + menu_hash_to_str_enum(MENU_ENUM_LABEL_MAIN_MENU), sizeof(info.label)); menu_entries_add_enum(menu_stack, info.path, info.label, diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index bdccd08f33..7477f8853b 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -2978,7 +2978,7 @@ static void xmb_list_cache(void *data, enum menu_list_type type, unsigned action { case XMB_SYSTEM_TAB_MAIN: menu_stack->list[stack_size - 1].label = - strdup(menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_MAIN_MENU)); + strdup(menu_hash_to_str_enum(MENU_ENUM_LABEL_MAIN_MENU)); menu_stack->list[stack_size - 1].type = MENU_SETTINGS; break; @@ -3190,7 +3190,7 @@ static bool xmb_menu_init_list(void *data) file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0); strlcpy(info.label, - menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_MAIN_MENU), sizeof(info.label)); + menu_hash_to_str_enum(MENU_ENUM_LABEL_MAIN_MENU), sizeof(info.label)); menu_entries_add_enum(menu_stack, info.path, info.label, diff --git a/menu/intl/menu_hash_de.c b/menu/intl/menu_hash_de.c index 41af142f5e..9cde22de0c 100644 --- a/menu/intl/menu_hash_de.c +++ b/menu/intl/menu_hash_de.c @@ -458,8 +458,8 @@ const char *menu_hash_to_str_de_enum(enum menu_hash_enums msg) return "Datenbankmanager"; case MENU_ENUM_LABEL_VALUE_CURSOR_MANAGER: return "Cursormanager"; - case MENU_ENUM_LABEL_VALUE_MAIN_MENU: /* Don't change. Breaks everything. (Would be: "Hauptmenü") */ - return "Main Menu"; + case MENU_ENUM_LABEL_VALUE_MAIN_MENU: + return "Hauptmenü"; case MENU_ENUM_LABEL_VALUE_SETTINGS: return "Einstellungen"; case MENU_ENUM_LABEL_VALUE_QUIT_RETROARCH: diff --git a/menu/intl/menu_hash_es.c b/menu/intl/menu_hash_es.c index d6aa2d7aab..a143560e88 100644 --- a/menu/intl/menu_hash_es.c +++ b/menu/intl/menu_hash_es.c @@ -580,8 +580,8 @@ const char *menu_hash_to_str_es_enum(enum menu_hash_enums msg) return "Gestor de bases de datos"; case MENU_ENUM_LABEL_VALUE_CURSOR_MANAGER: return "Gestor de cursores"; - case MENU_ENUM_LABEL_VALUE_MAIN_MENU: /* Don't change. Breaks everything. (Would be: "Menú principal") */ - return "Main Menu"; + case MENU_ENUM_LABEL_VALUE_MAIN_MENU: + return "Menú principal"; case MENU_ENUM_LABEL_VALUE_SETTINGS: return "Ajustes"; case MENU_ENUM_LABEL_VALUE_QUIT_RETROARCH: diff --git a/menu/intl/menu_hash_fr.c b/menu/intl/menu_hash_fr.c index cdbdd7b3f9..bc03d04eaf 100644 --- a/menu/intl/menu_hash_fr.c +++ b/menu/intl/menu_hash_fr.c @@ -467,7 +467,7 @@ const char *menu_hash_to_str_fr_enum(enum menu_hash_enums msg) return "Gestion de la base de données"; case MENU_ENUM_LABEL_VALUE_CURSOR_MANAGER: return "Gestion des curseurs"; - case MENU_ENUM_LABEL_VALUE_MAIN_MENU: + case MENU_ENUM_LABEL_VALUE_MAIN_MENU: /* TODO/FIXME - translate */ return "Main Menu"; case MENU_ENUM_LABEL_VALUE_SETTINGS: return "Réglages"; diff --git a/menu/intl/menu_hash_it.c b/menu/intl/menu_hash_it.c index 573de134d0..f838661933 100644 --- a/menu/intl/menu_hash_it.c +++ b/menu/intl/menu_hash_it.c @@ -582,8 +582,8 @@ const char *menu_hash_to_str_it_enum(enum menu_hash_enums msg) return "Gestore database"; case MENU_ENUM_LABEL_VALUE_CURSOR_MANAGER: return "Gestore cursori"; - case MENU_ENUM_LABEL_VALUE_MAIN_MENU: /* Don't change. Breaks everything. (Would be: "Menú principale") */ - return "Main Menu"; + case MENU_ENUM_LABEL_VALUE_MAIN_MENU: + return "Menú principale"; case MENU_ENUM_LABEL_VALUE_SETTINGS: return "Settaggi"; case MENU_ENUM_LABEL_VALUE_QUIT_RETROARCH: diff --git a/menu/intl/menu_hash_nl.c b/menu/intl/menu_hash_nl.c index ce6d1b90ea..b5ecc6677f 100644 --- a/menu/intl/menu_hash_nl.c +++ b/menu/intl/menu_hash_nl.c @@ -503,7 +503,7 @@ const char *menu_hash_to_str_nl_enum(enum menu_hash_enums msg) case MENU_ENUM_LABEL_VALUE_CURSOR_MANAGER: return "Cursorbeheer"; case MENU_ENUM_LABEL_VALUE_MAIN_MENU: - return "Main Menu"; + return "Hoofdmenu"; case MENU_ENUM_LABEL_VALUE_SETTINGS: return "Instellingen"; case MENU_ENUM_LABEL_VALUE_QUIT_RETROARCH: diff --git a/menu/intl/menu_hash_pl.c b/menu/intl/menu_hash_pl.c index b496b637dc..00537eb48e 100644 --- a/menu/intl/menu_hash_pl.c +++ b/menu/intl/menu_hash_pl.c @@ -468,8 +468,8 @@ const char *menu_hash_to_str_pl_enum(enum menu_hash_enums msg) return "Mened¿er bazy danych"; case MENU_ENUM_LABEL_VALUE_CURSOR_MANAGER: return "Mened¿er kursorów"; - case MENU_ENUM_LABEL_VALUE_MAIN_MENU: /* Don't change. Breaks everything. (Would be: "Menu g³ówne") */ - return "Main Menu"; + case MENU_ENUM_LABEL_VALUE_MAIN_MENU: + return "Menu g³ówne"; case MENU_ENUM_LABEL_VALUE_SETTINGS: return "Ustawienia"; case MENU_ENUM_LABEL_VALUE_QUIT_RETROARCH: diff --git a/menu/intl/menu_hash_pt.c b/menu/intl/menu_hash_pt.c index 55bf7527e3..45f6a1f2a6 100644 --- a/menu/intl/menu_hash_pt.c +++ b/menu/intl/menu_hash_pt.c @@ -467,7 +467,7 @@ const char *menu_hash_to_str_pt_enum(enum menu_hash_enums msg) return "Gerenciador de Databases"; case MENU_ENUM_LABEL_VALUE_CURSOR_MANAGER: return "Gerenciador de Cursores"; - case MENU_ENUM_LABEL_VALUE_MAIN_MENU: + case MENU_ENUM_LABEL_VALUE_MAIN_MENU: /* TODO/FIXME - translate */ return "Main Menu"; case MENU_ENUM_LABEL_VALUE_SETTINGS: return "Definições";