Merge pull request #4034 from lasers/add-sublabel

Add sublabel for Network
This commit is contained in:
Twinaphex 2016-11-21 15:57:41 +01:00 committed by GitHub
commit 28e2ecc46d
3 changed files with 17 additions and 2 deletions

View File

@ -1626,8 +1626,12 @@ 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,
"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,

View File

@ -38,7 +38,9 @@
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)
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)
@ -257,9 +259,15 @@ 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;
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;

View File

@ -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,
@ -1676,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,
@ -1704,7 +1708,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,