From 57981b27141d35d15cdadc61d67a262a08f6e9b3 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 3 Nov 2016 19:05:04 +0100 Subject: [PATCH] Hide 'Add Content' list in MaterialUI, and move it to 'Playlists' tab --- menu/drivers/materialui.c | 10 +++------- menu/menu_displaylist.c | 7 +++++++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index d336b79abd..685b269553 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -1687,9 +1687,6 @@ static int mui_list_push(void *data, void *userdata, menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); } - entry.enum_idx = MENU_ENUM_LABEL_START_VIDEO_PROCESSOR; - menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); - #ifndef HAVE_DYNAMIC if (frontend_driver_has_fork()) #endif @@ -1705,10 +1702,6 @@ static int mui_list_push(void *data, void *userdata, menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); #if defined(HAVE_NETWORKING) -#if defined(HAVE_LIBRETRODB) - entry.enum_idx = MENU_ENUM_LABEL_ADD_CONTENT_LIST; - menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); -#endif entry.enum_idx = MENU_ENUM_LABEL_ONLINE_UPDATER; menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); @@ -1730,6 +1723,9 @@ static int mui_list_push(void *data, void *userdata, entry.enum_idx = MENU_ENUM_LABEL_SAVE_NEW_CONFIG; menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); + entry.enum_idx = MENU_ENUM_LABEL_START_VIDEO_PROCESSOR; + menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); + entry.enum_idx = MENU_ENUM_LABEL_START_NET_RETROPAD; menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index eca1c64571..00b7995b2f 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -3210,11 +3210,18 @@ static int menu_displaylist_parse_playlists( #ifdef HAVE_LIBRETRODB if (!horizontal) + { menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SCAN_DIRECTORY), msg_hash_to_str(MENU_ENUM_LABEL_SCAN_DIRECTORY), MENU_ENUM_LABEL_SCAN_DIRECTORY, MENU_SETTING_ACTION, 0, 0); + menu_entries_append_enum(info->list, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SCAN_FILE), + msg_hash_to_str(MENU_ENUM_LABEL_SCAN_FILE), + MENU_ENUM_LABEL_SCAN_FILE, + MENU_SETTING_ACTION, 0, 0); + } #endif if (list_size == 0)