libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-27 18:20:27 +00:00
Code Issues Actions 44 Packages Projects Releases Wiki Activity

Merge pull request #4036 from lasers/add-sublabel

Browse Source 
Add sublabel for Onscreen, Driver, Help
This commit is contained in:
Twinaphex 2016-11-21 19:48:33 +01:00 committed by GitHub
commit 9dca196cf8
3 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intl/msg_hash_us.h
View File

@ -1617,13 +1617,15 @@ MSG_HASH(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_TWO,
MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_HARDCORE_MODE_ENABLE,
"Enable or disable savestates, cheats, rewind, fast-forward, pause, and slow-motion for all games.")
MSG_HASH(MENU_ENUM_SUBLABEL_DRIVER_SETTINGS,
"Change drivers for the system.")
"Change drivers for this system.")
MSG_HASH(MENU_ENUM_SUBLABEL_RETRO_ACHIEVEMENTS_SETTINGS,
"Change settings for the achievements.")
MSG_HASH(MENU_ENUM_SUBLABEL_CORE_SETTINGS,
"Change settings for the core.")
MSG_HASH(MENU_ENUM_SUBLABEL_RECORDING_SETTINGS,
"Change settings for the recording.")
MSG_HASH(MENU_ENUM_SUBLABEL_ONSCREEN_DISPLAY_SETTINGS,
"Change settings for display overlay, keyboard overlay and onscreen notifications.")
MSG_HASH(MENU_ENUM_SUBLABEL_FRAME_THROTTLE_SETTINGS,
"Change settings for rewinding, fast-forwarding, and slow-motion.")
MSG_HASH(MENU_ENUM_SUBLABEL_SAVING_SETTINGS,
@ -1632,6 +1634,8 @@ MSG_HASH(MENU_ENUM_SUBLABEL_LOGGING_SETTINGS,
"Change settings for the logging.")
MSG_HASH(MENU_ENUM_SUBLABEL_USER_INTERFACE_SETTINGS,
"Change settings for the user interface.")
MSG_HASH(MENU_ENUM_SUBLABEL_USER_SETTINGS,
"Accounts, Username, Language.")
MSG_HASH(MENU_ENUM_SUBLABEL_PRIVACY_SETTINGS,
"Change your privacy settings.")
MSG_HASH(MENU_ENUM_SUBLABEL_DIRECTORY_SETTINGS,
@ -1696,6 +1700,8 @@ MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_SETTINGS,
"Adjusts settings for video output.")
MSG_HASH(MENU_ENUM_SUBLABEL_WIFI_SETTINGS,
"Scans for wireless networks and establishes connection.")
MSG_HASH(MENU_ENUM_SUBLABEL_HELP_LIST,
"Learn more about how it works.")
MSG_HASH(MSG_APPENDED_DISK,
"Appended disk")
MSG_HASH(MSG_APPLICATION_DIR,

12
menu/cbs/menu_cbs_sublabel.c
View File

@ -44,8 +44,10 @@ default_sublabel_macro(action_bind_sublabel_privacy_settings_list, MENU_
default_sublabel_macro(action_bind_sublabel_directory_settings_list, MENU_ENUM_SUBLABEL_DIRECTORY_SETTINGS)
default_sublabel_macro(action_bind_sublabel_playlist_settings_list, MENU_ENUM_SUBLABEL_PLAYLIST_SETTINGS)
default_sublabel_macro(action_bind_sublabel_network_settings_list, MENU_ENUM_SUBLABEL_NETWORK_SETTINGS)
default_sublabel_macro(action_bind_sublabel_user_settings_list, MENU_ENUM_SUBLABEL_USER_SETTINGS)
default_sublabel_macro(action_bind_sublabel_recording_settings_list, MENU_ENUM_SUBLABEL_RECORDING_SETTINGS)
default_sublabel_macro(action_bind_sublabel_frame_throttle_settings_list, MENU_ENUM_SUBLABEL_FRAME_THROTTLE_SETTINGS)
default_sublabel_macro(action_bind_sublabel_onscreen_display_settings_list,MENU_ENUM_SUBLABEL_ONSCREEN_DISPLAY_SETTINGS)
default_sublabel_macro(action_bind_sublabel_core_settings_list, MENU_ENUM_SUBLABEL_CORE_SETTINGS)
default_sublabel_macro(action_bind_sublabel_information_list_list, MENU_ENUM_SUBLABEL_INFORMATION_LIST_LIST)
default_sublabel_macro(action_bind_sublabel_cheevos_hardcore_mode_enable, MENU_ENUM_SUBLABEL_CHEEVOS_HARDCORE_MODE_ENABLE)
@ -55,6 +57,7 @@ default_sublabel_macro(action_bind_sublabel_suspend_screensaver_enable, MENU_
default_sublabel_macro(action_bind_sublabel_audio_settings_list, MENU_ENUM_SUBLABEL_AUDIO_SETTINGS)
default_sublabel_macro(action_bind_sublabel_input_settings_list, MENU_ENUM_SUBLABEL_INPUT_SETTINGS)
default_sublabel_macro(action_bind_sublabel_wifi_settings_list, MENU_ENUM_SUBLABEL_WIFI_SETTINGS)
default_sublabel_macro(action_bind_sublabel_help_list, MENU_ENUM_SUBLABEL_HELP_LIST)
default_sublabel_macro(action_bind_sublabel_services_settings_list, MENU_ENUM_SUBLABEL_SERVICES_SETTINGS)
default_sublabel_macro(action_bind_sublabel_ssh_enable, MENU_ENUM_SUBLABEL_SSH_ENABLE)
default_sublabel_macro(action_bind_sublabel_samba_enable, MENU_ENUM_SUBLABEL_SAMBA_ENABLE )
@ -286,9 +289,15 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_FRAME_THROTTLE_SETTINGS:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_frame_throttle_settings_list);
break;
case MENU_ENUM_LABEL_ONSCREEN_DISPLAY_SETTINGS:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_onscreen_display_settings_list);
break;
case MENU_ENUM_LABEL_NETWORK_SETTINGS:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_network_settings_list);
break;
case MENU_ENUM_LABEL_USER_SETTINGS:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_user_settings_list);
break;
case MENU_ENUM_LABEL_RETRO_ACHIEVEMENTS_SETTINGS:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_retro_achievements_settings_list);
break;
@ -298,6 +307,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_WIFI_SETTINGS:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_wifi_settings_list);
break;
case MENU_ENUM_LABEL_HELP_LIST:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_help_list);
break;
case MENU_ENUM_LABEL_LAKKA_SERVICES:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_services_settings_list);
break;

9
msg_hash.h
View File

@ -829,7 +829,10 @@ enum msg_hash_enums
MENU_ENUM_LABEL_UPDATER_SETTINGS,
MENU_ENUM_LABEL_VALUE_UPDATER_SETTINGS,
MENU_ENUM_LABEL_WIFI_SETTINGS,
MENU_ENUM_LABEL_USER_SETTINGS,
MENU_ENUM_LABEL_VALUE_USER_SETTINGS,
MENU_ENUM_SUBLABEL_USER_SETTINGS,
MENU_ENUM_LABEL_DIRECTORY_SETTINGS,
MENU_ENUM_LABEL_VALUE_DIRECTORY_SETTINGS,
@ -905,6 +908,7 @@ enum msg_hash_enums
MENU_ENUM_LABEL_HELP_LIST,
MENU_ENUM_LABEL_VALUE_HELP_LIST,
MENU_ENUM_SUBLABEL_HELP_LIST,
MENU_ENUM_LABEL_VALUE_HELP_CONTROLS,
MENU_ENUM_LABEL_HELP_CONTROLS,
@ -1722,15 +1726,18 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES,
MENU_ENUM_LABEL_LAKKA_SERVICES,
MENU_ENUM_LABEL_ARCHIVE_SETTINGS,
MENU_ENUM_LABEL_VALUE_USER_SETTINGS,
MENU_ENUM_LABEL_SHADER_APPLY_CHANGES,
MENU_ENUM_LABEL_VALUE_SHADER_APPLY_CHANGES,
MENU_ENUM_LABEL_SAVE_NEW_CONFIG,
MENU_ENUM_LABEL_VALUE_SAVE_NEW_CONFIG,
MENU_ENUM_LABEL_ONSCREEN_DISPLAY_SETTINGS,
MENU_ENUM_LABEL_VALUE_ONSCREEN_DISPLAY_SETTINGS,
MENU_ENUM_SUBLABEL_ONSCREEN_DISPLAY_SETTINGS,
MENU_ENUM_LABEL_ONSCREEN_OVERLAY_SETTINGS,
MENU_ENUM_LABEL_VALUE_ONSCREEN_OVERLAY_SETTINGS,
MENU_ENUM_LABEL_VALUE_CHEAT_APPLY_CHANGES,
MENU_ENUM_LABEL_CHEAT_APPLY_CHANGES,
MENU_ENUM_LABEL_CUSTOM_BIND,