diff --git a/config.def.h b/config.def.h index e6179239dd..d9090f2a1c 100644 --- a/config.def.h +++ b/config.def.h @@ -242,6 +242,7 @@ static bool menu_show_load_content = true; static bool menu_show_information = true; static bool menu_show_configurations = true; static bool menu_show_help = true; +static bool menu_show_quit_retroarch = true; #if defined(HAVE_LAKKA) || defined(VITA) static bool menu_show_core_updater = false; diff --git a/configuration.c b/configuration.c index 74f58691e8..c682b702f7 100644 --- a/configuration.c +++ b/configuration.c @@ -1207,6 +1207,7 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings, SETTING_BOOL("menu_show_information", &settings->bools.menu_show_information, true, menu_show_information, false); SETTING_BOOL("menu_show_configurations", &settings->bools.menu_show_configurations, true, menu_show_configurations, false); SETTING_BOOL("menu_show_help", &settings->bools.menu_show_help, true, menu_show_help, false); + SETTING_BOOL("menu_show_quit_retroarch", &settings->bools.menu_show_quit_retroarch, true, menu_show_quit_retroarch, 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 9d22c13957..43c54e88d5 100644 --- a/configuration.h +++ b/configuration.h @@ -132,6 +132,7 @@ typedef struct settings bool menu_show_information; bool menu_show_configurations; bool menu_show_help; + bool menu_show_quit_retroarch; 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 fb2401229f..80eda193ef 100644 --- a/intl/msg_hash_chs.h +++ b/intl/msg_hash_chs.h @@ -3083,3 +3083,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_HELP, "Show Help") MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_HELP, "Show/hide the 'Help' option.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_QUIT_RETROARCH, + "Show Quit RetroArch") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_QUIT_RETROARCH, + "Show/hide the 'Quit RetroArch' option.") diff --git a/intl/msg_hash_cht.h b/intl/msg_hash_cht.h index 5325346cfc..ce10c5326b 100644 --- a/intl/msg_hash_cht.h +++ b/intl/msg_hash_cht.h @@ -3083,3 +3083,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_HELP, "Show Help") MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_HELP, "Show/hide the 'Help' option.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_QUIT_RETROARCH, + "Show Quit RetroArch") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_QUIT_RETROARCH, + "Show/hide the 'Quit RetroArch' option.") diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h index 5982dcaf6d..3eabccf4ee 100644 --- a/intl/msg_hash_de.h +++ b/intl/msg_hash_de.h @@ -3077,3 +3077,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_HELP, "Show Help") MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_HELP, "Show/hide the 'Help' option.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_QUIT_RETROARCH, + "Show Quit RetroArch") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_QUIT_RETROARCH, + "Show/hide the 'Quit RetroArch' option.") diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index c266ae7a1d..7500caa643 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -2946,3 +2946,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_HELP, "Show Help") MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_HELP, "Show/hide the 'Help' option.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_QUIT_RETROARCH, + "Show Quit RetroArch") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_QUIT_RETROARCH, + "Show/hide the 'Quit RetroArch' option.") diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index f91c903962..0344491dcb 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -3115,3 +3115,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_HELP, "Show Help") MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_HELP, "Show/hide the 'Help' option.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_QUIT_RETROARCH, + "Show Quit RetroArch") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_QUIT_RETROARCH, + "Show/hide the 'Quit RetroArch' option.") diff --git a/intl/msg_hash_it.h b/intl/msg_hash_it.h index 4ace0b71a5..ff5dc77ff3 100644 --- a/intl/msg_hash_it.h +++ b/intl/msg_hash_it.h @@ -3169,3 +3169,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_HELP, "Show Help") MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_HELP, "Show/hide the 'Help' option.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_QUIT_RETROARCH, + "Show Quit RetroArch") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_QUIT_RETROARCH, + "Show/hide the 'Quit RetroArch' option.") diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h index d174d166f8..58ab796678 100644 --- a/intl/msg_hash_ja.h +++ b/intl/msg_hash_ja.h @@ -3085,3 +3085,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_HELP, "Show Help") MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_HELP, "Show/hide the 'Help' option.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_QUIT_RETROARCH, + "Show Quit RetroArch") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_QUIT_RETROARCH, + "Show/hide the 'Quit RetroArch' option.") diff --git a/intl/msg_hash_ko.h b/intl/msg_hash_ko.h index 586da82360..5fe3086e48 100644 --- a/intl/msg_hash_ko.h +++ b/intl/msg_hash_ko.h @@ -3078,3 +3078,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_HELP, "Show Help") MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_HELP, "Show/hide the 'Help' option.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_QUIT_RETROARCH, + "Show Quit RetroArch") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_QUIT_RETROARCH, + "Show/hide the 'Quit RetroArch' option.") diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index 941d9885c3..397b78d2c7 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -1315,3 +1315,5 @@ MSG_HASH(MENU_ENUM_LABEL_MENU_SHOW_CONFIGURATIONS, "menu_show_configurations") MSG_HASH(MENU_ENUM_LABEL_MENU_SHOW_HELP, "menu_show_help") +MSG_HASH(MENU_ENUM_LABEL_MENU_SHOW_QUIT_RETROARCH, + "menu_show_quit_retroarch") diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h index 49e94e74b0..7aa9cab089 100644 --- a/intl/msg_hash_nl.h +++ b/intl/msg_hash_nl.h @@ -2946,3 +2946,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_HELP, "Show Help") MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_HELP, "Show/hide the 'Help' option.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_QUIT_RETROARCH, + "Show Quit RetroArch") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_QUIT_RETROARCH, + "Show/hide the 'Quit RetroArch' option.") diff --git a/intl/msg_hash_pt_br.h b/intl/msg_hash_pt_br.h index ccd8055111..871a3e35d2 100644 --- a/intl/msg_hash_pt_br.h +++ b/intl/msg_hash_pt_br.h @@ -4018,3 +4018,9 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_HELP, MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_HELP, "Show/hide the 'Help' option." ) +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_QUIT_RETROARCH, + "Show Quit RetroArch" + ) +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_QUIT_RETROARCH, + "Show/hide the 'Quit RetroArch' option." + ) diff --git a/intl/msg_hash_pt_pt.h b/intl/msg_hash_pt_pt.h index ef16c2d259..108444d325 100644 --- a/intl/msg_hash_pt_pt.h +++ b/intl/msg_hash_pt_pt.h @@ -3053,3 +3053,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_HELP, "Show Help") MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_HELP, "Show/hide the 'Help' option.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_QUIT_RETROARCH, + "Show Quit RetroArch") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_QUIT_RETROARCH, + "Show/hide the 'Quit RetroArch' option.") diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index a262bc0bce..a70f13fcc1 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -3136,3 +3136,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_HELP, "Show Help") MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_HELP, "Show/hide the 'Help' option.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_QUIT_RETROARCH, + "Show Quit RetroArch") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_QUIT_RETROARCH, + "Show/hide the 'Quit RetroArch' option.") diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index ec4478ef68..731ea7587b 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -3171,3 +3171,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_HELP, "Show Help") MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_HELP, "Show/hide the 'Help' option.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_QUIT_RETROARCH, + "Show Quit RetroArch") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_QUIT_RETROARCH, + "Show/hide the 'Quit RetroArch' option.") diff --git a/intl/msg_hash_vn.h b/intl/msg_hash_vn.h index 627de0e9be..fffff6b38b 100644 --- a/intl/msg_hash_vn.h +++ b/intl/msg_hash_vn.h @@ -3107,3 +3107,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_HELP, "Show Help") MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_HELP, "Show/hide the 'Help' option.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_QUIT_RETROARCH, + "Show Quit RetroArch") +MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_QUIT_RETROARCH, + "Show/hide the 'Quit RetroArch' option.") diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 151b2a96e5..3325833008 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -296,6 +296,7 @@ default_sublabel_macro(action_bind_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_configurations, MENU_ENUM_SUBLABEL_MENU_SHOW_CONFIGURATIONS) default_sublabel_macro(action_bind_sublabel_menu_show_help, MENU_ENUM_SUBLABEL_MENU_SHOW_HELP) +default_sublabel_macro(action_bind_sublabel_menu_show_quit_retroarch, MENU_ENUM_SUBLABEL_MENU_SHOW_QUIT_RETROARCH) 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) @@ -620,6 +621,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_MENU_SHOW_HELP: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_show_help); break; + case MENU_ENUM_LABEL_MENU_SHOW_QUIT_RETROARCH: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_show_quit_retroarch); + 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 88306615ae..41d2e46be2 100755 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -4377,8 +4377,11 @@ static int xmb_list_push(void *data, void *userdata, } #if !defined(IOS) - entry.enum_idx = MENU_ENUM_LABEL_QUIT_RETROARCH; - menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); + if (settings->bools.menu_show_quit_retroarch) + { + entry.enum_idx = MENU_ENUM_LABEL_QUIT_RETROARCH; + menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); + } #endif entry.enum_idx = MENU_ENUM_LABEL_REBOOT; menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index b2ab173ecf..42a410c972 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -5307,6 +5307,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) MENU_ENUM_LABEL_MENU_SHOW_HELP, PARSE_ONLY_BOOL, false); +#if defined(HAVE_LAKKA) + menu_displaylist_parse_settings_enum(menu, info, + MENU_ENUM_LABEL_MENU_SHOW_QUIT_RETROARCH, + PARSE_ONLY_BOOL, false); +#endif + 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 4bef442601..bff186e7d7 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -5454,6 +5454,21 @@ static bool setting_append_list( general_read_handler, SD_FLAG_LAKKA_ADVANCED); + CONFIG_BOOL( + list, list_info, + &settings->bools.menu_show_quit_retroarch, + MENU_ENUM_LABEL_MENU_SHOW_QUIT_RETROARCH, + MENU_ENUM_LABEL_VALUE_MENU_SHOW_QUIT_RETROARCH, + menu_show_quit_retroarch, + 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 c43c328df8..6d83271e99 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -677,6 +677,7 @@ enum msg_hash_enums MENU_LABEL(MENU_SHOW_INFORMATION), MENU_LABEL(MENU_SHOW_CONFIGURATIONS), MENU_LABEL(MENU_SHOW_HELP), + MENU_LABEL(MENU_SHOW_QUIT_RETROARCH), MENU_LABEL(MENU_SHOW_ONLINE_UPDATER), MENU_LABEL(MENU_SHOW_CORE_UPDATER), MENU_LABEL(RUN_MUSIC),