From 6a07780fa0702c48432f01105120e7952b3b5e3d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 2 Feb 2017 07:18:24 +0100 Subject: [PATCH] Add sublabels --- intl/msg_hash_us.h | 8 ++++++++ menu/cbs/menu_cbs_sublabel.c | 16 ++++++++++++++++ menu/drivers/materialui.c | 6 ++++++ msg_hash.h | 5 +---- 4 files changed, 31 insertions(+), 4 deletions(-) diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 8ef9c5b2a8..46c62b003b 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -2691,3 +2691,11 @@ MSG_HASH(MENU_ENUM_SUBLABEL_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE, ) MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_REFRESH_ROOMS, "Scan for new rooms.") +MSG_HASH(MENU_ENUM_SUBLABEL_DELETE_ENTRY, + "Remove this entry from the collection.") +MSG_HASH(MENU_ENUM_SUBLABEL_INFORMATION, + "View more information about the content.") +MSG_HASH(MENU_ENUM_SUBLABEL_RUN, + "Start the content.") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_FILE_BROWSER_SETTINGS, + "Adjusts filebrowser settings.") diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index e7fb78791a..3cd186a723 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -211,6 +211,10 @@ default_sublabel_macro(action_bind_sublabel_core_updater_buildbot_url, MENU_ default_sublabel_macro(action_bind_sublabel_core_updater_buildbot_assets_url, MENU_ENUM_SUBLABEL_BUILDBOT_ASSETS_URL) default_sublabel_macro(action_bind_sublabel_core_updater_auto_extract_archive, MENU_ENUM_SUBLABEL_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE) default_sublabel_macro(action_bind_sublabel_netplay_refresh_rooms, MENU_ENUM_SUBLABEL_NETPLAY_REFRESH_ROOMS) +default_sublabel_macro(action_bind_sublabel_delete_entry, MENU_ENUM_SUBLABEL_DELETE_ENTRY) +default_sublabel_macro(action_bind_sublabel_information, MENU_ENUM_SUBLABEL_INFORMATION) +default_sublabel_macro(action_bind_sublabel_run, MENU_ENUM_SUBLABEL_RUN) +default_sublabel_macro(action_bind_sublabel_menu_filebrowser_settings, MENU_ENUM_SUBLABEL_MENU_FILE_BROWSER_SETTINGS) static int action_bind_sublabel_cheevos_entry( file_list_t *list, @@ -272,6 +276,18 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, { switch (cbs->enum_idx) { + case MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_filebrowser_settings); + break; + case MENU_ENUM_LABEL_RUN: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_run); + break; + case MENU_ENUM_LABEL_INFORMATION: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_information); + break; + case MENU_ENUM_LABEL_DELETE_ENTRY: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_delete_entry); + break; case MENU_ENUM_LABEL_NETPLAY_REFRESH_ROOMS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_netplay_refresh_rooms); break; diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index dc245d4880..4824c06f4c 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -1816,6 +1816,12 @@ static int mui_list_push(void *data, void *userdata, MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR, MENU_SETTING_ACTION, 0, 0); + menu_entries_append_enum(info->list, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS), + msg_hash_to_str(MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS), + MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS, + MENU_SETTING_ACTION, 0, 0); + info->need_push = true; info->need_refresh = true; ret = 0; diff --git a/msg_hash.h b/msg_hash.h index a599ada318..5fc96a1971 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -638,10 +638,9 @@ enum msg_hash_enums MENU_ENUM_LABEL_CONTENT_ACTIONS, - MENU_ENUM_LABEL_RUN, /* Menu settings */ - + MENU_LABEL(RUN), MENU_LABEL(MENU_WALLPAPER), MENU_LABEL(DYNAMIC_WALLPAPER), MENU_LABEL(PAUSE_NONACTIVE), @@ -996,8 +995,6 @@ enum msg_hash_enums MENU_LABEL(REWIND), MENU_LABEL(REWIND_GRANULARITY), - MENU_ENUM_LABEL_VALUE_RUN, - MENU_LABEL(SCREEN_RESOLUTION), MENU_LABEL(TITLE_COLOR), MENU_LABEL(SAVESTATE_AUTO_INDEX),