From 8366b26d36e05daf08cfe240ddba079eb5dd38f7 Mon Sep 17 00:00:00 2001 From: lasers Date: Mon, 12 Dec 2016 03:54:53 -0600 Subject: [PATCH 1/3] Switch XMB Tabs (Music,Video) --- menu/cbs/menu_cbs_title.c | 4 ++-- menu/drivers/xmb.c | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index ed69c9907c..79f0d22f8d 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -240,12 +240,12 @@ static int action_get_title_group_settings(const char *path, const char *label, strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_MAIN_MENU), len); else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_HISTORY_TAB))) strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_HISTORY_TAB), len); - else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_TAB))) - strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_TAB), len); else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_IMAGES_TAB))) strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_IMAGES_TAB), len); else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_MUSIC_TAB))) strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_MUSIC_TAB), len); + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_TAB))) + strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_TAB), len); else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_SETTINGS_TAB))) strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SETTINGS_TAB), len); else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_PLAYLISTS_TAB))) diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 75779ca2aa..4ccee2188f 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -139,8 +139,8 @@ enum XMB_SYSTEM_TAB_SETTINGS, XMB_SYSTEM_TAB_HISTORY, #ifdef HAVE_FFMPEG - XMB_SYSTEM_TAB_VIDEO, XMB_SYSTEM_TAB_MUSIC, + XMB_SYSTEM_TAB_VIDEO, #endif #ifdef HAVE_IMAGEVIEWER XMB_SYSTEM_TAB_IMAGES, @@ -1404,10 +1404,10 @@ static xmb_node_t* xmb_get_node(xmb_handle_t *xmb, unsigned i) return &xmb->images_tab_node; #endif #ifdef HAVE_FFMPEG - case XMB_SYSTEM_TAB_VIDEO: - return &xmb->video_tab_node; case XMB_SYSTEM_TAB_MUSIC: return &xmb->music_tab_node; + case XMB_SYSTEM_TAB_VIDEO: + return &xmb->video_tab_node; #endif case XMB_SYSTEM_TAB_HISTORY: return &xmb->history_tab_node; @@ -3045,10 +3045,10 @@ static void *xmb_init(void **userdata) xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_IMAGES; #endif #ifdef HAVE_FFMPEG - if (settings->menu.xmb.show_video) - xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_VIDEO; if (settings->menu.xmb.show_music) xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_MUSIC; + if (settings->menu.xmb.show_video) + xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_VIDEO; #endif #ifdef HAVE_LIBRETRODB xmb->tabs[++xmb->system_tab_end] = XMB_SYSTEM_TAB_ADD; @@ -3587,18 +3587,18 @@ static void xmb_list_cache(void *data, enum menu_list_type type, unsigned action break; #endif #ifdef HAVE_FFMPEG - case XMB_SYSTEM_TAB_VIDEO: - menu_stack->list[stack_size - 1].label = - strdup(msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_TAB)); - menu_stack->list[stack_size - 1].type = - MENU_VIDEO_TAB; - break; case XMB_SYSTEM_TAB_MUSIC: menu_stack->list[stack_size - 1].label = strdup(msg_hash_to_str(MENU_ENUM_LABEL_MUSIC_TAB)); menu_stack->list[stack_size - 1].type = MENU_MUSIC_TAB; break; + case XMB_SYSTEM_TAB_VIDEO: + menu_stack->list[stack_size - 1].label = + strdup(msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_TAB)); + menu_stack->list[stack_size - 1].type = + MENU_VIDEO_TAB; + break; #endif case XMB_SYSTEM_TAB_HISTORY: menu_stack->list[stack_size - 1].label = From 257107a69d05ed9425f898988c6584aa09b372c9 Mon Sep 17 00:00:00 2001 From: lasers Date: Mon, 12 Dec 2016 04:04:13 -0600 Subject: [PATCH 2/3] Rename Images->Image (XMB Style) --- intl/msg_hash_eo.h | 2 +- intl/msg_hash_fr.h | 2 +- intl/msg_hash_ru.h | 2 +- intl/msg_hash_us.h | 2 +- intl/msg_hash_vn.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index 8974034951..4bd40de65b 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -571,7 +571,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_HISTORY_TAB, MSG_HASH(MENU_ENUM_LABEL_VALUE_HORIZONTAL_MENU, "Horizontal Menu") MSG_HASH(MENU_ENUM_LABEL_VALUE_IMAGES_TAB, - "Images") + "Image") MSG_HASH(MENU_ENUM_LABEL_VALUE_INFORMATION, "Information") MSG_HASH(MENU_ENUM_LABEL_VALUE_INFORMATION_LIST, diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index 6b228b4da8..ad23ab5a5d 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -567,7 +567,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_HISTORY_TAB, MSG_HASH(MENU_ENUM_LABEL_VALUE_HORIZONTAL_MENU, "Horizontal Menu") MSG_HASH(MENU_ENUM_LABEL_VALUE_IMAGES_TAB, - "Images") + "Image") MSG_HASH(MENU_ENUM_LABEL_VALUE_INFORMATION, "Information") MSG_HASH(MENU_ENUM_LABEL_VALUE_INFORMATION_LIST, diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index 0ac4afd22c..31981310f7 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -571,7 +571,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_HISTORY_TAB, MSG_HASH(MENU_ENUM_LABEL_VALUE_HORIZONTAL_MENU, "Horizontal Menu") MSG_HASH(MENU_ENUM_LABEL_VALUE_IMAGES_TAB, - "Images") + "Image") MSG_HASH(MENU_ENUM_LABEL_VALUE_INFORMATION, "Information") MSG_HASH(MENU_ENUM_LABEL_VALUE_INFORMATION_LIST, diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 5b972159ac..aa500cd30f 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -577,7 +577,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_HISTORY_TAB, MSG_HASH(MENU_ENUM_LABEL_VALUE_HORIZONTAL_MENU, "Horizontal Menu") MSG_HASH(MENU_ENUM_LABEL_VALUE_IMAGES_TAB, - "Images") + "Image") MSG_HASH(MENU_ENUM_LABEL_VALUE_INFORMATION, "Information") MSG_HASH(MENU_ENUM_LABEL_VALUE_INFORMATION_LIST, diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c index 62abe2e732..6e7840cdd0 100644 --- a/intl/msg_hash_vn.c +++ b/intl/msg_hash_vn.c @@ -2252,7 +2252,7 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg) case MENU_ENUM_LABEL_VALUE_HORIZONTAL_MENU: return "Horizontal Menu"; case MENU_ENUM_LABEL_VALUE_IMAGES_TAB: - return "Images"; + return "Image"; case MENU_ENUM_LABEL_VALUE_INFORMATION: return "Information"; case MENU_ENUM_LABEL_VALUE_INFORMATION_LIST: From 754b9c1ddab509ee1cc94e52e3a68e16d8b90af9 Mon Sep 17 00:00:00 2001 From: lasers Date: Mon, 12 Dec 2016 04:14:27 -0600 Subject: [PATCH 3/3] Rename Search:->Search (XMB Style) --- intl/msg_hash_eo.h | 2 +- intl/msg_hash_ru.h | 2 +- intl/msg_hash_us.h | 2 +- intl/msg_hash_vn.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index 4bd40de65b..bfe1c74bb4 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -1171,7 +1171,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SCREENSHOT_DIRECTORY, MSG_HASH(MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION, "Screen Resolution") MSG_HASH(MENU_ENUM_LABEL_VALUE_SEARCH, - "Search:") + "Search") MSG_HASH(MENU_ENUM_LABEL_VALUE_SECONDS, "seconds") MSG_HASH(MENU_ENUM_LABEL_VALUE_SETTINGS, diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index 31981310f7..b96282af5b 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -1171,7 +1171,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SCREENSHOT_DIRECTORY, MSG_HASH(MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION, "Screen Resolution") MSG_HASH(MENU_ENUM_LABEL_VALUE_SEARCH, - "Search:") + "Search") MSG_HASH(MENU_ENUM_LABEL_VALUE_SECONDS, "seconds") MSG_HASH(MENU_ENUM_LABEL_VALUE_SETTINGS, diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index aa500cd30f..b8c36c8c3f 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -1189,7 +1189,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SCREENSHOT_DIRECTORY, MSG_HASH(MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION, "Screen Resolution") MSG_HASH(MENU_ENUM_LABEL_VALUE_SEARCH, - "Search:") + "Search") MSG_HASH(MENU_ENUM_LABEL_VALUE_SECONDS, "seconds") MSG_HASH(MENU_ENUM_LABEL_VALUE_SETTINGS, diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c index 6e7840cdd0..8766639869 100644 --- a/intl/msg_hash_vn.c +++ b/intl/msg_hash_vn.c @@ -2846,7 +2846,7 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg) case MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION: return "Screen Resolution"; case MENU_ENUM_LABEL_VALUE_SEARCH: - return "Search:"; + return "Search"; case MENU_ENUM_LABEL_VALUE_SECONDS: return "seconds"; case MENU_ENUM_LABEL_VALUE_SETTINGS: