From a9731db5fdb63628125a221d2f67538a803ec44d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 2 Feb 2017 09:01:58 +0100 Subject: [PATCH] Add sublabels --- intl/msg_hash_lbl.h | 2 ++ intl/msg_hash_us.h | 10 ++++++++++ menu/cbs/menu_cbs_sublabel.c | 12 ++++++++++++ msg_hash.h | 2 +- 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index 901590dadd..7f3c39b68d 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -803,6 +803,8 @@ MSG_HASH(MENU_ENUM_LABEL_RESUME_CONTENT, "resume_content") MSG_HASH(MENU_ENUM_LABEL_RETRO_ACHIEVEMENTS_SETTINGS, "retro_achievements_settings") +MSG_HASH(MENU_ENUM_LABEL_INPUT_META_REWIND, + "input_meta_rewind") MSG_HASH(MENU_ENUM_LABEL_REWIND_ENABLE, "rewind_enable") MSG_HASH(MENU_ENUM_LABEL_REWIND_GRANULARITY, diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 623e15a067..fb2660d590 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -2735,3 +2735,13 @@ MSG_HASH(MENU_ENUM_SUBLABEL_UNDO_LOAD_STATE, "If a state was loaded, content will go back to the state prior to loading.") MSG_HASH(MENU_ENUM_SUBLABEL_UNDO_SAVE_STATE, "If a state was overwritten, it will roll back to the previous save state.") +MSG_HASH( + MENU_ENUM_SUBLABEL_ACCOUNTS_RETRO_ACHIEVEMENTS, + "Retro Achievements service. For more information, visit http://retroachievements.org" + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_ACCOUNTS_LIST, + "Manage currently configured accounts." + ) +MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_META_REWIND, + "Manages rewind settings.") diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index d356ece23c..48ad86705e 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -229,6 +229,9 @@ default_sublabel_macro(action_bind_sublabel_resume_content, default_sublabel_macro(action_bind_sublabel_state_slot, MENU_ENUM_SUBLABEL_STATE_SLOT) default_sublabel_macro(action_bind_sublabel_undo_load_state, MENU_ENUM_SUBLABEL_UNDO_LOAD_STATE) default_sublabel_macro(action_bind_sublabel_undo_save_state, MENU_ENUM_SUBLABEL_UNDO_SAVE_STATE) +default_sublabel_macro(action_bind_sublabel_accounts_retro_achievements, MENU_ENUM_SUBLABEL_ACCOUNTS_RETRO_ACHIEVEMENTS) +default_sublabel_macro(action_bind_sublabel_accounts_list, MENU_ENUM_SUBLABEL_ACCOUNTS_LIST) +default_sublabel_macro(action_bind_sublabel_input_meta_rewind, MENU_ENUM_SUBLABEL_INPUT_META_REWIND) static int action_bind_sublabel_cheevos_entry( file_list_t *list, @@ -290,6 +293,15 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, { switch (cbs->enum_idx) { + case MENU_ENUM_LABEL_REWIND_SETTINGS: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_meta_rewind); + break; + case MENU_ENUM_LABEL_ACCOUNTS_LIST: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_accounts_list); + break; + case MENU_ENUM_LABEL_ACCOUNTS_RETRO_ACHIEVEMENTS: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_accounts_retro_achievements); + break; case MENU_ENUM_LABEL_UNDO_SAVE_STATE: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_undo_save_state); break; diff --git a/msg_hash.h b/msg_hash.h index 6a5308044d..b673488e02 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -532,7 +532,6 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY, MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS, MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS, - MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND, MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_PAUSE_TOGGLE, MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE, @@ -994,6 +993,7 @@ enum msg_hash_enums MENU_LABEL(SCREENSHOT), MENU_LABEL(REWIND), MENU_LABEL(REWIND_GRANULARITY), + MENU_LABEL(INPUT_META_REWIND), MENU_LABEL(SCREEN_RESOLUTION), MENU_LABEL(TITLE_COLOR),