From d722cec9cdd9e10a8e261e670be610fa890721c3 Mon Sep 17 00:00:00 2001 From: lasers Date: Mon, 21 Nov 2016 09:09:29 -0600 Subject: [PATCH 1/4] Add sublabel for User Interface --- intl/msg_hash_us.h | 2 ++ menu/cbs/menu_cbs_sublabel.c | 4 ++++ msg_hash.h | 4 +++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 6e484c8b6f..35c89c6aaa 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -1628,6 +1628,8 @@ MSG_HASH(MENU_ENUM_SUBLABEL_SAVING_SETTINGS, "Change settings for the saving.") 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_PLAYLIST_SETTINGS, "Change settings for the playlists.") MSG_HASH(MENU_ENUM_SUBLABEL_NETWORK_SETTINGS, diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 6fa978cd89..98b44a951f 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -39,6 +39,7 @@ default_sublabel_macro(action_bind_sublabel_driver_settings_list, ME default_sublabel_macro(action_bind_sublabel_retro_achievements_settings_list, MENU_ENUM_SUBLABEL_RETRO_ACHIEVEMENTS_SETTINGS) default_sublabel_macro(action_bind_sublabel_saving_settings_list, MENU_ENUM_SUBLABEL_SAVING_SETTINGS) default_sublabel_macro(action_bind_sublabel_logging_settings_list, MENU_ENUM_SUBLABEL_LOGGING_SETTINGS) +default_sublabel_macro(action_bind_sublabel_user_interface_settings_list, MENU_ENUM_SUBLABEL_USER_INTERFACE_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_recording_settings_list, MENU_ENUM_SUBLABEL_RECORDING_SETTINGS) @@ -265,6 +266,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_PLAYLIST_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_playlist_settings_list); break; + case MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_user_interface_settings_list); + break; case MENU_ENUM_LABEL_NETWORK_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_network_settings_list); break; diff --git a/msg_hash.h b/msg_hash.h index 3eaa3a0115..e566abd53d 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -820,6 +820,9 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST, MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS, + MENU_ENUM_LABEL_VALUE_USER_INTERFACE_SETTINGS, + MENU_ENUM_SUBLABEL_USER_INTERFACE_SETTINGS, + MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS, MENU_ENUM_LABEL_RETRO_ACHIEVEMENTS_SETTINGS, MENU_ENUM_LABEL_VALUE_RETRO_ACHIEVEMENTS_SETTINGS, @@ -1699,7 +1702,6 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_MENU_ENUM_FILE_BROWSER_SETTINGS, MENU_ENUM_LABEL_MENU_ENUM_SETTINGS, MENU_ENUM_LABEL_VALUE_MENU_ENUM_SETTINGS, - MENU_ENUM_LABEL_VALUE_USER_INTERFACE_SETTINGS, MENU_ENUM_LABEL_PATCH_SETTINGS, MENU_ENUM_LABEL_PLAYLIST_SETTINGS, From fa489f1f76995a587cf5e06b6b6cfdfb3205e0fe Mon Sep 17 00:00:00 2001 From: lasers Date: Mon, 21 Nov 2016 09:25:58 -0600 Subject: [PATCH 2/4] Add sublabel for Privacy --- intl/msg_hash_us.h | 2 ++ menu/cbs/menu_cbs_sublabel.c | 4 ++++ msg_hash.h | 4 +++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 35c89c6aaa..2b25126f6a 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -1630,6 +1630,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_PRIVACY_SETTINGS, + "Change your privacy settings.") MSG_HASH(MENU_ENUM_SUBLABEL_PLAYLIST_SETTINGS, "Change settings for the playlists.") MSG_HASH(MENU_ENUM_SUBLABEL_NETWORK_SETTINGS, diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 98b44a951f..e84c141715 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -40,6 +40,7 @@ default_sublabel_macro(action_bind_sublabel_retro_achievements_settings_list, ME default_sublabel_macro(action_bind_sublabel_saving_settings_list, MENU_ENUM_SUBLABEL_SAVING_SETTINGS) default_sublabel_macro(action_bind_sublabel_logging_settings_list, MENU_ENUM_SUBLABEL_LOGGING_SETTINGS) default_sublabel_macro(action_bind_sublabel_user_interface_settings_list, MENU_ENUM_SUBLABEL_USER_INTERFACE_SETTINGS) +default_sublabel_macro(action_bind_sublabel_privacy_settings_list, MENU_ENUM_SUBLABEL_PRIVACY_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_recording_settings_list, MENU_ENUM_SUBLABEL_RECORDING_SETTINGS) @@ -269,6 +270,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_user_interface_settings_list); break; + case MENU_ENUM_LABEL_PRIVACY_SETTINGS: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_privacy_settings_list); + break; case MENU_ENUM_LABEL_NETWORK_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_network_settings_list); break; diff --git a/msg_hash.h b/msg_hash.h index e566abd53d..62fcdb0386 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -831,7 +831,10 @@ enum msg_hash_enums MENU_ENUM_LABEL_WIFI_SETTINGS, MENU_ENUM_LABEL_USER_SETTINGS, MENU_ENUM_LABEL_DIRECTORY_SETTINGS, + MENU_ENUM_LABEL_PRIVACY_SETTINGS, + MENU_ENUM_LABEL_VALUE_PRIVACY_SETTINGS, + MENU_ENUM_SUBLABEL_PRIVACY_SETTINGS, MENU_ENUM_LABEL_NETWORK_SETTINGS, MENU_ENUM_LABEL_VALUE_NETWORK_SETTINGS, @@ -1716,7 +1719,6 @@ enum msg_hash_enums MENU_ENUM_LABEL_ARCHIVE_SETTINGS, MENU_ENUM_LABEL_VALUE_USER_SETTINGS, MENU_ENUM_LABEL_VALUE_DIRECTORY_SETTINGS, - MENU_ENUM_LABEL_VALUE_PRIVACY_SETTINGS, MENU_ENUM_LABEL_SHADER_APPLY_CHANGES, MENU_ENUM_LABEL_VALUE_SHADER_APPLY_CHANGES, MENU_ENUM_LABEL_SAVE_NEW_CONFIG, From c283fee1f8640f9a47693f036738f08ee66c11e3 Mon Sep 17 00:00:00 2001 From: lasers Date: Mon, 21 Nov 2016 09:46:38 -0600 Subject: [PATCH 3/4] Add sublabel for Directory --- intl/msg_hash_us.h | 2 ++ menu/cbs/menu_cbs_sublabel.c | 4 ++++ msg_hash.h | 4 +++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 2b25126f6a..73d325997a 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -1632,6 +1632,8 @@ MSG_HASH(MENU_ENUM_SUBLABEL_USER_INTERFACE_SETTINGS, "Change settings for the user interface.") MSG_HASH(MENU_ENUM_SUBLABEL_PRIVACY_SETTINGS, "Change your privacy settings.") +MSG_HASH(MENU_ENUM_SUBLABEL_DIRECTORY_SETTINGS, + "Change default directories for this system.") MSG_HASH(MENU_ENUM_SUBLABEL_PLAYLIST_SETTINGS, "Change settings for the playlists.") MSG_HASH(MENU_ENUM_SUBLABEL_NETWORK_SETTINGS, diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index e84c141715..648e35b66f 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -41,6 +41,7 @@ default_sublabel_macro(action_bind_sublabel_saving_settings_list, MENU_ default_sublabel_macro(action_bind_sublabel_logging_settings_list, MENU_ENUM_SUBLABEL_LOGGING_SETTINGS) default_sublabel_macro(action_bind_sublabel_user_interface_settings_list, MENU_ENUM_SUBLABEL_USER_INTERFACE_SETTINGS) default_sublabel_macro(action_bind_sublabel_privacy_settings_list, MENU_ENUM_SUBLABEL_PRIVACY_SETTINGS) +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_recording_settings_list, MENU_ENUM_SUBLABEL_RECORDING_SETTINGS) @@ -273,6 +274,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_PRIVACY_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_privacy_settings_list); break; + case MENU_ENUM_LABEL_DIRECTORY_SETTINGS: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_directory_settings_list); + break; case MENU_ENUM_LABEL_NETWORK_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_network_settings_list); break; diff --git a/msg_hash.h b/msg_hash.h index 62fcdb0386..1d2aae4049 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -830,7 +830,10 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_UPDATER_SETTINGS, MENU_ENUM_LABEL_WIFI_SETTINGS, MENU_ENUM_LABEL_USER_SETTINGS, + MENU_ENUM_LABEL_DIRECTORY_SETTINGS, + MENU_ENUM_LABEL_VALUE_DIRECTORY_SETTINGS, + MENU_ENUM_SUBLABEL_DIRECTORY_SETTINGS, MENU_ENUM_LABEL_PRIVACY_SETTINGS, MENU_ENUM_LABEL_VALUE_PRIVACY_SETTINGS, @@ -1718,7 +1721,6 @@ enum msg_hash_enums MENU_ENUM_LABEL_LAKKA_SERVICES, MENU_ENUM_LABEL_ARCHIVE_SETTINGS, MENU_ENUM_LABEL_VALUE_USER_SETTINGS, - MENU_ENUM_LABEL_VALUE_DIRECTORY_SETTINGS, MENU_ENUM_LABEL_SHADER_APPLY_CHANGES, MENU_ENUM_LABEL_VALUE_SHADER_APPLY_CHANGES, MENU_ENUM_LABEL_SAVE_NEW_CONFIG, From c51bb8c43177db134b24f8b84b777d2c3a096d5d Mon Sep 17 00:00:00 2001 From: lasers Date: Mon, 21 Nov 2016 09:59:17 -0600 Subject: [PATCH 4/4] Add sublabel for Frame Throttle --- intl/msg_hash_us.h | 2 ++ menu/cbs/menu_cbs_sublabel.c | 4 ++++ msg_hash.h | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 73d325997a..10209e968c 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -1624,6 +1624,8 @@ 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_FRAME_THROTTLE_SETTINGS, + "Change settings for rewinding, fast-forwarding, and slow-motion.") MSG_HASH(MENU_ENUM_SUBLABEL_SAVING_SETTINGS, "Change settings for the saving.") MSG_HASH(MENU_ENUM_SUBLABEL_LOGGING_SETTINGS, diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 648e35b66f..659af05248 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -45,6 +45,7 @@ default_sublabel_macro(action_bind_sublabel_directory_settings_list, MENU_ 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_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_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) @@ -277,6 +278,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_DIRECTORY_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_directory_settings_list); break; + case MENU_ENUM_LABEL_FRAME_THROTTLE_SETTINGS: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_frame_throttle_settings_list); + break; case MENU_ENUM_LABEL_NETWORK_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_network_settings_list); break; diff --git a/msg_hash.h b/msg_hash.h index 1d2aae4049..39252abcfa 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1061,9 +1061,9 @@ enum msg_hash_enums MENU_ENUM_LABEL_NO_PERFORMANCE_COUNTERS, MENU_ENUM_LABEL_VALUE_NO_PERFORMANCE_COUNTERS, - MENU_ENUM_LABEL_FRAME_THROTTLE_SETTINGS, MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_SETTINGS, + MENU_ENUM_SUBLABEL_FRAME_THROTTLE_SETTINGS, MENU_ENUM_LABEL_FRAME_THROTTLE_ENABLE, MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_ENABLE,