From 9fe67ac09f6495c15ad08aadabd779761823b06d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Mon, 29 Aug 2016 00:54:51 +0200 Subject: [PATCH] (Menu) Display a Remove from Entry --- intl/msg_hash_us.c | 4 ++++ menu/drivers/xmb.c | 4 ++++ menu/menu_displaylist.c | 7 +++++++ menu/menu_driver.h | 1 + msg_hash.h | 2 ++ 5 files changed, 18 insertions(+) diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index bcc110c24d..3247431b50 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -2796,6 +2796,8 @@ static const char *menu_hash_to_str_us_label_enum(enum msg_hash_enums msg) return "restart_content"; case MENU_ENUM_LABEL_TAKE_SCREENSHOT: return "take_screenshot"; + case MENU_ENUM_LABEL_DELETE_ENTRY: + return "delete_entry"; case MENU_ENUM_LABEL_CORE_UPDATER_LIST: return "core_updater_list"; case MENU_ENUM_LABEL_START_VIDEO_PROCESSOR: @@ -4023,6 +4025,8 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg) return "Core Counters"; case MENU_ENUM_LABEL_VALUE_TAKE_SCREENSHOT: return "Take Screenshot"; + case MENU_ENUM_LABEL_VALUE_DELETE_ENTRY: + return "Remove from Playlist"; case MENU_ENUM_LABEL_VALUE_RESUME: return "Resume"; case MENU_ENUM_LABEL_VALUE_DISK_INDEX: diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index da2216e33d..f789b989f1 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -1621,6 +1621,8 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb, return xmb->textures.list[XMB_TEXTURE_LOADSTATE]; case MENU_ENUM_LABEL_TAKE_SCREENSHOT: return xmb->textures.list[XMB_TEXTURE_SCREENSHOT]; + case MENU_ENUM_LABEL_DELETE_ENTRY: + return xmb->textures.list[XMB_TEXTURE_CLOSE]; case MENU_ENUM_LABEL_RESTART_CONTENT: return xmb->textures.list[XMB_TEXTURE_RELOAD]; case MENU_ENUM_LABEL_RESUME_CONTENT: @@ -1695,6 +1697,8 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb, return xmb->textures.list[XMB_TEXTURE_SHADER_OPTIONS]; case MENU_SETTING_ACTION_SCREENSHOT: return xmb->textures.list[XMB_TEXTURE_SCREENSHOT]; + case MENU_SETTING_ACTION_DELETE_ENTRY: + return xmb->textures.list[XMB_TEXTURE_CLOSE]; case MENU_SETTING_ACTION_RESET: return xmb->textures.list[XMB_TEXTURE_RELOAD]; case MENU_SETTING_ACTION: diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 72861a64ba..45859d26d5 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -2772,10 +2772,17 @@ static int menu_displaylist_parse_horizontal_content_actions( && string_is_equal(menu->deferred_path, fullpath)) menu_displaylist_parse_load_content_settings(info); else + { menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RUN), msg_hash_to_str(MENU_ENUM_LABEL_RUN), MENU_ENUM_LABEL_RUN, FILE_TYPE_PLAYLIST_ENTRY, 0, idx); + menu_entries_append_enum(info->list, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_DELETE_ENTRY), + msg_hash_to_str(MENU_ENUM_LABEL_DELETE_ENTRY), + MENU_ENUM_LABEL_DELETE_ENTRY, + MENU_SETTING_ACTION_DELETE_ENTRY, 0, 0); + } menu_driver_ctl(RARCH_MENU_CTL_PLAYLIST_GET, &playlist); diff --git a/menu/menu_driver.h b/menu/menu_driver.h index 65fec26934..c28e227ceb 100644 --- a/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -190,6 +190,7 @@ enum menu_settings_type MENU_SETTING_ACTION_SAVESTATE, MENU_SETTING_ACTION_LOADSTATE, MENU_SETTING_ACTION_SCREENSHOT, + MENU_SETTING_ACTION_DELETE_ENTRY, MENU_SETTING_ACTION_RESET, MENU_SETTING_STRING_OPTIONS, MENU_SETTING_GROUP, diff --git a/msg_hash.h b/msg_hash.h index ddce2844f0..bb74cb42ae 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1578,6 +1578,8 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_RESTART_CONTENT, MENU_ENUM_LABEL_TAKE_SCREENSHOT, MENU_ENUM_LABEL_VALUE_TAKE_SCREENSHOT, + MENU_ENUM_LABEL_DELETE_ENTRY, + MENU_ENUM_LABEL_VALUE_DELETE_ENTRY, MENU_ENUM_LABEL_CONFIGURATIONS, MENU_ENUM_LABEL_VALUE_CONFIGURATIONS, MENU_ENUM_LABEL_VALUE_CHEAT_FILE_SAVE_AS,