ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(GLUI) Hide 'Select From Collection' (except on RARCH_MOBILE) - 

now handled by tab
This commit is contained in:
twinaphex 2015-10-30 18:32:17 +01:00
parent bd683596b9
commit 958346de78
2 changed files with 57 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
menu/drivers/glui.c
View File

@ -1255,6 +1255,39 @@ static int glui_list_push(menu_displaylist_info_t *info, unsigned type)
switch (type) switch (type)
{ {
case DISPLAYLIST_LOAD_CONTENT_LIST:
menu_entries_clear(info->list);
menu_entries_push(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_LOAD_CONTENT),
menu_hash_to_str(MENU_LABEL_LOAD_CONTENT),
MENU_SETTING_ACTION, 0, 0);
if (core_info_list_num_info_files(global->core_info.list))
{
menu_entries_push(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_DETECT_CORE_LIST),
menu_hash_to_str(MENU_LABEL_DETECT_CORE_LIST),
MENU_SETTING_ACTION, 0, 0);
menu_entries_push(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST),
menu_hash_to_str(MENU_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST),
MENU_SETTING_ACTION, 0, 0);
}
#ifdef HAVE_LIBRETRODB
#ifdef RARCH_MOBILE
menu_entries_push(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_CONTENT_COLLECTION_LIST),
menu_hash_to_str(MENU_LABEL_CONTENT_COLLECTION_LIST),
MENU_SETTING_ACTION, 0, 0);
#endif
#endif
info->need_push = true;
info->need_refresh = true;
ret = 0;
break;
case DISPLAYLIST_MAIN_MENU: case DISPLAYLIST_MAIN_MENU:
menu_entries_clear(info->list); menu_entries_clear(info->list);

57
menu/menu_displaylist.c
View File

@ -1842,38 +1842,6 @@ static int menu_displaylist_parse_scan_directory_list(menu_displaylist_info_t *i
return 0; return 0;
} }
static int menu_displaylist_parse_load_content_list(menu_displaylist_info_t *info)
{
global_t *global = global_get_ptr();
menu_entries_push(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_LOAD_CONTENT),
menu_hash_to_str(MENU_LABEL_LOAD_CONTENT),
MENU_SETTING_ACTION, 0, 0);
if (core_info_list_num_info_files(global->core_info.list))
{
menu_entries_push(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_DETECT_CORE_LIST),
menu_hash_to_str(MENU_LABEL_DETECT_CORE_LIST),
MENU_SETTING_ACTION, 0, 0);
menu_entries_push(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST),
menu_hash_to_str(MENU_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST),
MENU_SETTING_ACTION, 0, 0);
}
#ifdef HAVE_LIBRETRODB
menu_entries_push(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_CONTENT_COLLECTION_LIST),
menu_hash_to_str(MENU_LABEL_CONTENT_COLLECTION_LIST),
MENU_SETTING_ACTION, 0, 0);
#endif
return 0;
}
static int menu_displaylist_parse_options(menu_displaylist_info_t *info) static int menu_displaylist_parse_options(menu_displaylist_info_t *info)
{ {
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
@ -2667,7 +2635,30 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
info->need_refresh = true; info->need_refresh = true;
break; break;
case DISPLAYLIST_LOAD_CONTENT_LIST: case DISPLAYLIST_LOAD_CONTENT_LIST:
ret = menu_displaylist_parse_load_content_list(info); menu_entries_push(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_LOAD_CONTENT),
menu_hash_to_str(MENU_LABEL_LOAD_CONTENT),
MENU_SETTING_ACTION, 0, 0);
if (core_info_list_num_info_files(global->core_info.list))
{
menu_entries_push(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_DETECT_CORE_LIST),
menu_hash_to_str(MENU_LABEL_DETECT_CORE_LIST),
MENU_SETTING_ACTION, 0, 0);
menu_entries_push(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST),
menu_hash_to_str(MENU_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST),
MENU_SETTING_ACTION, 0, 0);
}
#ifdef HAVE_LIBRETRODB
menu_entries_push(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_CONTENT_COLLECTION_LIST),
menu_hash_to_str(MENU_LABEL_CONTENT_COLLECTION_LIST),
MENU_SETTING_ACTION, 0, 0);
#endif
info->need_push = true; info->need_push = true;
info->need_refresh = true; info->need_refresh = true;