From c1f16e156e497c50671a4d34b72d46e3381cc2cd Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 19 Jun 2018 06:23:38 +0200 Subject: [PATCH] Add Power Management submenu --- intl/msg_hash_ar.h | 4 ++++ intl/msg_hash_chs.h | 4 ++++ intl/msg_hash_cht.h | 4 ++++ intl/msg_hash_de.h | 4 ++++ intl/msg_hash_eo.h | 4 ++++ intl/msg_hash_es.h | 4 ++++ intl/msg_hash_fr.h | 4 ++++ intl/msg_hash_it.h | 4 ++++ intl/msg_hash_ja.h | 4 ++++ intl/msg_hash_ko.h | 4 ++++ intl/msg_hash_nl.h | 4 ++++ intl/msg_hash_pl.h | 4 ++++ intl/msg_hash_pt_br.h | 4 ++++ intl/msg_hash_pt_pt.h | 4 ++++ intl/msg_hash_ru.h | 4 ++++ intl/msg_hash_us.h | 4 ++++ intl/msg_hash_vn.h | 4 ++++ menu/cbs/menu_cbs_deferred_push.c | 6 ++++++ menu/cbs/menu_cbs_ok.c | 7 +++++++ menu/cbs/menu_cbs_sublabel.c | 4 ++++ menu/cbs/menu_cbs_title.c | 6 ++++++ menu/menu_cbs.h | 1 + menu/menu_displaylist.c | 17 +++++++++++++++++ menu/menu_displaylist.h | 1 + menu/menu_setting.c | 21 +++++++++++++++++++++ msg_hash.h | 2 ++ 26 files changed, 133 insertions(+) diff --git a/intl/msg_hash_ar.h b/intl/msg_hash_ar.h index ea768df7a0..b51aa3a15b 100644 --- a/intl/msg_hash_ar.h +++ b/intl/msg_hash_ar.h @@ -3515,3 +3515,7 @@ MSG_HASH( MENU_ENUM_SUBLABEL_DISCORD_ALLOW, "Enable or disable Discord support. Will not work with the browser version, only native desktop client." ) +MSG_HASH(MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS, + "Power Management") +MSG_HASH(MENU_ENUM_SUBLABEL_POWER_MANAGEMENT_SETTINGS, + "Change power management settings.") diff --git a/intl/msg_hash_chs.h b/intl/msg_hash_chs.h index 2ed6383e2b..95bbc73615 100644 --- a/intl/msg_hash_chs.h +++ b/intl/msg_hash_chs.h @@ -3301,3 +3301,7 @@ MSG_HASH( MENU_ENUM_SUBLABEL_DISCORD_ALLOW, "Enable or disable Discord support. Will not work with the browser version, only native desktop client." ) +MSG_HASH(MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS, + "Power Management") +MSG_HASH(MENU_ENUM_SUBLABEL_POWER_MANAGEMENT_SETTINGS, + "Change power management settings.") diff --git a/intl/msg_hash_cht.h b/intl/msg_hash_cht.h index d2d9cf9cb9..322a9670ba 100644 --- a/intl/msg_hash_cht.h +++ b/intl/msg_hash_cht.h @@ -3293,3 +3293,7 @@ MSG_HASH( MENU_ENUM_SUBLABEL_DISCORD_ALLOW, "Enable or disable Discord support. Will not work with the browser version, only native desktop client." ) +MSG_HASH(MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS, + "Power Management") +MSG_HASH(MENU_ENUM_SUBLABEL_POWER_MANAGEMENT_SETTINGS, + "Change power management settings.") diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h index 9240fbcc58..2955eb8feb 100644 --- a/intl/msg_hash_de.h +++ b/intl/msg_hash_de.h @@ -3407,3 +3407,7 @@ MSG_HASH( MENU_ENUM_SUBLABEL_DISCORD_ALLOW, "Enable or disable Discord support. Will not work with the browser version, only native desktop client." ) +MSG_HASH(MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS, + "Power Management") +MSG_HASH(MENU_ENUM_SUBLABEL_POWER_MANAGEMENT_SETTINGS, + "Change power management settings.") diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index a21c36c540..af17851892 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -3166,3 +3166,7 @@ MSG_HASH( MENU_ENUM_SUBLABEL_DISCORD_ALLOW, "Enable or disable Discord support. Will not work with the browser version, only native desktop client." ) +MSG_HASH(MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS, + "Power Management") +MSG_HASH(MENU_ENUM_SUBLABEL_POWER_MANAGEMENT_SETTINGS, + "Change power management settings.") diff --git a/intl/msg_hash_es.h b/intl/msg_hash_es.h index 1c1c116364..c571b7ed41 100644 --- a/intl/msg_hash_es.h +++ b/intl/msg_hash_es.h @@ -6386,3 +6386,7 @@ MSG_HASH( MENU_ENUM_SUBLABEL_DISCORD_ALLOW, "Enable or disable Discord support. Will not work with the browser version, only native desktop client." ) +MSG_HASH(MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS, + "Power Management") +MSG_HASH(MENU_ENUM_SUBLABEL_POWER_MANAGEMENT_SETTINGS, + "Change power management settings.") diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index 24c52fc40b..2a032263ec 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -3331,3 +3331,7 @@ MSG_HASH( MENU_ENUM_SUBLABEL_DISCORD_ALLOW, "Enable or disable Discord support. Will not work with the browser version, only native desktop client." ) +MSG_HASH(MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS, + "Power Management") +MSG_HASH(MENU_ENUM_SUBLABEL_POWER_MANAGEMENT_SETTINGS, + "Change power management settings.") diff --git a/intl/msg_hash_it.h b/intl/msg_hash_it.h index 39d467a15b..d500044b22 100644 --- a/intl/msg_hash_it.h +++ b/intl/msg_hash_it.h @@ -3389,3 +3389,7 @@ MSG_HASH( MENU_ENUM_SUBLABEL_DISCORD_ALLOW, "Abilita o disabilita il supporto Discord. Non funzionerà con la versione del browser, solo con desktop client nativi." ) +MSG_HASH(MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS, + "Power Management") +MSG_HASH(MENU_ENUM_SUBLABEL_POWER_MANAGEMENT_SETTINGS, + "Change power management settings.") diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h index 06b6f43e63..5ebf9c856c 100644 --- a/intl/msg_hash_ja.h +++ b/intl/msg_hash_ja.h @@ -3543,3 +3543,7 @@ MSG_HASH( MENU_ENUM_SUBLABEL_DISCORD_ALLOW, "Enable or disable Discord support. Will not work with the browser version, only native desktop client." ) +MSG_HASH(MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS, + "Power Management") +MSG_HASH(MENU_ENUM_SUBLABEL_POWER_MANAGEMENT_SETTINGS, + "Change power management settings.") diff --git a/intl/msg_hash_ko.h b/intl/msg_hash_ko.h index b97c7568d9..45bd72b7cb 100644 --- a/intl/msg_hash_ko.h +++ b/intl/msg_hash_ko.h @@ -3292,3 +3292,7 @@ MSG_HASH( MENU_ENUM_SUBLABEL_DISCORD_ALLOW, "Enable or disable Discord support. Will not work with the browser version, only native desktop client." ) +MSG_HASH(MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS, + "Power Management") +MSG_HASH(MENU_ENUM_SUBLABEL_POWER_MANAGEMENT_SETTINGS, + "Change power management settings.") diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h index df59e51895..a3b47eaa5f 100644 --- a/intl/msg_hash_nl.h +++ b/intl/msg_hash_nl.h @@ -3168,3 +3168,7 @@ MSG_HASH( MENU_ENUM_SUBLABEL_DISCORD_ALLOW, "Enable or disable Discord support. Will not work with the browser version, only native desktop client." ) +MSG_HASH(MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS, + "Power Management") +MSG_HASH(MENU_ENUM_SUBLABEL_POWER_MANAGEMENT_SETTINGS, + "Change power management settings.") diff --git a/intl/msg_hash_pl.h b/intl/msg_hash_pl.h index 620ba1901c..4def287c2b 100644 --- a/intl/msg_hash_pl.h +++ b/intl/msg_hash_pl.h @@ -3570,3 +3570,7 @@ MSG_HASH( MENU_ENUM_SUBLABEL_DISCORD_ALLOW, "Włącz lub wyłącz wsparcie dla Discrod. Nie będzie działać z wersją przeglądarkową, jedynie z natywnym klientem." ) +MSG_HASH(MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS, + "Power Management") +MSG_HASH(MENU_ENUM_SUBLABEL_POWER_MANAGEMENT_SETTINGS, + "Change power management settings.") diff --git a/intl/msg_hash_pt_br.h b/intl/msg_hash_pt_br.h index fb4c083f66..facca59534 100644 --- a/intl/msg_hash_pt_br.h +++ b/intl/msg_hash_pt_br.h @@ -3726,3 +3726,7 @@ MSG_HASH( MENU_ENUM_SUBLABEL_DISCORD_ALLOW, "Habilitar ou desabilitar o suporte ao Discord. Não funcionará com a versão do navegador, apenas o cliente nativo de desktop." ) +MSG_HASH(MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS, + "Power Management") +MSG_HASH(MENU_ENUM_SUBLABEL_POWER_MANAGEMENT_SETTINGS, + "Change power management settings.") diff --git a/intl/msg_hash_pt_pt.h b/intl/msg_hash_pt_pt.h index 16628419b2..9dba74d668 100644 --- a/intl/msg_hash_pt_pt.h +++ b/intl/msg_hash_pt_pt.h @@ -3266,3 +3266,7 @@ MSG_HASH( MENU_ENUM_SUBLABEL_DISCORD_ALLOW, "Enable or disable Discord support. Will not work with the browser version, only native desktop client." ) +MSG_HASH(MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS, + "Power Management") +MSG_HASH(MENU_ENUM_SUBLABEL_POWER_MANAGEMENT_SETTINGS, + "Change power management settings.") diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index 653b894544..6f36fea3bf 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -3462,3 +3462,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_BADGES_ENABLE, "Включить или выключить отображение значков в списке достижений.") MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_AUTO_SCREENSHOT, "Автоматически сделать скриншот при получении достижения.") +MSG_HASH(MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS, + "Power Management") +MSG_HASH(MENU_ENUM_SUBLABEL_POWER_MANAGEMENT_SETTINGS, + "Change power management settings.") diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index a7452e08e1..10d61b4289 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -3748,3 +3748,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MIDI_VOLUME, "Volume") MSG_HASH(MENU_ENUM_SUBLABEL_MIDI_VOLUME, "Set output volume (%).") +MSG_HASH(MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS, + "Power Management") +MSG_HASH(MENU_ENUM_SUBLABEL_POWER_MANAGEMENT_SETTINGS, + "Change power management settings.") diff --git a/intl/msg_hash_vn.h b/intl/msg_hash_vn.h index d91f9388c0..f689dc8e4f 100644 --- a/intl/msg_hash_vn.h +++ b/intl/msg_hash_vn.h @@ -3323,3 +3323,7 @@ MSG_HASH( MENU_ENUM_SUBLABEL_DISCORD_ALLOW, "Enable or disable Discord support. Will not work with the browser version, only native desktop client." ) +MSG_HASH(MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS, + "Power Management") +MSG_HASH(MENU_ENUM_SUBLABEL_POWER_MANAGEMENT_SETTINGS, + "Change power management settings.") diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index 4c9b4f299f..4b8a51d665 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -147,6 +147,7 @@ generic_deferred_push(deferred_push_menu_views_settings_list, DISPLAYLIST_ generic_deferred_push(deferred_push_quick_menu_views_settings_list, DISPLAYLIST_QUICK_MENU_VIEWS_SETTINGS_LIST) generic_deferred_push(deferred_push_menu_settings_list, DISPLAYLIST_MENU_SETTINGS_LIST) generic_deferred_push(deferred_push_user_interface_settings_list, DISPLAYLIST_USER_INTERFACE_SETTINGS_LIST) +generic_deferred_push(deferred_push_power_management_settings_list, DISPLAYLIST_POWER_MANAGEMENT_SETTINGS_LIST) generic_deferred_push(deferred_push_retro_achievements_settings_list,DISPLAYLIST_RETRO_ACHIEVEMENTS_SETTINGS_LIST) generic_deferred_push(deferred_push_updater_settings_list, DISPLAYLIST_UPDATER_SETTINGS_LIST) generic_deferred_push(deferred_push_wifi_settings_list, DISPLAYLIST_WIFI_SETTINGS_LIST) @@ -688,6 +689,11 @@ static int menu_cbs_init_bind_deferred_push_compare_label( BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_user_interface_settings_list); return 0; } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_POWER_MANAGEMENT_SETTINGS_LIST))) + { + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_power_management_settings_list); + return 0; + } else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_RETRO_ACHIEVEMENTS_SETTINGS_LIST))) { BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_retro_achievements_settings_list); diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index e379019018..b6fbbff5d6 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -294,6 +294,8 @@ static enum msg_hash_enums action_ok_dl_to_enum(unsigned lbl) return MENU_ENUM_LABEL_DEFERRED_QUICK_MENU_OVERRIDE_OPTIONS; case ACTION_OK_DL_USER_INTERFACE_SETTINGS_LIST: return MENU_ENUM_LABEL_DEFERRED_USER_INTERFACE_SETTINGS_LIST; + case ACTION_OK_DL_POWER_MANAGEMENT_SETTINGS_LIST: + return MENU_ENUM_LABEL_DEFERRED_POWER_MANAGEMENT_SETTINGS_LIST; case ACTION_OK_DL_MENU_FILE_BROWSER_SETTINGS_LIST: return MENU_ENUM_LABEL_DEFERRED_MENU_FILE_BROWSER_SETTINGS_LIST; case ACTION_OK_DL_RETRO_ACHIEVEMENTS_SETTINGS_LIST: @@ -833,6 +835,7 @@ int generic_action_ok_displaylist_push(const char *path, case ACTION_OK_DL_QUICK_MENU_VIEWS_SETTINGS_LIST: case ACTION_OK_DL_QUICK_MENU_OVERRIDE_OPTIONS_LIST: case ACTION_OK_DL_USER_INTERFACE_SETTINGS_LIST: + case ACTION_OK_DL_POWER_MANAGEMENT_SETTINGS_LIST: case ACTION_OK_DL_MENU_FILE_BROWSER_SETTINGS_LIST: case ACTION_OK_DL_RETRO_ACHIEVEMENTS_SETTINGS_LIST: case ACTION_OK_DL_UPDATER_SETTINGS_LIST: @@ -3414,6 +3417,7 @@ default_action_ok_func(action_ok_menu_list, ACTION_OK_DL_MENU_SETTINGS_LIST) default_action_ok_func(action_ok_quick_menu_override_options, ACTION_OK_DL_QUICK_MENU_OVERRIDE_OPTIONS_LIST) default_action_ok_func(action_ok_menu_views_list, ACTION_OK_DL_MENU_VIEWS_SETTINGS_LIST) default_action_ok_func(action_ok_quick_menu_views_list, ACTION_OK_DL_QUICK_MENU_VIEWS_SETTINGS_LIST) +default_action_ok_func(action_ok_power_management_list, ACTION_OK_DL_POWER_MANAGEMENT_SETTINGS_LIST) default_action_ok_func(action_ok_user_interface_list, ACTION_OK_DL_USER_INTERFACE_SETTINGS_LIST) default_action_ok_func(action_ok_menu_file_browser_list, ACTION_OK_DL_MENU_FILE_BROWSER_SETTINGS_LIST) default_action_ok_func(action_ok_retro_achievements_list, ACTION_OK_DL_RETRO_ACHIEVEMENTS_SETTINGS_LIST) @@ -4633,6 +4637,9 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS: BIND_ACTION_OK(cbs, action_ok_user_interface_list); break; + case MENU_ENUM_LABEL_POWER_MANAGEMENT_SETTINGS: + BIND_ACTION_OK(cbs, action_ok_power_management_list); + break; case MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS: BIND_ACTION_OK(cbs, action_ok_menu_file_browser_list); break; diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index adc4da4eb2..be4e42cb40 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -74,6 +74,7 @@ default_sublabel_macro(action_bind_sublabel_retro_achievements_settings_list, ME 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_user_interface_settings_list, MENU_ENUM_SUBLABEL_USER_INTERFACE_SETTINGS) +default_sublabel_macro(action_bind_sublabel_power_management_settings_list, MENU_ENUM_SUBLABEL_POWER_MANAGEMENT_SETTINGS) default_sublabel_macro(action_bind_sublabel_privacy_settings_list, MENU_ENUM_SUBLABEL_PRIVACY_SETTINGS) default_sublabel_macro(action_bind_sublabel_midi_settings_list, MENU_ENUM_SUBLABEL_MIDI_SETTINGS) default_sublabel_macro(action_bind_sublabel_directory_settings_list, MENU_ENUM_SUBLABEL_DIRECTORY_SETTINGS) @@ -1685,6 +1686,9 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_user_interface_settings_list); break; + case MENU_ENUM_LABEL_POWER_MANAGEMENT_SETTINGS: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_power_management_settings_list); + break; case MENU_ENUM_LABEL_PRIVACY_SETTINGS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_privacy_settings_list); break; diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index 96517f7cc6..d14554e972 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -124,6 +124,7 @@ default_title_macro(action_get_menu_views_settings_list, MENU_ENUM_LABEL_ default_title_macro(action_get_quick_menu_views_settings_list, MENU_ENUM_LABEL_VALUE_QUICK_MENU_VIEWS_SETTINGS) default_title_macro(action_get_menu_settings_list, MENU_ENUM_LABEL_VALUE_MENU_SETTINGS) default_title_macro(action_get_user_interface_settings_list, MENU_ENUM_LABEL_VALUE_USER_INTERFACE_SETTINGS) +default_title_macro(action_get_power_management_settings_list, MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS) default_title_macro(action_get_menu_file_browser_settings_list, MENU_ENUM_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS) default_title_macro(action_get_retro_achievements_settings_list,MENU_ENUM_LABEL_VALUE_RETRO_ACHIEVEMENTS_SETTINGS) default_title_macro(action_get_wifi_settings_list, MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS) @@ -399,6 +400,11 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, BIND_ACTION_GET_TITLE(cbs, action_get_user_interface_settings_list); return 0; } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_POWER_MANAGEMENT_SETTINGS_LIST))) + { + BIND_ACTION_GET_TITLE(cbs, action_get_power_management_settings_list); + return 0; + } else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_MENU_FILE_BROWSER_SETTINGS_LIST))) { BIND_ACTION_GET_TITLE(cbs, action_get_menu_file_browser_settings_list); diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h index 788de3f207..b33299df59 100644 --- a/menu/menu_cbs.h +++ b/menu/menu_cbs.h @@ -117,6 +117,7 @@ enum ACTION_OK_DL_QUICK_MENU_OVERRIDE_OPTIONS_LIST, ACTION_OK_DL_MENU_SETTINGS_LIST, ACTION_OK_DL_USER_INTERFACE_SETTINGS_LIST, + ACTION_OK_DL_POWER_MANAGEMENT_SETTINGS_LIST, ACTION_OK_DL_MENU_FILE_BROWSER_SETTINGS_LIST, ACTION_OK_DL_RETRO_ACHIEVEMENTS_SETTINGS_LIST, ACTION_OK_DL_UPDATER_SETTINGS_LIST, diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 5156b76481..56f710010e 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -5496,6 +5496,21 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, FILE_TYPE_NONE, 0, 0); + info->need_refresh = true; + info->need_push = true; + break; + case DISPLAYLIST_POWER_MANAGEMENT_SETTINGS_LIST: + menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); + + /* Fill in entry here */ + + if (count == 0) + menu_entries_append_enum(info->list, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_SETTINGS_FOUND), + msg_hash_to_str(MENU_ENUM_LABEL_NO_SETTINGS_FOUND), + MENU_ENUM_LABEL_NO_SETTINGS_FOUND, + 0, 0, 0); + info->need_refresh = true; info->need_push = true; break; @@ -6366,6 +6381,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) MENU_ENUM_LABEL_ONSCREEN_DISPLAY_SETTINGS, PARSE_ACTION, false); ret = menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS, PARSE_ACTION, false); + ret = menu_displaylist_parse_settings_enum(menu, info, + MENU_ENUM_LABEL_POWER_MANAGEMENT_SETTINGS, PARSE_ACTION, false); ret = menu_displaylist_parse_settings_enum(menu, info, MENU_ENUM_LABEL_RETRO_ACHIEVEMENTS_SETTINGS, PARSE_ACTION, false); ret = menu_displaylist_parse_settings_enum(menu, info, diff --git a/menu/menu_displaylist.h b/menu/menu_displaylist.h index e329afcc9d..b3c12b9804 100644 --- a/menu/menu_displaylist.h +++ b/menu/menu_displaylist.h @@ -132,6 +132,7 @@ enum menu_displaylist_ctl_state DISPLAYLIST_QUICK_MENU_VIEWS_SETTINGS_LIST, DISPLAYLIST_MENU_SETTINGS_LIST, DISPLAYLIST_USER_INTERFACE_SETTINGS_LIST, + DISPLAYLIST_POWER_MANAGEMENT_SETTINGS_LIST, DISPLAYLIST_RETRO_ACHIEVEMENTS_SETTINGS_LIST, DISPLAYLIST_UPDATER_SETTINGS_LIST, DISPLAYLIST_WIFI_SETTINGS_LIST, diff --git a/menu/menu_setting.c b/menu/menu_setting.c index d6880db25f..5b6adfa5f5 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -114,6 +114,7 @@ enum settings_list_type SETTINGS_LIST_MENU_FILE_BROWSER, SETTINGS_LIST_MULTIMEDIA, SETTINGS_LIST_USER_INTERFACE, + SETTINGS_LIST_POWER_MANAGEMENT, SETTINGS_LIST_PLAYLIST, SETTINGS_LIST_CHEEVOS, SETTINGS_LIST_CORE_UPDATER, @@ -2496,6 +2497,14 @@ static bool setting_append_list( &subgroup_info, parent_group); + CONFIG_ACTION( + list, list_info, + MENU_ENUM_LABEL_POWER_MANAGEMENT_SETTINGS, + MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS, + &group_info, + &subgroup_info, + parent_group); + CONFIG_ACTION( list, list_info, MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS, @@ -6358,6 +6367,17 @@ static bool setting_append_list( general_read_handler, SD_FLAG_NONE); + END_SUB_GROUP(list, list_info, parent_group); + END_GROUP(list, list_info, parent_group); + break; + case SETTINGS_LIST_POWER_MANAGEMENT: + START_GROUP(list, list_info, &group_info, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS), + parent_group); + parent_group = msg_hash_to_str(MENU_ENUM_LABEL_POWER_MANAGEMENT_SETTINGS); + + START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info, parent_group); + END_SUB_GROUP(list, list_info, parent_group); END_GROUP(list, list_info, parent_group); break; @@ -8186,6 +8206,7 @@ static rarch_setting_t *menu_setting_new_internal(rarch_setting_info_t *list_inf SETTINGS_LIST_MENU_FILE_BROWSER, SETTINGS_LIST_MULTIMEDIA, SETTINGS_LIST_USER_INTERFACE, + SETTINGS_LIST_POWER_MANAGEMENT, SETTINGS_LIST_PLAYLIST, SETTINGS_LIST_CHEEVOS, SETTINGS_LIST_CORE_UPDATER, diff --git a/msg_hash.h b/msg_hash.h index a28350e1a4..ce7eda41b6 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -896,6 +896,7 @@ enum msg_hash_enums MENU_LABEL(MENU_SETTINGS), MENU_LABEL(THUMBNAILS_UPDATER_LIST), MENU_LABEL(USER_INTERFACE_SETTINGS), + MENU_LABEL(POWER_MANAGEMENT_SETTINGS), MENU_LABEL(RETRO_ACHIEVEMENTS_SETTINGS), MENU_LABEL(MENU_FILE_BROWSER_SETTINGS), MENU_LABEL(UPDATER_SETTINGS), @@ -1021,6 +1022,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_DEFERRED_QUICK_MENU_OVERRIDE_OPTIONS, MENU_ENUM_LABEL_DEFERRED_MENU_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_USER_INTERFACE_SETTINGS_LIST, + MENU_ENUM_LABEL_DEFERRED_POWER_MANAGEMENT_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_MENU_FILE_BROWSER_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_RETRO_ACHIEVEMENTS_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_UPDATER_SETTINGS_LIST,