From 1acc59b5984b67e701daa3d45618c576ff48b1ae Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 17 Jun 2016 19:57:48 +0200 Subject: [PATCH] We can translate the History Tab label now --- menu/cbs/menu_cbs_left.c | 9 +++++++-- menu/cbs/menu_cbs_title.c | 10 ++++++---- menu/drivers/nuklear.c | 2 +- menu/drivers/xmb.c | 2 +- menu/drivers/zarch.c | 2 +- menu/intl/menu_hash_nl.c | 2 ++ menu/menu_displaylist.c | 7 +++++++ 7 files changed, 25 insertions(+), 9 deletions(-) diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c index b2b8aab1be..d53f275d64 100644 --- a/menu/cbs/menu_cbs_left.c +++ b/menu/cbs/menu_cbs_left.c @@ -497,7 +497,7 @@ static int menu_cbs_init_bind_left_compare_label(menu_file_list_cbs_t *cbs, } static int menu_cbs_init_bind_left_compare_type(menu_file_list_cbs_t *cbs, - unsigned type, uint32_t label_hash, uint32_t menu_label_hash) + unsigned type, uint32_t label_hash, const char *menu_label, uint32_t menu_label_hash) { if (type >= MENU_SETTINGS_CHEAT_BEGIN && type <= MENU_SETTINGS_CHEAT_END) @@ -566,6 +566,11 @@ static int menu_cbs_init_bind_left_compare_type(menu_file_list_cbs_t *cbs, case MENU_FILE_DOWNLOAD_THUMBNAIL_CONTENT: case MENU_FILE_SCAN_DIRECTORY: case MENU_SETTING_GROUP: + if (string_is_equal(menu_label, menu_hash_to_str_enum(MENU_ENUM_LABEL_HISTORY_TAB))) + { + BIND_ACTION_LEFT(cbs, action_left_mainmenu); + break; + } switch (menu_label_hash) { case MENU_VALUE_HORIZONTAL_MENU: @@ -619,7 +624,7 @@ int menu_cbs_init_bind_left(menu_file_list_cbs_t *cbs, if (menu_cbs_init_bind_left_compare_label(cbs, label, label_hash, menu_label_hash, elem0) == 0) return 0; - if (menu_cbs_init_bind_left_compare_type(cbs, type, label_hash, menu_label_hash) == 0) + if (menu_cbs_init_bind_left_compare_type(cbs, type, label_hash, menu_label, menu_label_hash) == 0) return 0; return -1; diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index 01cf89ab1d..31684748b3 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -273,14 +273,16 @@ static int action_get_title_default(const char *path, const char *label, static int action_get_title_group_settings(const char *path, const char *label, unsigned menu_type, char *s, size_t len) { - char elem0[PATH_MAX_LENGTH] = {0}; - char elem1[PATH_MAX_LENGTH] = {0}; - struct string_list *list_label = string_split(label, "|"); - if (string_is_equal(label, menu_hash_to_str_enum(MENU_ENUM_LABEL_MAIN_MENU))) strlcpy(s, menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_MAIN_MENU), len); + else if (string_is_equal(label, menu_hash_to_str_enum(MENU_ENUM_LABEL_HISTORY_TAB))) + strlcpy(s, menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_HISTORY_TAB), len); else { + char elem0[PATH_MAX_LENGTH] = {0}; + char elem1[PATH_MAX_LENGTH] = {0}; + struct string_list *list_label = string_split(label, "|"); + if (list_label) { if (list_label->size > 0) diff --git a/menu/drivers/nuklear.c b/menu/drivers/nuklear.c index 44f2bf820b..5cd5313ba8 100644 --- a/menu/drivers/nuklear.c +++ b/menu/drivers/nuklear.c @@ -388,7 +388,7 @@ static bool nk_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_HISTORY_TAB), sizeof(info.label)); + menu_hash_to_str_enum(MENU_ENUM_LABEL_HISTORY_TAB), sizeof(info.label)); menu_entries_add_enum(menu_stack, info.path, info.label, MENU_ENUM_LABEL_UNKNOWN, diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 7477f8853b..c363e00e66 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -2990,7 +2990,7 @@ static void xmb_list_cache(void *data, enum menu_list_type type, unsigned action break; case XMB_SYSTEM_TAB_HISTORY: menu_stack->list[stack_size - 1].label = - strdup(menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_HISTORY_TAB)); + strdup(menu_hash_to_str_enum(MENU_ENUM_LABEL_HISTORY_TAB)); menu_stack->list[stack_size - 1].type = MENU_HISTORY_TAB; break; diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c index 7c9a55d17d..535cc18d63 100644 --- a/menu/drivers/zarch.c +++ b/menu/drivers/zarch.c @@ -1129,7 +1129,7 @@ static bool zarch_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_HISTORY_TAB), sizeof(info.label)); + menu_hash_to_str_enum(MENU_ENUM_LABEL_HISTORY_TAB), sizeof(info.label)); menu_entries_add_enum(menu_stack, info.path, info.label, MENU_ENUM_LABEL_UNKNOWN, info.type, info.flags, 0); diff --git a/menu/intl/menu_hash_nl.c b/menu/intl/menu_hash_nl.c index b5ecc6677f..18cfb5e080 100644 --- a/menu/intl/menu_hash_nl.c +++ b/menu/intl/menu_hash_nl.c @@ -102,6 +102,8 @@ const char *menu_hash_to_str_nl_enum(enum menu_hash_enums msg) return "Privacy"; case MENU_ENUM_LABEL_VALUE_HORIZONTAL_MENU: return "Horizontal Menu"; + case MENU_ENUM_LABEL_VALUE_HISTORY_TAB: + return "Geschiedenis tab"; case MENU_ENUM_LABEL_VALUE_NO_SETTINGS_FOUND: return "Geen instellingen gevonden."; case MENU_ENUM_LABEL_VALUE_NO_PERFORMANCE_COUNTERS: diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 2af45ef319..ff38a1f0cd 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -3503,6 +3503,13 @@ static bool menu_displaylist_push_internal( { settings_t *settings = config_get_ptr(); + if (string_is_equal(label, menu_hash_to_str_enum(MENU_ENUM_LABEL_HISTORY_TAB))) + { + if (!menu_displaylist_ctl(DISPLAYLIST_HISTORY, info)) + return false; + return true; + } + switch (menu_hash_calculate(label)) { case MENU_VALUE_MAIN_MENU: