From 77690781ead74dab22163f8932a584480ac2265a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 2 Feb 2017 09:43:07 +0100 Subject: [PATCH] Add sublabels --- intl/msg_hash_lbl.h | 2 ++ intl/msg_hash_us.h | 17 ++++++++++++++++- menu/cbs/menu_cbs_sublabel.c | 24 ++++++++++++++++++++++++ msg_hash.h | 2 +- 4 files changed, 43 insertions(+), 2 deletions(-) diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index 7f3c39b68d..4ca2d60464 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -337,6 +337,8 @@ MSG_HASH(MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT, "download_core_content") MSG_HASH(MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS, "download_core_content_dirs") +MSG_HASH(MENU_ENUM_LABEL_CONTENT_DIR, + "content_directory") MSG_HASH(MENU_ENUM_LABEL_DPI_OVERRIDE_ENABLE, "dpi_override_enable") MSG_HASH(MENU_ENUM_LABEL_DPI_OVERRIDE_VALUE, diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 8a952dcd50..f488e914d3 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -553,7 +553,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DATABASE_SELECTION, MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_ENTRY, "Remove") MSG_HASH(MENU_ENUM_LABEL_VALUE_FAVORITES, - "Favorites") + "Start directory") MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_CONTENT, "") MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_DEFAULT, @@ -2765,3 +2765,18 @@ MSG_HASH(MENU_ENUM_SUBLABEL_THREADED_DATA_RUNLOOP_ENABLE, "Perform tasks on a seperate thread.") MSG_HASH(MENU_ENUM_SUBLABEL_PLAYLIST_ENTRY_REMOVE, "Allow the user to remove entries from collections.") +MSG_HASH(MENU_ENUM_SUBLABEL_SYSTEM_DIRECTORY, + "Sets the System directory. Cores can query for this directory to load BIOSes, system-specific configs, etc.") +MSG_HASH(MENU_ENUM_SUBLABEL_RGUI_BROWSER_DIRECTORY, + "Sets start directory for the filebrowser.") +MSG_HASH( + MENU_ENUM_SUBLABEL_CONTENT_DIR, + "Usually set by developers who bundle libretro/RetroArch apps to point to assets." + ) +MSG_HASH(MENU_ENUM_SUBLABEL_DYNAMIC_WALLPAPERS_DIRECTORY, + "The place to store the wallpapers dynamically loaded by the menu depending on context.") +MSG_HASH(MENU_ENUM_SUBLABEL_THUMBNAILS_DIRECTORY, + "To store thumbnail files." + ) +MSG_HASH(MENU_ENUM_SUBLABEL_RGUI_CONFIG_DIRECTORY, + "Sets start directory for menu configuration browser.") diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 33971d9712..bcb1841ab3 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -242,6 +242,12 @@ default_sublabel_macro(action_bind_sublabel_core_options, default_sublabel_macro(action_bind_sublabel_show_advanced_settings, MENU_ENUM_SUBLABEL_SHOW_ADVANCED_SETTINGS) default_sublabel_macro(action_bind_sublabel_threaded_data_runloop_enable, MENU_ENUM_SUBLABEL_THREADED_DATA_RUNLOOP_ENABLE) default_sublabel_macro(action_bind_sublabel_playlist_entry_remove, MENU_ENUM_SUBLABEL_PLAYLIST_ENTRY_REMOVE) +default_sublabel_macro(action_bind_sublabel_system_directory, MENU_ENUM_SUBLABEL_SYSTEM_DIRECTORY) +default_sublabel_macro(action_bind_sublabel_rgui_browser_directory, MENU_ENUM_SUBLABEL_RGUI_BROWSER_DIRECTORY) +default_sublabel_macro(action_bind_sublabel_content_dir, MENU_ENUM_SUBLABEL_CONTENT_DIR) +default_sublabel_macro(action_bind_dynamic_wallpapers_directory, MENU_ENUM_SUBLABEL_DYNAMIC_WALLPAPERS_DIRECTORY) +default_sublabel_macro(action_bind_thumbnails_directory, MENU_ENUM_SUBLABEL_THUMBNAILS_DIRECTORY) +default_sublabel_macro(action_bind_rgui_config_directory, MENU_ENUM_SUBLABEL_RGUI_CONFIG_DIRECTORY) static int action_bind_sublabel_cheevos_entry( file_list_t *list, @@ -303,6 +309,24 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, { switch (cbs->enum_idx) { + case MENU_ENUM_LABEL_RGUI_CONFIG_DIRECTORY: + BIND_ACTION_SUBLABEL(cbs, action_bind_rgui_config_directory); + break; + case MENU_ENUM_LABEL_THUMBNAILS_DIRECTORY: + BIND_ACTION_SUBLABEL(cbs, action_bind_thumbnails_directory); + break; + case MENU_ENUM_LABEL_DYNAMIC_WALLPAPERS_DIRECTORY: + BIND_ACTION_SUBLABEL(cbs, action_bind_dynamic_wallpapers_directory); + break; + case MENU_ENUM_LABEL_CONTENT_DIR: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_content_dir); + break; + case MENU_ENUM_LABEL_RGUI_BROWSER_DIRECTORY: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_rgui_browser_directory); + break; + case MENU_ENUM_LABEL_SYSTEM_DIRECTORY: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_system_directory); + break; case MENU_ENUM_LABEL_PLAYLIST_ENTRY_REMOVE: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_playlist_entry_remove); break; diff --git a/msg_hash.h b/msg_hash.h index b673488e02..56a133b2b1 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1436,9 +1436,9 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_V4L2_SUPPORT, MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT, - MENU_ENUM_LABEL_VALUE_CONTENT_DIR, MENU_ENUM_LABEL_VALUE_CORE_ASSETS_DIR, + MENU_LABEL(CONTENT_DIR), MENU_LABEL(DATABASE_SELECTION), MENU_LABEL(DATABASE_CURSOR_LIST), MENU_LABEL(DATABASE_CURSOR_LIST_ENTRY_DEVELOPER),