From cb467c8656954f49d4e01a845bc28661435fff03 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 11 Jul 2019 06:04:42 +0200 Subject: [PATCH] Add titles and sublabels --- menu/cbs/menu_cbs_sublabel.c | 4 ++++ menu/cbs/menu_cbs_title.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 3502d141ca..f7dbe68cd5 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -552,6 +552,7 @@ default_sublabel_macro(action_bind_sublabel_cheat_file_load_append, default_sublabel_macro(action_bind_sublabel_cheat_file_save_as, MENU_ENUM_SUBLABEL_CHEAT_FILE_SAVE_AS) default_sublabel_macro(action_bind_sublabel_quick_menu, MENU_ENUM_SUBLABEL_CONTENT_SETTINGS) default_sublabel_macro(action_bind_sublabel_core_information, MENU_ENUM_SUBLABEL_CORE_INFORMATION) +default_sublabel_macro(action_bind_sublabel_disc_information, MENU_ENUM_SUBLABEL_DISC_INFORMATION) default_sublabel_macro(action_bind_sublabel_video_aspect_ratio, MENU_ENUM_SUBLABEL_VIDEO_ASPECT_RATIO) default_sublabel_macro(action_bind_sublabel_video_viewport_custom_height, MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_HEIGHT) default_sublabel_macro(action_bind_sublabel_video_viewport_custom_width, MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_WIDTH) @@ -1155,6 +1156,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_CORE_INFORMATION: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_core_information); break; + case MENU_ENUM_LABEL_DISC_INFORMATION: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_disc_information); + break; case MENU_ENUM_LABEL_CONTENT_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_quick_menu); break; diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index 46370580c6..717eb75260 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -126,6 +126,8 @@ default_title_macro(action_get_core_settings_list, MENU_ENUM_LABEL_ default_title_macro(action_get_video_settings_list, MENU_ENUM_LABEL_VALUE_VIDEO_SETTINGS) default_title_macro(action_get_crt_switchres_settings_list, MENU_ENUM_LABEL_VALUE_CRT_SWITCHRES_SETTINGS) default_title_macro(action_get_configuration_settings_list, MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS) +default_title_macro(action_get_load_disc_list, MENU_ENUM_LABEL_VALUE_LOAD_DISC) +default_title_macro(action_get_dump_disc_list, MENU_ENUM_LABEL_VALUE_DUMP_DISC) default_title_macro(action_get_saving_settings_list, MENU_ENUM_LABEL_VALUE_SAVING_SETTINGS) default_title_macro(action_get_logging_settings_list, MENU_ENUM_LABEL_VALUE_LOGGING_SETTINGS) default_title_macro(action_get_frame_throttle_settings_list, MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_SETTINGS) @@ -165,6 +167,7 @@ default_title_macro(action_get_load_content_special, MENU_ENUM_LABEL_ default_title_macro(action_get_cursor_manager_list, MENU_ENUM_LABEL_VALUE_CURSOR_MANAGER) default_title_macro(action_get_database_manager_list, MENU_ENUM_LABEL_VALUE_DATABASE_MANAGER) default_title_macro(action_get_system_information_list, MENU_ENUM_LABEL_VALUE_SYSTEM_INFORMATION) +default_title_macro(action_get_disc_information_list, MENU_ENUM_LABEL_VALUE_DISC_INFORMATION) default_title_macro(action_get_network_information_list, MENU_ENUM_LABEL_VALUE_NETWORK_INFORMATION) default_title_macro(action_get_settings_list, MENU_ENUM_LABEL_VALUE_SETTINGS) default_title_macro(action_get_title_information_list, MENU_ENUM_LABEL_VALUE_INFORMATION_LIST) @@ -375,6 +378,16 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, BIND_ACTION_GET_TITLE(cbs, action_get_core_settings_list); return 0; } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_DUMP_DISC_LIST))) + { + BIND_ACTION_GET_TITLE(cbs, action_get_dump_disc_list); + return 0; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_LOAD_DISC_LIST))) + { + BIND_ACTION_GET_TITLE(cbs, action_get_load_disc_list); + return 0; + } else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CONFIGURATION_SETTINGS_LIST))) { BIND_ACTION_GET_TITLE(cbs, action_get_configuration_settings_list); @@ -572,6 +585,11 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, BIND_ACTION_GET_TITLE(cbs, action_get_system_information_list); return 0; } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DISC_INFORMATION))) + { + BIND_ACTION_GET_TITLE(cbs, action_get_disc_information_list); + return 0; + } else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_NETWORK_INFORMATION))) { BIND_ACTION_GET_TITLE(cbs, action_get_network_information_list);