diff --git a/config.def.h b/config.def.h index a183446ed8..a8134cf740 100644 --- a/config.def.h +++ b/config.def.h @@ -239,6 +239,7 @@ static bool default_block_config_read = true; static bool menu_show_online_updater = true; static bool menu_show_load_core = true; static bool menu_show_load_content = true; +static bool menu_show_information = true; #if defined(HAVE_LAKKA) || defined(VITA) static bool menu_show_core_updater = false; diff --git a/configuration.c b/configuration.c index 684a050a38..d74681b7bb 100644 --- a/configuration.c +++ b/configuration.c @@ -1204,6 +1204,7 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings, SETTING_BOOL("xmb_show_music", &settings->bools.menu_xmb_show_music, true, xmb_show_music, false); SETTING_BOOL("menu_show_load_core", &settings->bools.menu_show_load_core, true, menu_show_load_core, false); SETTING_BOOL("menu_show_load_content", &settings->bools.menu_show_load_content, true, menu_show_load_content, false); + SETTING_BOOL("menu_show_information", &settings->bools.menu_show_information, true, menu_show_information, false); SETTING_BOOL("menu_show_online_updater", &settings->bools.menu_show_online_updater, true, menu_show_online_updater, false); SETTING_BOOL("menu_show_core_updater", &settings->bools.menu_show_core_updater, true, menu_show_core_updater, false); #ifdef HAVE_FFMPEG diff --git a/configuration.h b/configuration.h index 4201c17274..af6bf1196e 100644 --- a/configuration.h +++ b/configuration.h @@ -129,6 +129,7 @@ typedef struct settings bool menu_show_core_updater; bool menu_show_load_core; bool menu_show_load_content; + bool menu_show_information; bool menu_materialui_icons_enable; bool menu_xmb_shadows_enable; bool menu_xmb_show_settings; diff --git a/intl/msg_hash_chs.h b/intl/msg_hash_chs.h index 1297f39646..5ed0503e9a 100644 --- a/intl/msg_hash_chs.h +++ b/intl/msg_hash_chs.h @@ -3071,3 +3071,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_LOAD_CONTENT, "Show Load Content") MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_LOAD_CONTENT, "Show/hide the 'Load Content' option.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_INFORMATION, + "Show Information") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_INFORMATION, + "Show/hide the 'Information' option.") diff --git a/intl/msg_hash_cht.h b/intl/msg_hash_cht.h index 9b4c6c1765..e1d65640c7 100644 --- a/intl/msg_hash_cht.h +++ b/intl/msg_hash_cht.h @@ -3071,3 +3071,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_LOAD_CONTENT, "Show Load Content") MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_LOAD_CONTENT, "Show/hide the 'Load Content' option.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_INFORMATION, + "Show Information") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_INFORMATION, + "Show/hide the 'Information' option.") diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h index 05cc56f83a..54d30cea4d 100644 --- a/intl/msg_hash_de.h +++ b/intl/msg_hash_de.h @@ -3065,3 +3065,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_LOAD_CONTENT, "Show Load Content") MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_LOAD_CONTENT, "Show/hide the 'Load Content' option.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_INFORMATION, + "Show Information") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_INFORMATION, + "Show/hide the 'Information' option.") diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index 3c795534e0..0fb01a7c76 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -2934,3 +2934,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_LOAD_CONTENT, "Show Load Content") MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_LOAD_CONTENT, "Show/hide the 'Load Content' option.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_INFORMATION, + "Show Information") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_INFORMATION, + "Show/hide the 'Information' option.") diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index 1a388cdfa9..576da72d2f 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -3103,3 +3103,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_LOAD_CONTENT, "Show Load Content") MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_LOAD_CONTENT, "Show/hide the 'Load Content' option.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_INFORMATION, + "Show Information") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_INFORMATION, + "Show/hide the 'Information' option.") diff --git a/intl/msg_hash_it.h b/intl/msg_hash_it.h index 6b711ccf70..4f0fe73486 100644 --- a/intl/msg_hash_it.h +++ b/intl/msg_hash_it.h @@ -3157,3 +3157,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_LOAD_CONTENT, "Show Load Content") MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_LOAD_CONTENT, "Show/hide the 'Load Content' option.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_INFORMATION, + "Show Information") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_INFORMATION, + "Show/hide the 'Information' option.") diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h index 7b030c20fd..1a4a76ef08 100644 --- a/intl/msg_hash_ja.h +++ b/intl/msg_hash_ja.h @@ -3073,3 +3073,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_LOAD_CONTENT, "Show Load Content") MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_LOAD_CONTENT, "Show/hide the 'Load Content' option.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_INFORMATION, + "Show Information") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_INFORMATION, + "Show/hide the 'Information' option.") diff --git a/intl/msg_hash_ko.h b/intl/msg_hash_ko.h index 4546bf035d..7e543738f4 100644 --- a/intl/msg_hash_ko.h +++ b/intl/msg_hash_ko.h @@ -3066,3 +3066,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_LOAD_CONTENT, "Show Load Content") MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_LOAD_CONTENT, "Show/hide the 'Load Content' option.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_INFORMATION, + "Show Information") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_INFORMATION, + "Show/hide the 'Information' option.") diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index df024a45b8..3b8509ccc2 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -1309,3 +1309,5 @@ MSG_HASH(MENU_ENUM_LABEL_MENU_SHOW_LOAD_CORE, "menu_show_load_core") MSG_HASH(MENU_ENUM_LABEL_MENU_SHOW_LOAD_CONTENT, "menu_show_load_content") +MSG_HASH(MENU_ENUM_LABEL_MENU_SHOW_INFORMATION, + "menu_show_information") diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h index be72a0c6df..532b8b3049 100644 --- a/intl/msg_hash_nl.h +++ b/intl/msg_hash_nl.h @@ -2934,3 +2934,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_LOAD_CONTENT, "Show Load Content") MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_LOAD_CONTENT, "Show/hide the 'Load Content' option.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_INFORMATION, + "Show Information") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_INFORMATION, + "Show/hide the 'Information' option.") diff --git a/intl/msg_hash_pt_br.h b/intl/msg_hash_pt_br.h index 82d9819898..de0c5ef025 100644 --- a/intl/msg_hash_pt_br.h +++ b/intl/msg_hash_pt_br.h @@ -4000,3 +4000,9 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_LOAD_CONTENT, MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_LOAD_CONTENT, "Show/hide the 'Load Content' option." ) +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_INFORMATION, + "Show Information" + ) +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_INFORMATION, + "Show/hide the 'Information' option." + ) diff --git a/intl/msg_hash_pt_pt.h b/intl/msg_hash_pt_pt.h index 725a434862..a38b9fcf05 100644 --- a/intl/msg_hash_pt_pt.h +++ b/intl/msg_hash_pt_pt.h @@ -3041,3 +3041,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_LOAD_CONTENT, "Show Load Content") MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_LOAD_CONTENT, "Show/hide the 'Load Content' option.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_INFORMATION, + "Show Information") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_INFORMATION, + "Show/hide the 'Information' option.") diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index 11c665374e..8b90ffeb65 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -3124,3 +3124,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_LOAD_CONTENT, "Show Load Content") MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_LOAD_CONTENT, "Show/hide the 'Load Content' option.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_INFORMATION, + "Show Information") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_INFORMATION, + "Show/hide the 'Information' option.") diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index c7ee0c364c..3e8c0d28a7 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -3159,3 +3159,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_LOAD_CONTENT, "Show Load Content") MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_LOAD_CONTENT, "Show/hide the 'Load Content' option.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_INFORMATION, + "Show Information") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_INFORMATION, + "Show/hide the 'Information' option.") diff --git a/intl/msg_hash_vn.h b/intl/msg_hash_vn.h index 96b021ede8..23db161931 100644 --- a/intl/msg_hash_vn.h +++ b/intl/msg_hash_vn.h @@ -3095,3 +3095,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_LOAD_CONTENT, "Show Load Content") MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_LOAD_CONTENT, "Show/hide the 'Load Content' option.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_INFORMATION, + "Show Information") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_INFORMATION, + "Show/hide the 'Information' option.") diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 141ff7b37d..3af26d5996 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -293,6 +293,7 @@ default_sublabel_macro(action_bind_sublabel_menu_favorites_tab, default_sublabel_macro(action_bind_sublabel_menu_images_tab, MENU_ENUM_SUBLABEL_XMB_SHOW_IMAGES) default_sublabel_macro(action_bind_sublabel_menu_show_load_core, MENU_ENUM_SUBLABEL_MENU_SHOW_LOAD_CORE) default_sublabel_macro(action_bind_sublabel_menu_show_load_content, MENU_ENUM_SUBLABEL_MENU_SHOW_LOAD_CONTENT) +default_sublabel_macro(action_bind_sublabel_menu_show_information , MENU_ENUM_SUBLABEL_MENU_SHOW_INFORMATION) default_sublabel_macro(action_bind_sublabel_menu_show_online_updater, MENU_ENUM_SUBLABEL_MENU_SHOW_ONLINE_UPDATER) default_sublabel_macro(action_bind_sublabel_menu_show_core_updater, MENU_ENUM_SUBLABEL_MENU_SHOW_CORE_UPDATER) default_sublabel_macro(action_bind_sublabel_menu_music_tab, MENU_ENUM_SUBLABEL_XMB_SHOW_MUSIC) @@ -608,6 +609,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_MENU_SHOW_LOAD_CONTENT: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_show_load_content); break; + case MENU_ENUM_LABEL_MENU_SHOW_INFORMATION: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_show_information); + break; case MENU_ENUM_LABEL_MENU_SHOW_ONLINE_UPDATER: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_show_online_updater); break; diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index c8e21a465b..0d840fb12d 100755 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -4353,8 +4353,12 @@ static int xmb_list_push(void *data, void *userdata, menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); } - entry.enum_idx = MENU_ENUM_LABEL_INFORMATION_LIST; - menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); + if (settings->bools.menu_show_information) + { + entry.enum_idx = MENU_ENUM_LABEL_INFORMATION_LIST; + menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); + } + #ifndef HAVE_DYNAMIC entry.enum_idx = MENU_ENUM_LABEL_RESTART_RETROARCH; menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 55d86f3f80..c3c7e61208 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -5294,6 +5294,11 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) MENU_ENUM_LABEL_MENU_SHOW_CORE_UPDATER, PARSE_ONLY_BOOL, false); #endif + + menu_displaylist_parse_settings_enum(menu, info, + MENU_ENUM_LABEL_MENU_SHOW_INFORMATION, + PARSE_ONLY_BOOL, false); + menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_XMB_SHOW_SETTINGS, PARSE_ONLY_BOOL, false); diff --git a/menu/menu_setting.c b/menu/menu_setting.c index b0e4918ce4..f70fd4c03c 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -5409,6 +5409,21 @@ static bool setting_append_list( general_read_handler, SD_FLAG_NONE); + CONFIG_BOOL( + list, list_info, + &settings->bools.menu_show_information, + MENU_ENUM_LABEL_MENU_SHOW_INFORMATION, + MENU_ENUM_LABEL_VALUE_MENU_SHOW_INFORMATION, + menu_show_information, + MENU_ENUM_LABEL_VALUE_OFF, + MENU_ENUM_LABEL_VALUE_ON, + &group_info, + &subgroup_info, + parent_group, + general_write_handler, + general_read_handler, + SD_FLAG_NONE); + CONFIG_BOOL( list, list_info, &settings->bools.menu_xmb_show_settings, diff --git a/msg_hash.h b/msg_hash.h index 7680ac96fe..9e564d5d72 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -674,6 +674,7 @@ enum msg_hash_enums /* Menu settings */ MENU_LABEL(MENU_SHOW_LOAD_CORE), MENU_LABEL(MENU_SHOW_LOAD_CONTENT), + MENU_LABEL(MENU_SHOW_INFORMATION), MENU_LABEL(MENU_SHOW_ONLINE_UPDATER), MENU_LABEL(MENU_SHOW_CORE_UPDATER), MENU_LABEL(RUN_MUSIC),