From 953bf8cf5b4d02bcde9c251be234aeffab9d0354 Mon Sep 17 00:00:00 2001 From: lasers Date: Mon, 21 Nov 2016 08:44:59 -0600 Subject: [PATCH 1/2] Add sublabel for Network --- intl/msg_hash_us.h | 2 ++ menu/cbs/menu_cbs_sublabel.c | 4 ++++ msg_hash.h | 6 ++++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index c59b5e2a5f..7eafcad25c 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_PLAYLIST_SETTINGS, "Change settings for the playlists.") +MSG_HASH(MENU_ENUM_SUBLABEL_NETWORK_SETTINGS, + "Change settings for the network.") MSG_HASH(MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST, "Scan contents and add to the database.") MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_SETTINGS, diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index b132d0996b..e01e4668c4 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_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_core_settings_list, MENU_ENUM_SUBLABEL_CORE_SETTINGS) default_sublabel_macro(action_bind_sublabel_information_list_list, MENU_ENUM_SUBLABEL_INFORMATION_LIST_LIST) @@ -260,6 +261,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_NETWORK_SETTINGS: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_network_settings_list); + break; case MENU_ENUM_LABEL_RETRO_ACHIEVEMENTS_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_retro_achievements_settings_list); break; diff --git a/msg_hash.h b/msg_hash.h index 145c17a682..7827473491 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -825,12 +825,15 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_RETRO_ACHIEVEMENTS_SETTINGS, MENU_ENUM_LABEL_UPDATER_SETTINGS, MENU_ENUM_LABEL_VALUE_UPDATER_SETTINGS, - MENU_ENUM_LABEL_NETWORK_SETTINGS, MENU_ENUM_LABEL_WIFI_SETTINGS, MENU_ENUM_LABEL_USER_SETTINGS, MENU_ENUM_LABEL_DIRECTORY_SETTINGS, MENU_ENUM_LABEL_PRIVACY_SETTINGS, + MENU_ENUM_LABEL_NETWORK_SETTINGS, + MENU_ENUM_LABEL_VALUE_NETWORK_SETTINGS, + MENU_ENUM_SUBLABEL_NETWORK_SETTINGS, + MENU_ENUM_LABEL_CONNECT_WIFI, MENU_ENUM_LABEL_MENU_ENUM_LINEAR_FILTER, @@ -1704,7 +1707,6 @@ enum msg_hash_enums MENU_ENUM_LABEL_CORE_UPDATER_SETTINGS, MENU_ENUM_LABEL_VALUE_CORE_UPDATER_SETTINGS, - MENU_ENUM_LABEL_VALUE_NETWORK_SETTINGS, MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS, MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES, MENU_ENUM_LABEL_LAKKA_SERVICES, From f92afb508bacaaf0eea6a6cf0a44c5ad5d78af0a Mon Sep 17 00:00:00 2001 From: lasers Date: Mon, 21 Nov 2016 08:53:29 -0600 Subject: [PATCH 2/2] Add sublabel for Logging --- intl/msg_hash_us.h | 2 ++ menu/cbs/menu_cbs_sublabel.c | 4 ++++ msg_hash.h | 1 + 3 files changed, 7 insertions(+) diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 7eafcad25c..6e484c8b6f 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -1626,6 +1626,8 @@ MSG_HASH(MENU_ENUM_SUBLABEL_RECORDING_SETTINGS, "Change settings for the recording.") 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_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 e01e4668c4..6fa978cd89 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -38,6 +38,7 @@ default_sublabel_macro(action_bind_sublabel_driver_settings_list, MENU_ENUM_SUBLABEL_DRIVER_SETTINGS) 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_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) @@ -258,6 +259,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_SAVING_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_saving_settings_list); break; + case MENU_ENUM_LABEL_LOGGING_SETTINGS: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_logging_settings_list); + break; case MENU_ENUM_LABEL_PLAYLIST_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_playlist_settings_list); break; diff --git a/msg_hash.h b/msg_hash.h index 7827473491..3eaa3a0115 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1679,6 +1679,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_LOGGING_SETTINGS, MENU_ENUM_LABEL_VALUE_LOGGING_SETTINGS, + MENU_ENUM_SUBLABEL_LOGGING_SETTINGS, MENU_ENUM_LABEL_SAVING_SETTINGS, MENU_ENUM_LABEL_VALUE_SAVING_SETTINGS,