From 2539de0111ebd58df447a88c4ac5c0496a6b748b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 2 Feb 2017 05:28:23 +0100 Subject: [PATCH] Add sublabels --- intl/msg_hash_us.h | 12 ++++++++++++ menu/cbs/menu_cbs_sublabel.c | 12 ++++++++++++ retroarch.cfg | 6 +++--- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index c3fd496e36..32e5d9d3b5 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -2563,3 +2563,15 @@ MSG_HASH( MENU_ENUM_SUBLABEL_WIFI_DRIVER, "WiFi driver to use." ) +MSG_HASH( + MENU_ENUM_SUBLABEL_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE, + "Filter files being shown in filebrowser by supported extensions." + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_MENU_WALLPAPER, + "Select an image to set as menu wallpaper." + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_DYNAMIC_WALLPAPER, + "Dynamically load a new wallpaper depending on context." + ) diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 8face933f5..e152376aff 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -174,6 +174,9 @@ default_sublabel_macro(action_bind_sublabel_location_driver, MENU_ default_sublabel_macro(action_bind_sublabel_menu_driver, MENU_ENUM_SUBLABEL_MENU_DRIVER) default_sublabel_macro(action_bind_sublabel_record_driver, MENU_ENUM_SUBLABEL_RECORD_DRIVER) default_sublabel_macro(action_bind_sublabel_wifi_driver, MENU_ENUM_SUBLABEL_WIFI_DRIVER) +default_sublabel_macro(action_bind_sublabel_filter_supported_extensions, MENU_ENUM_SUBLABEL_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE) +default_sublabel_macro(action_bind_sublabel_wallpaper, MENU_ENUM_SUBLABEL_MENU_WALLPAPER) +default_sublabel_macro(action_bind_sublabel_dynamic_wallpaper, MENU_ENUM_SUBLABEL_DYNAMIC_WALLPAPER) static int action_bind_sublabel_cheevos_entry( file_list_t *list, @@ -235,6 +238,15 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, { switch (cbs->enum_idx) { + case MENU_ENUM_LABEL_MENU_WALLPAPER: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_wallpaper); + break; + case MENU_ENUM_LABEL_DYNAMIC_WALLPAPER: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_dynamic_wallpaper); + break; + case MENU_ENUM_LABEL_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_filter_supported_extensions); + break; case MENU_ENUM_LABEL_WIFI_DRIVER: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_wifi_driver); break; diff --git a/retroarch.cfg b/retroarch.cfg index 714948d669..abdd4c0781 100644 --- a/retroarch.cfg +++ b/retroarch.cfg @@ -640,10 +640,10 @@ # If disabled, we use separate controls for menu operation. # menu_unified_controls = false -# Enable mouse input inside the menu. +# Enable mouse controls inside the menu. # menu_mouse_enable = false -# Enable touch input inside the menu. +# Enable touch controls inside the menu. # menu_pointer_enable = false # Shows current date and/or time inside menu. @@ -667,7 +667,7 @@ # Wrap-around to beginning and/or end if boundary of list is reached horizontally or vertically # menu_navigation_wraparound_enable = false -# Filter files being show in 'Load Content' by supported extensions +# Filter files being shown in filebrowser by supported extensions # menu_navigation_browser_filter_supported_extensions_enable = true # Collapse subgroup settings into main group to create one big listing of settings