mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 12:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4228 from lasers/add-ui

Browse Source 
Switch XMB Tabs (Music,Video)
This commit is contained in:
Twinaphex 2016-12-12 13:05:15 +01:00 committed by GitHub
commit d94ed629bd
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intl/msg_hash_eo.h
View File

@ -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,
@ -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,

2
intl/msg_hash_fr.h
View File

@ -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,

4
intl/msg_hash_ru.h
View File

@ -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,
@ -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,

4
intl/msg_hash_us.h
View File

@ -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,
@ -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,

4
intl/msg_hash_vn.c
View File

@ -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:
@ -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:

4
menu/cbs/menu_cbs_title.c
View File

@ -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)))

22
menu/drivers/xmb.c
View File

@ -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 =