libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-23 16:09:47 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(Help) Add 'Loading Content'

Browse Source
This commit is contained in:
twinaphex 2015-07-17 22:11:24 +02:00
parent f48c31cf68
commit 6636fbaf15
6 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
menu/cbs/menu_cbs_iterate.c
View File

@ -133,6 +133,10 @@ static int action_iterate_help(char *s, size_t len, const char *label)
);
}
break;
case MENU_HELP_LOADING_CONTENT:
menu_hash_get_help(MENU_LABEL_LOAD_CONTENT,
s, len);
break;
case MENU_HELP_EXTRACT:
menu_hash_get_help(MENU_LABEL_VALUE_EXTRACTING_PLEASE_WAIT,
s, len);
@ -388,6 +392,7 @@ static enum action_iterate_type action_iterate_type(uint32_t hash)
{
case MENU_LABEL_HELP:
case MENU_LABEL_HELP_CONTROLS:
case MENU_LABEL_HELP_LOADING_CONTENT:
return ITERATE_TYPE_HELP;
case MENU_LABEL_INFO_SCREEN:
return ITERATE_TYPE_INFO;

21
menu/cbs/menu_cbs_ok.c
View File

@ -1865,7 +1865,25 @@ static int action_ok_help_controls(const char *path,
menu->help_screen_type = MENU_HELP_CONTROLS;
return menu_displaylist_push_list(&info, DISPLAYLIST_HELP);
}
static int action_ok_help_load_content(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
menu_displaylist_info_t info = {0};
menu_list_t *menu_list = menu_list_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu_list)
return -1;
info.list = menu_list->menu_stack;
strlcpy(info.label,
menu_hash_to_str(MENU_LABEL_HELP_LOADING_CONTENT),
sizeof(info.label));
menu->push_help_screen = true;
menu->help_screen_type = MENU_HELP_LOADING_CONTENT;
return menu_displaylist_push_list(&info, DISPLAYLIST_HELP);
}
static int action_ok_video_resolution(const char *path,
@ -2006,6 +2024,9 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
case MENU_LABEL_HELP_CONTROLS:
cbs->action_ok = action_ok_help_controls;
break;
case MENU_LABEL_HELP_LOADING_CONTENT:
cbs->action_ok = action_ok_help_load_content;
break;
case MENU_LABEL_VIDEO_SHADER_PASS:
cbs->action_ok = action_ok_shader_pass;
break;

4
menu/intl/menu_hash_us.c
View File

@ -26,6 +26,8 @@ static const char *menu_hash_to_str_us_label(uint32_t hash)
{
switch (hash)
{
case MENU_LABEL_HELP_LOADING_CONTENT:
return "help_loading_content";
case MENU_LABEL_HELP_LIST:
return "help_list";
case MENU_LABEL_HELP_CONTROLS:
@ -640,6 +642,8 @@ const char *menu_hash_to_str_us(uint32_t hash)
switch (hash)
{
case MENU_LABEL_VALUE_HELP_LOADING_CONTENT:
return "Loading Content";
case MENU_LABEL_VALUE_HELP_LIST:
return "Help";
case MENU_LABEL_VALUE_HELP_CONTROLS:

4
menu/menu_displaylist.c
View File

@ -2182,6 +2182,10 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
menu_hash_to_str(MENU_LABEL_VALUE_HELP_CONTROLS),
menu_hash_to_str(MENU_LABEL_HELP_CONTROLS),
0, 0, 0);
menu_list_push(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_HELP_LOADING_CONTENT),
menu_hash_to_str(MENU_LABEL_HELP_LOADING_CONTENT),
0, 0, 0);
need_refresh = true;
need_push = true;
break;

1
menu/menu_driver.h
View File

@ -56,6 +56,7 @@ typedef enum
MENU_HELP_WELCOME,
MENU_HELP_EXTRACT,
MENU_HELP_CONTROLS,
MENU_HELP_LOADING_CONTENT,
MENU_HELP_LAST
} menu_help_type_t;

2
menu/menu_hash.h
View File

@ -22,6 +22,8 @@
extern "C" {
#endif
#define MENU_LABEL_HELP_LOADING_CONTENT 0x231d8245U
#define MENU_LABEL_VALUE_HELP_LOADING_CONTENT 0x70bab027U
#define MENU_LABEL_HELP_LIST 0x006af669U
#define MENU_LABEL_VALUE_HELP_LIST 0x6c57426aU