From 627be0fd83ba6ad656f1d459950d59eac0d2f014 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 2 Feb 2017 20:01:07 +0100 Subject: [PATCH] Add sublabels --- intl/msg_hash_us.h | 30 ++++++++++++++++++++++++-- menu/cbs/menu_cbs_sublabel.c | 41 +++++++++++++++++++++++++++++++++++- retroarch.cfg | 7 ++++-- 3 files changed, 73 insertions(+), 5 deletions(-) diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 85b41dd5ab..29df1fa524 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -473,7 +473,7 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_LABEL_VALUE_CONTENT_DATABASE_DIRECTORY, - "Content Database" + "Database" ) MSG_HASH( MENU_ENUM_LABEL_VALUE_CONTENT_DIR, @@ -2784,7 +2784,7 @@ MSG_HASH( 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." + "Supplementary thumbnails (boxarts/misc. images, etc.) are stored here." ) MSG_HASH(MENU_ENUM_SUBLABEL_RGUI_CONFIG_DIRECTORY, "Sets start directory for menu configuration browser.") @@ -2838,3 +2838,29 @@ MSG_HASH(MENU_ENUM_SUBLABEL_DPI_OVERRIDE_ENABLE, "The menu normally scales itself dynamically. If you want to set a specific scaling size instead, enable this.") MSG_HASH(MENU_ENUM_SUBLABEL_DPI_OVERRIDE_VALUE, "Set the custom scaling size here. NOTE: You have to enable 'DPI Override' for this scaling size to take effect.") +MSG_HASH(MENU_ENUM_SUBLABEL_CORE_ASSETS_DIRECTORY, + "Save all downloaded files to this directory.") +MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_REMAPPING_DIRECTORY, + "Save all remapped controls to this directory.") +MSG_HASH(MENU_ENUM_SUBLABEL_LIBRETRO_DIR_PATH, + "A directory for where to search for applications/cores.") +MSG_HASH(MENU_ENUM_SUBLABEL_LIBRETRO_INFO_PATH, + "Application/core information files are stored here.") +MSG_HASH(MENU_ENUM_SUBLABEL_JOYPAD_AUTOCONFIG_DIR, + "If a joypad is plugged in, that joypad will be autoconfigured if a config file corresponding to it is present inside this directory.") +MSG_HASH(MENU_ENUM_SUBLABEL_PLAYLIST_DIRECTORY, + "Save all collections to this directory.") +MSG_HASH( + MENU_ENUM_SUBLABEL_CACHE_DIRECTORY, + "If set to a directory, content which is temporarily extracted (e.g. from archives) will be extracted to this directory." + ) +MSG_HASH(MENU_ENUM_SUBLABEL_CURSOR_DIRECTORY, + "Saved queries are stored to this directory.") +MSG_HASH( + MENU_ENUM_SUBLABEL_CONTENT_DATABASE_DIRECTORY, + "Databases are stored to this directory." + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_ASSETS_DIRECTORY, + "This location is queried by default when menu interfaces try to look for loadable assets, etc." + ) diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 98c86b4942..3bb964b0cf 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -272,7 +272,16 @@ default_sublabel_macro(action_bind_sublabel_menu_header_opacity, default_sublabel_macro(action_bind_sublabel_menu_footer_opacity, MENU_ENUM_SUBLABEL_MATERIALUI_MENU_FOOTER_OPACITY) default_sublabel_macro(action_bind_sublabel_dpi_override_enable, MENU_ENUM_SUBLABEL_DPI_OVERRIDE_ENABLE) default_sublabel_macro(action_bind_sublabel_dpi_override_value, MENU_ENUM_SUBLABEL_DPI_OVERRIDE_VALUE) - +default_sublabel_macro(action_bind_sublabel_core_assets_directory, MENU_ENUM_SUBLABEL_CORE_ASSETS_DIRECTORY) +default_sublabel_macro(action_bind_sublabel_input_remapping_directory, MENU_ENUM_SUBLABEL_INPUT_REMAPPING_DIRECTORY) +default_sublabel_macro(action_bind_sublabel_core_directory, MENU_ENUM_SUBLABEL_LIBRETRO_DIR_PATH) +default_sublabel_macro(action_bind_sublabel_core_info_directory, MENU_ENUM_SUBLABEL_LIBRETRO_INFO_PATH) +default_sublabel_macro(action_bind_sublabel_joypad_autoconfig_directory, MENU_ENUM_SUBLABEL_JOYPAD_AUTOCONFIG_DIR) +default_sublabel_macro(action_bind_sublabel_playlists_directory, MENU_ENUM_SUBLABEL_PLAYLIST_DIRECTORY) +default_sublabel_macro(action_bind_sublabel_cache_directory, MENU_ENUM_SUBLABEL_CACHE_DIRECTORY) +default_sublabel_macro(action_bind_sublabel_database_directory, MENU_ENUM_SUBLABEL_CONTENT_DATABASE_DIRECTORY) +default_sublabel_macro(action_bind_sublabel_cursor_directory, MENU_ENUM_SUBLABEL_CURSOR_DIRECTORY) +default_sublabel_macro(action_bind_sublabel_assets_directory, MENU_ENUM_SUBLABEL_ASSETS_DIRECTORY) static int action_bind_sublabel_cheevos_entry( file_list_t *list, @@ -334,6 +343,36 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, { switch (cbs->enum_idx) { + case MENU_ENUM_LABEL_ASSETS_DIRECTORY: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_assets_directory); + break; + case MENU_ENUM_LABEL_CONTENT_DATABASE_DIRECTORY: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_database_directory); + break; + case MENU_ENUM_LABEL_CURSOR_DIRECTORY: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_cursor_directory); + break; + case MENU_ENUM_LABEL_CACHE_DIRECTORY: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_cache_directory); + break; + case MENU_ENUM_LABEL_PLAYLIST_DIRECTORY: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_playlists_directory); + break; + case MENU_ENUM_LABEL_JOYPAD_AUTOCONFIG_DIR: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_joypad_autoconfig_directory); + break; + case MENU_ENUM_LABEL_LIBRETRO_INFO_PATH: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_core_info_directory); + break; + case MENU_ENUM_LABEL_LIBRETRO_DIR_PATH: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_core_directory); + break; + case MENU_ENUM_LABEL_CORE_ASSETS_DIRECTORY: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_core_assets_directory); + break; + case MENU_ENUM_LABEL_INPUT_REMAPPING_DIRECTORY: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_remapping_directory); + break; case MENU_ENUM_LABEL_DPI_OVERRIDE_ENABLE: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_dpi_override_enable); break; diff --git a/retroarch.cfg b/retroarch.cfg index 2601c908fe..b66f285313 100644 --- a/retroarch.cfg +++ b/retroarch.cfg @@ -15,16 +15,19 @@ # Save all downloaded files to this directory. # core_assets_directory = -# Save all input remapping files to this directory. +# Save all remapped controls to this directory. # input_remapping_directory = -# Save all playlist files to this directory. +# Save all playlists/collections to this directory. # playlist_directory = # If set to a directory, the content history playlist will be saved # to this directory. # content_history_dir = +# Saved queries are stored to this directory. +# cursor_directory = + # Automatically saves a savestate at the end of RetroArch's lifetime. # The path is $SRAM_PATH.auto. # RetroArch will automatically load any savestate with this path on startup if savestate_auto_load is set.